Make channel part/quit events use the new formatter.

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

@@ -19,6 +19,20 @@ ChannelJoinEvent:
 ChannelSelfJoinEvent:
   format: "* You are now talking in {{channel.name}}."
   colour: 3
+ChannelPartEvent:
+  format: >
+             * {{client.modePrefixedNickname}} ({{client.username}}@{{client.hostname}})
+             has left {{channel.name}}{{message|bracketed}}.
+  colour: 3
+ChannelSelfPartEvent:
+  format: >
+             * You have left {{channel.name}}{{message|bracketed}}.
+  colour: 3
+ChannelQuitEvent:
+  format: >
+             * {{client.modePrefixedNickname}} ({{client.username}}@{{client.hostname}})
+             has quit IRC{{message|bracketed}}.
+  colour: 2
 
 ################## Channel message events ##########################################################
 
@@ -66,12 +80,6 @@ ChannelSelfModeChangeEvent:
   colour: 3
 
 # TODO:
-#  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).
-#  channelQuit=2* %1$s%2$s (%3$s@%4$s) has quit IRC.
-#  channelQuitReason=2* %1$s%2$s (%3$s@%4$s) has quit IRC (%5$s).
-#  channelSelfPart=3* You have left the channel.
-#  channelSelfPartReason=3* You have left the channel.
 #  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.

src/com/dmdirc/ChannelEventHandler.java

@@ -30,15 +30,16 @@ import com.dmdirc.events.ChannelJoinEvent;
 import com.dmdirc.events.ChannelKickEvent;
 import com.dmdirc.events.ChannelListModesRetrievedEvent;
 import com.dmdirc.events.ChannelMessageEvent;
-import com.dmdirc.events.ChannelModeNoticeEvent;
 import com.dmdirc.events.ChannelModeChangeEvent;
+import com.dmdirc.events.ChannelModeNoticeEvent;
 import com.dmdirc.events.ChannelModesDiscoveredEvent;
 import com.dmdirc.events.ChannelNickChangeEvent;
-import com.dmdirc.events.ChannelNoticeEvent;
 import com.dmdirc.events.ChannelNoTopicEvent;
+import com.dmdirc.events.ChannelNoticeEvent;
 import com.dmdirc.events.ChannelPartEvent;
 import com.dmdirc.events.ChannelQuitEvent;
 import com.dmdirc.events.ChannelSelfModeChangeEvent;
+import com.dmdirc.events.ChannelSelfPartEvent;
 import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.ChannelTopicUnsetEvent;
 import com.dmdirc.events.ChannelUserAwayEvent;
@@ -213,13 +214,13 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelClientInfo client, final String reason) {
         checkParser(parser);
 
-        final ChannelPartEvent event = new ChannelPartEvent(date.getTime(), owner,
-                groupChatUserManager.getUserFromClient(client, owner), reason);
-        final String format = EventUtils.postDisplayable(eventBus, event,
-                "channel"
-                + (isMyself(client) ? "Self" : "") + "Part"
-                + (reason.isEmpty() ? "" : "Reason"));
-        owner.doNotification(date, format, groupChatUserManager.getUserFromClient(client, owner), reason);
+        if (isMyself(client)) {
+            eventBus.publishAsync(new ChannelSelfPartEvent(date.getTime(), owner,
+                    groupChatUserManager.getUserFromClient(client, owner), reason));
+        } else {
+            eventBus.publishAsync(new ChannelPartEvent(date.getTime(), owner,
+                    groupChatUserManager.getUserFromClient(client, owner), reason));
+        }
         owner.removeClient(groupChatUserManager.getUserFromClient(client, owner));
     }
 
@@ -243,11 +244,8 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelClientInfo client, final String reason) {
         checkParser(parser);
 
-        final ChannelQuitEvent event = new ChannelQuitEvent(date.getTime(), owner,
-                groupChatUserManager.getUserFromClient(client, owner), reason);
-        final String format = EventUtils.postDisplayable(eventBus, event,
-                "channelQuit" + (reason.isEmpty() ? "" : "Reason"));
-        owner.doNotification(date, format, groupChatUserManager.getUserFromClient(client, owner), reason);
+        eventBus.publishAsync(new ChannelQuitEvent(date.getTime(), owner,
+                groupChatUserManager.getUserFromClient(client, owner), reason));
         owner.removeClient(groupChatUserManager.getUserFromClient(client, owner));
     }
 

src/com/dmdirc/events/ChannelSelfPartEvent.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 parts a channel.
+ */
+public class ChannelSelfPartEvent extends ChannelDisplayableEvent {
+
+    private final GroupChatUser client;
+    private final String message;
+
+    public ChannelSelfPartEvent(final long timestamp, final Channel channel,
+            final GroupChatUser client, final String message) {
+        super(timestamp, channel);
+        this.client = client;
+        this.message = message;
+    }
+
+    public ChannelSelfPartEvent(final Channel channel, final GroupChatUser client,
+            final String message) {
+        super(channel);
+        this.client = client;
+        this.message = message;
+    }
+
+    public GroupChatUser getClient() {
+        return client;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+}