Add permission option for IRC commands.

cnaude · Mar 27, 2014 · 230601c · 230601c
1 parent 2f46fdf
commit 230601c
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 13 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -99,7 +99,9 @@
       <releases>
         <enabled>false</enabled>
       </releases>
-      <snapshots />
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
       <id>sonatype-nexus-public</id>
       <name>SonaType public snapshots and releases repository</name>
       <url>https://oss.sonatype.org/content/groups/public</url>
@@ -122,11 +124,7 @@
       <url>http://repo.regularbox.com/artifactory/repo/</url>
     </repository>
     <repository>
-      <id>comphenix-rep</id>
-      <name>Comphenix Repository</name>
-      <url>http://repo.comphenix.net/content/groups/public</url>
-    </repository>
-    <repository>
+      <snapshots />
       <id>cnaude-repo</id>
       <url>http://cnaude.freeshell.org/repo/</url>
     </repository>

diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
                 <enabled>false</enabled>
             </releases> 
             <snapshots>
-                <enabled>true</enabled>
+                <enabled>false</enabled>
             </snapshots>
         </repository>
         <!-- Bukkit -->
@@ -49,11 +49,14 @@
             </snapshots>
         </repository>
 
-        <repository>
+        <!--<repository>
             <id>comphenix-rep</id>
             <name>Comphenix Repository</name>
             <url>http://repo.comphenix.net/content/groups/public</url>
-        </repository>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>-->
 
         <!-- Vault
         <repository>
@@ -65,6 +68,9 @@
         <repository>
             <id>cnaude-repo</id>
             <url>http://cnaude.freeshell.org/repo/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
         <!-- For JUnitBenchmarks -->
 

diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
@@ -725,6 +725,7 @@ private void loadConfig() {
                     optionPair.put("game_command", config.getString(commandKey + "game_command", "@help"));
                     optionPair.put("private_listen", config.getString(commandKey + "private_listen", "true"));
                     optionPair.put("channel_listen", config.getString(commandKey + "channel_listen", "true"));
+                    optionPair.put("perm", config.getString(commandKey + "perm", ""));
                     for (String s : optionPair.keySet()) {
                         config.set(commandKey + s, optionPair.get(s));
                     }

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/IRCMessageHandler.java b/src/main/java/com/cnaude/purpleirc/Utilities/IRCMessageHandler.java
@@ -14,6 +14,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
 import org.pircbotx.Channel;
 import org.pircbotx.User;
 
@@ -41,7 +43,7 @@ public IRCMessageHandler(PurpleIRC plugin) {
      * @param message
      * @param privateMessage
      */
-    public void processMessage(PurpleBot ircBot, User user, Channel channel, String message, boolean privateMessage) {                  
+    public void processMessage(PurpleBot ircBot, User user, Channel channel, String message, boolean privateMessage) {
         plugin.logDebug("processMessage: " + message);
         String myChannel = channel.getName();
         if (ircBot.muteList.get(myChannel).contains(user.getNick())) {
@@ -77,6 +79,7 @@ public void processMessage(PurpleBot ircBot, User user, Channel channel, String
 
                 String gameCommand = (String) ircBot.commandMap.get(myChannel).get(command).get("game_command");
                 String modes = (String) ircBot.commandMap.get(myChannel).get(command).get("modes");
+                String perm = (String) ircBot.commandMap.get(myChannel).get(command).get("perm");
                 boolean privateCommand = Boolean.parseBoolean(ircBot.commandMap.get(myChannel).get(command).get("private"));
                 boolean ctcpResponse = Boolean.parseBoolean(ircBot.commandMap.get(myChannel).get(command).get("ctcp"));
 
@@ -89,6 +92,8 @@ public void processMessage(PurpleBot ircBot, User user, Channel channel, String
                 plugin.logDebug("Target: " + target);
 
                 boolean modeOkay = false;
+                boolean permOkay = checkPerm(perm, user.getNick());
+
                 if (modes.equals("*")) {
                     modeOkay = true;
                 }
@@ -106,9 +111,9 @@ public void processMessage(PurpleBot ircBot, User user, Channel channel, String
                 }
                 if (modes.contains("s") && !modeOkay) {
                     modeOkay = user.getChannelsSuperOpIn().contains(channel);
-                }
+                }               
 
-                if (modeOkay) {
+                if (modeOkay && permOkay) {
                     if (gameCommand.equals("@list")) {
                         sendMessage(ircBot, target, plugin.getMCPlayers(ircBot, myChannel), ctcpResponse);
                     } else if (gameCommand.equals("@uptime")) {
@@ -179,7 +184,7 @@ public void processMessage(PurpleBot ircBot, User user, Channel channel, String
             if (privateMessage && !ircBot.relayPrivateChat) {
                 plugin.logDebug("Message NOT dispatched for broadcast due to \"relay-private-chat\" being false and this is a private message ...");
                 return;
-            }            
+            }
             plugin.logDebug("Message dispatched for broadcast...");
             ircBot.broadcastChat(user.getNick(), myChannel, message, false);
         }
@@ -207,4 +212,19 @@ private String getCommands(CaseInsensitiveMap<CaseInsensitiveMap<CaseInsensitive
         }
         return "";
     }
+
+    private boolean checkPerm(String perm, String playerName) {
+        if (perm.isEmpty()) {
+            return true;
+        }
+        Player player = plugin.getServer().getPlayer(playerName);  
+
+        if (player != null) {
+            plugin.logDebug("[checkPerm] Player " + playerName + " permission node " + perm + "=" + player.hasPermission(perm));
+            return player.hasPermission(perm);
+        } else {
+            plugin.logDebug("[checkPerm] Player not online: " + playerName);
+            return false;
+        }
+    }
 }