Update plugin config to allow specification of complete weboook url

(fixes #3)

Author: gitblit

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Gitblit Slack plugin
 
+## 1.4.0-SNAPSHOT
+
+- Update to Gitblit 1.7.0
+- Add `slack.url` config setting
+- Remove `slack.team`
+- Remove `slack.token`
+
 ### 1.3.0
 
 - Post events using user identity & gravatar, may be disabled

README.md

@@ -18,15 +18,15 @@ Alternatively, you can download the zip from [here](http://plugins.gitblit.com)
 
 ### Setup
 
-At a bare minimum you'll need two settings configured in `gitblit.properties`.
+At a bare minimum you'll need one setting configured in `gitblit.properties`.
+
+    slack.url = https://hooks.slack.com/services/yada/yadayada
 
-    slack.team = yourTeam
-    slack.token = yourToken
 
 If you have the `powertools` plugin installed, you may configure this over SSH:
 
-    ssh host gb config slack.team yourTeam
-    ssh host gb config slack.token yourToken
+    ssh host gb config slack.url https://hooks.slack.com/services/yada/yadayada
+
 
 There a handful of additional optional settings:
 

src/main/java/com/gitblit/plugin/slack/Plugin.java

@@ -24,11 +24,7 @@
 
 public class Plugin extends GitblitPlugin {
 
-	public static final String SETTING_TEAM = "slack.team";
-
-	public static final String SETTING_HOOK = "slack.hook";
-
-	public static final String SETTING_TOKEN = "slack.token";
+	public static final String SETTING_URL = "slack.url";
 
 	public static final String SETTING_POST_AS_USER = "slack.postAsUser";
 

src/main/java/com/gitblit/plugin/slack/Slacker.java

@@ -104,22 +104,11 @@ public boolean shallPost(RepositoryModel repository) {
 	}
 
 	public String getURL() throws IOException {
-		String team = runtimeManager.getSettings().getString(Plugin.SETTING_TEAM, null);
-		if (StringUtils.isEmpty(team)) {
-			throw new IOException(String.format("Could not send message to Slack because '%s' is not defined!", Plugin.SETTING_TEAM));
+		String url = runtimeManager.getSettings().getString(Plugin.SETTING_URL, null);
+		if (StringUtils.isEmpty(url)) {
+			throw new IOException(String.format("Could not send message to Slack because '%s' is not defined!", Plugin.SETTING_URL));
 		}
-
-		String token = runtimeManager.getSettings().getString(Plugin.SETTING_TOKEN, null);
-		if (StringUtils.isEmpty(token)) {
-			throw new IOException(String.format("Could not send message to Slack because '%s' is not defined!", Plugin.SETTING_TOKEN));
-		}
-
-		String hook = runtimeManager.getSettings().getString(Plugin.SETTING_HOOK, "incoming-webhook");
-		if (StringUtils.isEmpty(hook)) {
-			hook = "incoming-webhook";
-		}
-
-		return String.format("https://%s.slack.com/services/hooks/%s?token=%s", team.toLowerCase(), hook, token);
+		return url;
 	}
 
 	/**