1.4.4-beta2

Author: BuildTools

.gitignore

@@ -0,0 +1 @@
+/target/

Slack.jar

@@ -1,4 +1,4 @@
-package us.circuitsoft.slack.api;
+package org.circuitsoft.slack.api;
 
 import java.io.BufferedOutputStream;
 import java.net.HttpURLConnection;
@@ -8,7 +8,7 @@
 import org.bukkit.scheduler.BukkitRunnable;
 import org.json.simple.JSONObject;
 
-import static us.circuitsoft.slack.bukkit.SlackBukkit.getWebhookUrl;
+import static org.circuitsoft.slack.bukkit.SlackBukkit.getWebhookUrl;
 
 /**
  * Posts a message to Slack when using Bukkit.

src/main/java/org/circuitsoft/slack/api/BukkitPoster.java

@@ -1,12 +1,12 @@
-package us.circuitsoft.slack.api;
+package org.circuitsoft.slack.api;
 
 import java.io.BufferedOutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
 import com.google.gson.JsonObject;
 
-import static us.circuitsoft.slack.bungee.SlackBungee.getWebhookUrl;
+import static org.circuitsoft.slack.bungee.SlackBungee.getWebhookUrl;
 
 /**
  * Posts a message to Slack when using Bungee.

src/main/java/org/circuitsoft/slack/api/BungeePoster.java

@@ -1,7 +1,9 @@
-package us.circuitsoft.slack.bukkit;
+package org.circuitsoft.slack.bukkit;
 
 import java.text.MessageFormat;
 import java.util.List;
+import java.util.UUID;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -47,7 +49,7 @@ public void onChat(AsyncPlayerChatEvent event) {
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onLogin(PlayerJoinEvent event) {
-        if (isVisible("slack.hide.login", event.getPlayer())) {
+        if (isVisible("slack.hide.login", event.getPlayer().getUniqueId())) {
             send("logged in", event.getPlayer().getName());
         }
     }
@@ -96,6 +98,14 @@ private boolean isVisible(String permission, Player player) {
             return true;
         }
     }
+    
+    private boolean isVisible(String permission, UUID uuid) {
+        if (getConfig().getBoolean("use-perms")) {
+            return !Bukkit.getServer().getPlayer(uuid).hasPermission(permission);
+        } else {
+            return true;
+        }
+    }
 
     @Override
     public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {

src/main/java/org/circuitsoft/slack/bukkit/SlackBukkit.java

@@ -1,4 +1,4 @@
-package us.circuitsoft.slack.bukkit;
+package org.circuitsoft.slack.bukkit;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;
@@ -9,7 +9,7 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.json.simple.JSONObject;
-import static us.circuitsoft.slack.bukkit.SlackBukkit.getWebhookUrl;
+import static org.circuitsoft.slack.bukkit.SlackBukkit.getWebhookUrl;
 
 /**
  * Poster for Slack plugin's internal use. Do not use this.
@@ -49,10 +49,12 @@ public void run() {
                 bufOut.flush();
             }
             webhookConnection.disconnect();
+            int responseCode = webhookConnection.getResponseCode();
+            String responseMessage = webhookConnection.getResponseMessage();
             if (plugin.getConfig().getBoolean("debug")) {
                 plugin.getLogger().log(Level.INFO, "{0} {1}", new Object[]{
-                    webhookConnection.getResponseCode(),
-                    webhookConnection.getResponseMessage()
+                    responseCode,
+                    responseMessage
                 });
             }
         } catch (MalformedURLException e) {

src/main/java/org/circuitsoft/slack/bukkit/SlackBukkitPoster.java

@@ -1,4 +1,4 @@
-package us.circuitsoft.slack.bungee;
+package org.circuitsoft.slack.bungee;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/org/circuitsoft/slack/bungee/SlackBungee.java

@@ -1,12 +1,12 @@
-package us.circuitsoft.slack.bungee;
+package org.circuitsoft.slack.bungee;
 
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.plugin.Command;
-import us.circuitsoft.slack.api.BungeePoster;
+import org.circuitsoft.slack.api.BungeePoster;
 
 public class SlackBungeeCommand extends Command {
 

src/main/java/org/circuitsoft/slack/bungee/SlackBungeeCommand.java

@@ -1,4 +1,4 @@
-package us.circuitsoft.slack.bungee;
+package org.circuitsoft.slack.bungee;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;
@@ -12,7 +12,7 @@
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.config.Configuration;
 
-import static us.circuitsoft.slack.bungee.SlackBungee.getWebhookUrl;
+import static org.circuitsoft.slack.bungee.SlackBungee.getWebhookUrl;
 
 /**
  * Poster for Slack plugin's internal use. Do not use this.
@@ -54,10 +54,12 @@ public void run() {
                 bufOut.flush();
             }
             webhookConnection.disconnect();
+            int responseCode = webhookConnection.getResponseCode();
+            String responseMessage = webhookConnection.getResponseMessage();
             if (config.getBoolean("debug")) {
                 plugin.getLogger().log(Level.INFO, "{0} {1}", new Object[]{
-                        webhookConnection.getResponseCode(),
-                        webhookConnection.getResponseMessage()
+                        responseCode,
+                        responseMessage
                 });
             }
         } catch (MalformedURLException e) {

src/main/java/org/circuitsoft/slack/bungee/SlackBungeePoster.java

@@ -1,4 +1,4 @@
 name: Slack
-main: us.circuitsoft.slack.bungee.SlackBungee
-version: 1.4.3
-author: CircuitSoft
+main: org.circuitsoft.slack.bungee.SlackBungee
+version: 1.4.4
+author: CircuitSoft