Better support of irc NOTICE

-Notices sent to irc channels can be relayed to irc
-Individual minecraft events can be shown as notices by using attributes

Author: dequis

Diff for: config.yml

@@ -108,6 +108,7 @@ settings:
       quit: '[%srcChannel%] * Quits: %sender% (%message%)'
       kick: '[%srcChannel%] * %sender% was kicked by %moderator% (%message%)'
       nick: '[%srcChannel%] * %sender% is now known as %message%'
+      notice: '[%srcChannel%] [NOTICE %sender%] %message%'
       generic: '%message%'
       mode: '[%srcChannel%] * %moderator% sets mode %message%'
     from-plain:
@@ -138,6 +139,7 @@ settings:
     #  quit: '%grey%[%srcChannel%]%blue% * Quits: %sender%'
     #  kick: '%grey%[%srcChannel%]%darkgreen% * %sender% was kicked by %ircModPrefix%%moderator%'
     #  nick: '%grey%[%srcChannel%]%darkgreen% * %sender% is now known as %message%'
+    #  notice: '%grey%[%srcChannel%]%foreground% [%purple%NOTICE%foreground% %ircPrefix%%sender%] %message%'
     #  generic: '%grey%%message%'
     #  mode: '%grey%[%srcChannel%]%darkgreen% * %moderator% sets mode %message%'
     #from-plain:
@@ -280,13 +282,19 @@ default-attributes:
     generic: true
     death: true
     mode: false
+    notice: false
 
     #Admin commands and /admins! can only be sent through a path where admin is set to true
     admin: false
 
     #True: Colors will be converted. False: Colors will be stripped.
     colors: true
 
+  # List of event types that should be sent as NOTICE on irc
+  notices:
+    admin: true
+    private: true
+
 
 # ******************* COLOR CONVERSION MAP *******************
 # Here you can assign 3-tuples with names, IRC colors and Minecraft colors.

Diff for: src/com/ensifera/animosity/craftirc/CraftIRC.java

@@ -197,9 +197,11 @@ public void onEnable() {
             //Ugly but there is no better way with this non-bukkit config
             this.configuration.getString("settings.formatting.from-game.players-list", "Online (%playerCount%/%maxPlayers%): %message%");
             this.configuration.getString("settings.formatting.from-game.players-nobody", "Nobody is minecrafting right now.");
+            this.configuration.getBoolean("default-attributes.notices.admin", true);
+            this.configuration.getBoolean("default-attributes.notices.private", true);
 
 
-            if (this.configuration.getNode("default-attributes").getBoolean("disable", false)) {
+            if (this.configuration.getBoolean("default-attributes.disable", false)) {
                 this.logDerp("All communication paths disabled because the 'disable' attribute was found. Check the config.");
             } else {
                 this.log("Enabled.");
@@ -789,6 +791,10 @@ boolean delivery(RelayedMessage msg, List<EndPoint> knownDestinations, String us
                 continue;
             }
             msg.setField("target", targetTag);
+
+            //Whether the event should be sent as a NOTICE on irc endpoints or not (Ignored in others)
+            msg.setFlag("notice", this.cPathAttribute(sourceTag, targetTag, "notices." + msg.getEvent()));
+
             //Check against path filters
             if (this.matchesFilter(msg, this.cPathFilters(sourceTag, targetTag))) {
                 if (knownDestinations != null) {

Diff for: src/com/ensifera/animosity/craftirc/IRCChannelPoint.java

@@ -55,12 +55,21 @@ public Security getSecurity() {
         return SecuredEndPoint.Security.UNSECURED;
     }
 
+    private void send(String target, String message, boolean isNotice) {
+        if (isNotice) {
+            this.bot.sendNotice(target, message);
+        } else {
+            this.bot.sendMessage(target, message);
+        }
+    }
+
     @Override
     public void messageIn(RelayedMessage msg) {
         String message = msg.getMessage(this);
         if (!this.allowColors) {
             message = Colors.removeFormattingAndColors(message);
         }
+        boolean isNotice = msg.getFlag("notice");
         if (message.length() > maxlen) {
             String[] messages;
             final StringBuilder builder = new StringBuilder(message.length());
@@ -80,30 +89,32 @@ public void messageIn(RelayedMessage msg) {
             }
             messages = builder.toString().split("\n");
             for (final String messagePart : messages) {
-                this.bot.sendMessage(this.channel, messagePart);
+                this.send(this.channel, messagePart, isNotice);
             }
         } else {
-            this.bot.sendMessage(this.channel, message);
+            this.send(this.channel, message, isNotice);
         }
     }
 
+
     @Override
     public boolean userMessageIn(String username, RelayedMessage msg) {
         if (this.bot.getChannelPrefixes().contains(username.substring(0, 1))) {
             return false;
         }
-        this.bot.sendNotice(username, msg.getMessage(this));
+        this.send(username, msg.getMessage(this), msg.getFlag("notice"));
         return true;
     }
 
     @Override
     public boolean adminMessageIn(RelayedMessage msg) {
         boolean success = false;
         final String message = msg.getMessage(this);
+        boolean isNotice = msg.getFlag("notice");
         for (final String nick : this.listDisplayUsers()) {
             if (this.bot.getPlugin().cBotAdminPrefixes(this.bot.getId()).contains(nick.substring(0, 1))) {
                 success = true;
-                this.bot.sendNotice(nick.substring(1), message);
+                this.send(nick.substring(1), message, isNotice);
             }
         }
         return success;

Diff for: src/com/ensifera/animosity/craftirc/Minebot.java

@@ -525,6 +525,29 @@ public void onMessage(String channel, String sender, String login, String hostna
         }
     }
 
+    @Override
+    protected void onNotice(String sender, String login, String hostname, String target, String notice) {
+        target = target.toLowerCase();
+        final RelayedMessage msg = this.plugin.newMsg(this.channels.get(target), null, "notice");
+        if (msg == null) {
+            return;
+        }
+        if (this.plugin.cUseMapAsWhitelist(this.botId) && !this.plugin.cNicknameIsInIrcMap(this.botId, sender)) {
+            return;
+        }
+        msg.setField("sender", this.plugin.cIrcDisplayName(this.botId, sender));
+        msg.setField("realSender", sender);
+        msg.setField("srcChannel", target);
+        msg.setField("message", notice);
+        msg.setField("ircPrefix", this.getHighestUserPrefix(this.getUser(sender, target)));
+        msg.setField("username", login);
+        msg.setField("hostname", hostname);
+        msg.doNotColor("message");
+        msg.doNotColor("username");
+        msg.doNotColor("hostname");
+        msg.post();
+    }
+
     @Override
     public void onAction(String sender, String login, String hostname, String target, String action) {
         target = target.toLowerCase();