Switch channel away/back to new formatters.

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

@@ -92,6 +92,12 @@ ChannelKickEvent:
              * {{client.modePrefixedNickname}} has kicked {{victim.modePrefixedNickname}} from
              {{channel.name}}{{reason|bracketed}}.
   colour: 3
+ChannelUserAwayEvent:
+  format: "-- {{user.modePrefixedNickname}} is now away."
+  colour: 14
+channelUserBackEvent:
+  format: "-- {{user.modePrefixedNickname}} is now back."
+  colour: 14
 
 ################## Query events ####################################################################
 
@@ -115,10 +121,6 @@ CommandOutputEvent:
   format: "{{message}}"
 
 ################## TODO ############################################################################
-#  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.
-#  channelUserBackDiscovered=14-- %1$s%2$s is back.
 #  channelSplitUserMode_default=3* %1$s%2$s sets mode %9$s on %6$s.
 #  channelNoModes=3* There are no channel modes for %2$s.
 #  channelModeDiscovered=3* Channel modes for %2$s are: %1$s.

src/com/dmdirc/ChannelEventHandler.java

@@ -45,10 +45,8 @@ import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.ChannelTopicUnsetEvent;
 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
-import com.dmdirc.events.ChannelUserEvent;
 import com.dmdirc.events.ChannelUserModeChangeEvent;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
@@ -342,21 +340,13 @@ public class ChannelEventHandler extends EventHandler implements
             final ClientInfo client, final AwayState oldState, final AwayState state) {
         checkParser(parser);
 
-        final Optional<GroupChatUser> channelClient
-                = owner.getUser(owner.getConnection().get().getUser(client.getNickname()));
-
-        if (channelClient.isPresent()) {
-            final boolean away = state == AwayState.AWAY;
-            final boolean discovered = oldState == AwayState.UNKNOWN;
-
-            final ChannelUserEvent event = away
-                    ? new ChannelUserAwayEvent(date.getTime(), owner, channelClient.get())
-                    : new ChannelUserBackEvent(date.getTime(), owner, channelClient.get());
-            final String format = EventUtils.postDisplayable(eventBus, event,
-                    (away ? "channelUserAway" : "channelUserBack")
-                    + (discovered ? "Discovered" : ""));
-            owner.doNotification(date, format, channelClient);
-        }
+        owner.getUser(owner.getConnection().get().getUser(client.getNickname())).ifPresent(c -> {
+            if (state == AwayState.AWAY) {
+                eventBus.publishAsync(new ChannelUserAwayEvent(date.getTime(), owner, c));
+            } else {
+                eventBus.publishAsync(new ChannelUserBackEvent(date.getTime(), owner, c));
+            }
+        });
     }
 
     @Override