Add Shortify configuration option.

cnaude · Feb 20, 2014 · 924afb9 · 924afb9
1 parent 1f629da
commit 924afb9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/main/java/com/cnaude/purpleirc/IRCListeners/MessageListener.java b/src/main/java/com/cnaude/purpleirc/IRCListeners/MessageListener.java
@@ -42,8 +42,8 @@ public void onMessage(MessageEvent event) {
         User user = event.getUser();
 
         plugin.logDebug("Message caught <" + user.getNick() + ">: " + message);
-
-        if (plugin.shortifyHook != null) {
+                
+        if (plugin.shortifyHook != null && ircBot.isShortifyEnabled(channel.getName())) {
             message = plugin.shortifyHook.shorten(message);
         }
 

diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
@@ -66,7 +66,7 @@ public final class PurpleBot {
     public boolean showMOTD;
     public boolean channelCmdNotifyEnabled;
     public boolean relayPrivateChat;
-    public boolean partInvalidChannels;
+    public boolean partInvalidChannels;    
     public int botServerPort;
     public long chatDelay;
     public String botServer;
@@ -97,6 +97,7 @@ public final class PurpleBot {
     public CaseInsensitiveMap<Boolean> hideQuitWhenVanished;
     public CaseInsensitiveMap<Boolean> invalidCommandPrivate;
     public CaseInsensitiveMap<Boolean> invalidCommandCTCP;
+    private CaseInsensitiveMap<Boolean> shortify;
     public CaseInsensitiveMap<String> heroChannel;
     public CaseInsensitiveMap<Collection<String>> opsList;
     public CaseInsensitiveMap<Collection<String>> worldList;
@@ -125,6 +126,7 @@ public PurpleBot(File file, PurpleIRC plugin) {
         this.opsList = new CaseInsensitiveMap<Collection<String>>();
         this.heroChannel = new CaseInsensitiveMap<String>();
         this.invalidCommandCTCP = new CaseInsensitiveMap<Boolean>();
+        this.shortify = new CaseInsensitiveMap<Boolean>();
         this.invalidCommandPrivate = new CaseInsensitiveMap<Boolean>();
         this.hideQuitWhenVanished = new CaseInsensitiveMap<Boolean>();
         this.hideListWhenVanished = new CaseInsensitiveMap<Boolean>();
@@ -304,6 +306,13 @@ public void asyncConnect(CommandSender sender) {
         sender.sendMessage(connectMessage);
         asyncConnect();
     }
+
+    public boolean isShortifyEnabled(String channelName) {
+        if (shortify.containsKey(channelName)) {
+            return shortify.get(channelName);
+        }
+        return false;
+    }
 
     /**
      *
@@ -465,7 +474,7 @@ private void sanitizeServerName() {
     private void loadConfig() {
         try {
             config.load(file);
-            autoConnect = config.getBoolean("autoconnect", true);
+            autoConnect = config.getBoolean("autoconnect", true);            
             ssl = config.getBoolean("ssl", false);
             trustAllCerts = config.getBoolean("trust-all-certs", false);
             sendRawMessageOnConnect = config.getBoolean("raw-message-on-connect", false);
@@ -565,6 +574,9 @@ private void loadConfig() {
 
                 invalidCommandCTCP.put(channelName, config.getBoolean("channels." + enChannelName + ".invalid-command.ctcp", false));
                 plugin.logDebug("  InvalidCommandCTCP => " + invalidCommandCTCP.get(channelName));
+
+                shortify.put(channelName, config.getBoolean("channels." + enChannelName + ".shortify", true));
+                plugin.logDebug("  Shortify => " + shortify.get(channelName));
 
                 // build channel op list
                 Collection<String> cOps = new ArrayList<String>();

diff --git a/src/main/resources/SampleBot.yml b/src/main/resources/SampleBot.yml
@@ -70,6 +70,8 @@ channels:
     topic: New topic
     # topic-protect - Prevent others from changing the topic
     topic-protect: false    
+    # If the Shortify plugin is installed then shoten URLs sent from IRC
+    shortify: true
     # enabled-messages - These are the message types that are either sent to the game or IRC
     # config.yml. Remove or comment the messages you don't want.       
     enabled-messages: