Use new formatter for channel nick changes.

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

@@ -79,6 +79,15 @@ ChannelSelfModeChangeEvent:
   format: "* You set mode: {{modes}}."
   colour: 3
 
+################## Channel user events #############################################################
+
+ChannelNickChangeEvent:
+  format: "* {{client.importantMode}}{{oldNick}} is now known as {{client.nickname}}."
+  colour: 3
+ChannelSelfNickChangeEvent:
+  format: "* You are now known as {{client.nickname}}."
+  colour: 3
+
 ################## Query events ####################################################################
 
 QueryActionEvent:
@@ -93,8 +102,6 @@ QuerySelfMessageEvent:
   format: "<{{user.nickname}}> {{message}}"
 
 ################## TODO ############################################################################
-#  channelNickChange=3* %1$s%5$s is now known as %2$s.
-#  channelSelfNickChange=3* You are now known as %2$s.
 #  channelUserAway=14-- %1$s%2$s is now away.
 #  channelUserBack=14-- %1$s%2$s is now back.
 #  channelUserAwayDiscovered=14-- %1$s%2$s is away.

src/com/dmdirc/ChannelEventHandler.java

@@ -39,6 +39,7 @@ import com.dmdirc.events.ChannelNoticeEvent;
 import com.dmdirc.events.ChannelPartEvent;
 import com.dmdirc.events.ChannelQuitEvent;
 import com.dmdirc.events.ChannelSelfModeChangeEvent;
+import com.dmdirc.events.ChannelSelfNickChangeEvent;
 import com.dmdirc.events.ChannelSelfPartEvent;
 import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.ChannelTopicUnsetEvent;
@@ -264,12 +265,17 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelInfo channel, final ChannelClientInfo client, final String oldNick) {
         checkParser(parser);
 
-        final ChannelNickChangeEvent event = new ChannelNickChangeEvent(date.getTime(), owner,
-                groupChatUserManager.getUserFromClient(client, owner), oldNick);
-        final String format = EventUtils.postDisplayable(eventBus, event,
-                isMyself(client) ? "channelSelfNickChange" : "channelNickChange");
-        owner.doNotification(date, format, groupChatUserManager.getUserFromClient(client, owner), oldNick);
         owner.renameClient(oldNick, client.getClient().getNickname());
+
+        if (isMyself(client)) {
+            eventBus.publishAsync(
+                    new ChannelSelfNickChangeEvent(date.getTime(), owner,
+                            groupChatUserManager.getUserFromClient(client, owner), oldNick));
+        } else {
+            eventBus.publishAsync(
+                    new ChannelNickChangeEvent(date.getTime(), owner,
+                            groupChatUserManager.getUserFromClient(client, owner), oldNick));
+        }
     }
 
     @Override

src/com/dmdirc/events/ChannelSelfNickChangeEvent.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2006-2015 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;
+
+/**
+ * Fired when the local user changes nickname in a channel.
+ */
+public class ChannelSelfNickChangeEvent extends ChannelDisplayableEvent {
+
+    private final GroupChatUser client;
+    private final String oldNick;
+
+    public ChannelSelfNickChangeEvent(final long timestamp, final Channel channel,
+            final GroupChatUser client, final String oldNick) {
+        super(timestamp, channel);
+        this.client = client;
+        this.oldNick = oldNick;
+    }
+
+    public ChannelSelfNickChangeEvent(final Channel channel, final GroupChatUser client,
+            final String oldNick) {
+        super(channel);
+        this.client = client;
+        this.oldNick = oldNick;
+    }
+
+    public GroupChatUser getClient() {
+        return client;
+    }
+
+    public String getOldNick() {
+        return oldNick;
+    }
+
+}