1.4.2

mastercoms · Dec 25, 2014 · 95944de · 95944de
1 parent 9ec36ac
commit 95944de
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 24 deletions.
diff --git a/Slack.jar b/Slack.jar
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>us.circuitsoft.slack</groupId>
     <artifactId>Slack</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -36,4 +36,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/src/main/java/us/circuitsoft/slack/bukkit/SlackBukkit.java b/src/main/java/us/circuitsoft/slack/bukkit/SlackBukkit.java
@@ -39,28 +39,28 @@ public void onDisable() {
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onChat(AsyncPlayerChatEvent event) {
-        if (hasPermission("slack.hide.chat", event.getPlayer())) {
+        if (isVisible("slack.hide.chat", event.getPlayer())) {
             send('"' + event.getMessage() + '"', event.getPlayer().getName());
         }
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onLogin(PlayerJoinEvent event) {
-        if (hasPermission("slack.hide.login", event.getPlayer())) {
+        if (isVisible("slack.hide.login", event.getPlayer())) {
             send("logged in", event.getPlayer().getName());
         }
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onQuit(PlayerQuitEvent event) {
-        if (hasPermission("slack.hide.logout", event.getPlayer())) {
+        if (isVisible("slack.hide.logout", event.getPlayer())) {
             send("logged out", event.getPlayer().getName());
         }
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onCommand(PlayerCommandPreprocessEvent event) {
-        if (isOnBlacklist(event.getMessage()) && hasPermission("slack.hide.command", event.getPlayer()) && !event.getMessage().contains("/slack send")) {
+        if (isAllowed(event.getMessage()) && isVisible("slack.hide.command", event.getPlayer())) {
             send(event.getMessage(), event.getPlayer().getName());
         }
     }
@@ -73,9 +73,9 @@ public void send(String message, String name, String iconUrl) {
         new SlackBukkitPoster(this, message, name, iconUrl).runTaskAsynchronously(this);
     }
 
-    private boolean isOnBlacklist(String name) {
+    private boolean isAllowed(String command) {
         if (getConfig().getBoolean("use-blacklist")) {
-            return !blacklist.contains(name);
+            return !blacklist.contains(command);
         } else {
             return true;
         }
@@ -88,20 +88,14 @@ private void updateConfig(String version) {
         saveConfig();
     }
 
-    private boolean hasPermission(String permission, Player player) {
+    private boolean isVisible(String permission, Player player) {
         if (getConfig().getBoolean("use-perms")) {
             return !player.hasPermission(permission);
         } else {
             return true;
         }
     }
 
-    public void execute(String token, String command) {
-        if (token == null ? getConfig().getString("token") == null : token.equals(getConfig().getString("token"))) {
-            getServer().dispatchCommand(getServer().getConsoleSender(), command);
-        }
-    }
-
     @Override
     public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
         if (!cmd.getName().equalsIgnoreCase("slack")) {

diff --git a/src/main/java/us/circuitsoft/slack/bukkit/SlackBukkitPoster.java b/src/main/java/us/circuitsoft/slack/bukkit/SlackBukkitPoster.java
@@ -6,11 +6,9 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.logging.Level;
-
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.json.simple.JSONObject;
-
 import static us.circuitsoft.slack.bukkit.SlackBukkit.getWebhookUrl;
 
 /**
@@ -53,8 +51,8 @@ public void run() {
             webhookConnection.disconnect();
             if (plugin.getConfig().getBoolean("debug")) {
                 plugin.getLogger().log(Level.INFO, "{0} {1}", new Object[]{
-                        webhookConnection.getResponseCode(),
-                        webhookConnection.getResponseMessage()
+                    webhookConnection.getResponseCode(),
+                    webhookConnection.getResponseMessage()
                 });
             }
         } catch (MalformedURLException e) {

diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml
@@ -1,4 +1,4 @@
 name: Slack
 main: us.circuitsoft.slack.bungee.SlackBungee
-version: 1.4.1
-author: CircuitSoft
+version: 1.4.2
+author: CircuitSoft
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -1,5 +1,5 @@
 #The version. Do not touch this.
-version: 1.4.1
+version: 1.4.2
 #The incoming webhook URL you got from Slack.
 webhook: https://hooks.slack.com/services/
 #Show HTTP response codes in console
@@ -11,4 +11,4 @@ use-blacklist: false
 #Commands that will not show up in Slack when they are executed.
 blacklist:
     - /login
-    - /register
+    - /register
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: Slack
-version: 1.4.1
+version: 1.4.2
 description: Link your server to Slack!
 author: CircuitSoft
 authors: [Janmm14, LaxWasHere, it3d]