Add new formatter entries for channel mode changes.

res/com/dmdirc/ui/messages/format.yml

@@ -27,10 +27,14 @@ ChannelNotopicEvent:
 ChannelTopicUnsetEvent:
   format: "* {{client.modePrefixedNickname}} has removed the topic on {{channel.name}}."
   colour: 3
+ChannelModechangeEvent:
+  format: "* {{client.modePrefixedNickname}} sets mode: {{modes}}."
+  colour: 3
+ChannelSelfModeChangeEvent:
+  format: "* You set mode: {{modes}}."
+  colour: 3
 
 # TODO:
-#  channelModeChanged=3* %1$s%2$s sets mode: %5$s.
-#  channelSelfModeChanged=3* You set mode: %5$s.
 #  channelCTCP=4-!- CTCP %5$S from %1$s%2$s
 #  channelPart=3* %1$s%2$s (%3$s@%4$s) has left %6$s.
 #  channelPartReason=3* %1$s%2$s (%3$s@%4$s) has left %6$s (%5$s).

src/com/dmdirc/ChannelEventHandler.java

@@ -38,6 +38,7 @@ import com.dmdirc.events.ChannelNoticeEvent;
 import com.dmdirc.events.ChannelNotopicEvent;
 import com.dmdirc.events.ChannelPartEvent;
 import com.dmdirc.events.ChannelQuitEvent;
+import com.dmdirc.events.ChannelSelfModeChangeEvent;
 import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.ChannelTopicUnsetEvent;
 import com.dmdirc.events.ChannelUserAwayEvent;
@@ -289,13 +290,12 @@ public class ChannelEventHandler extends EventHandler implements
                 final String format = EventUtils.postDisplayable(eventBus, event,
                         modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
                 owner.doNotification(date, format, modes.length() <= 1 ? "" : modes);
+            } else if (isMyself(client)) {
+                eventBus.publishAsync(new ChannelSelfModeChangeEvent(date.getTime(), owner,
+                        groupChatUserManager.getUserFromClient(client, owner), modes));
             } else {
-                final ChannelModechangeEvent event = new ChannelModechangeEvent(date.getTime(),
-                        owner, groupChatUserManager.getUserFromClient(client, owner), modes);
-                final String format = EventUtils.postDisplayable(eventBus, event,
-                        isMyself(client) ? "channelSelfModeChanged" : "channelModeChanged");
-                owner.doNotification(date, format,
-                        groupChatUserManager.getUserFromClient(client, owner), modes);
+                eventBus.publishAsync(new ChannelModechangeEvent(date.getTime(), owner,
+                        groupChatUserManager.getUserFromClient(client, owner), modes));
             }
         }
 
@@ -386,13 +386,12 @@ public class ChannelEventHandler extends EventHandler implements
                 final String format = EventUtils.postDisplayable(eventBus, event,
                         modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
                 owner.doNotification(date, format, modes.length() <= 1 ? "" : modes);
+            } else if (isMyself(client)) {
+                eventBus.publishAsync(new ChannelSelfModeChangeEvent(date.getTime(), owner,
+                        groupChatUserManager.getUserFromClient(client, owner), modes));
             } else {
-                final ChannelModechangeEvent event = new ChannelModechangeEvent(date.getTime(),
-                        owner, groupChatUserManager.getUserFromClient(client, owner), modes);
-                final String format = EventUtils.postDisplayable(eventBus, event,
-                        isMyself(client) ? "channelSelfModeChanged" : "channelModeChanged");
-                owner.doNotification(date, format,
-                        groupChatUserManager.getUserFromClient(client, owner), modes);
+                eventBus.publishAsync(new ChannelModechangeEvent(date.getTime(), owner,
+                        groupChatUserManager.getUserFromClient(client, owner), modes));
             }
         }
 

src/com/dmdirc/events/ChannelSelfModeChangeEvent.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.events;
+
+import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChatUser;
+
+/**
+ * Event raised when the local client changes a channel mode.
+ */
+public class ChannelSelfModeChangeEvent extends ChannelModechangeEvent {
+
+    public ChannelSelfModeChangeEvent(final long timestamp, final Channel channel,
+            final GroupChatUser client, final String modes) {
+        super(timestamp, channel, client, modes);
+    }
+
+    public ChannelSelfModeChangeEvent(final Channel channel, final GroupChatUser client,
+            final String modes) {
+        super(channel, client, modes);
+    }
+
+}