Use GroupChatUser some more.

src/com/dmdirc/Channel.java

@@ -292,7 +292,7 @@ public class Channel extends MessageTarget implements GroupChat {
         setIcon("channel-inactive");
 
         getEventBus().publishAsync(new NickListClientsChangedEvent(this,
-                Collections.<ChannelClientInfo>emptyList()));
+                Collections.<GroupChatUser>emptyList()));
     }
 
     @Override
@@ -332,11 +332,10 @@ public class Channel extends MessageTarget implements GroupChat {
      *
      * @param client The client to be added
      */
-    public void addClient(final ChannelClientInfo client) {
+    public void addClient(final GroupChatUser client) {
         getEventBus().publishAsync(new NickListClientAddedEvent(this, client));
 
-        getTabCompleter().addEntry(TabCompletionType.CHANNEL_NICK,
-                client.getClient().getNickname());
+        getTabCompleter().addEntry(TabCompletionType.CHANNEL_NICK, client.getNickname());
     }
 
     /**
@@ -344,13 +343,13 @@ public class Channel extends MessageTarget implements GroupChat {
      *
      * @param client The client to be removed
      */
-    public void removeClient(final ChannelClientInfo client) {
+    public void removeClient(final GroupChatUser client) {
         getEventBus().publishAsync(new NickListClientRemovedEvent(this, client));
 
         getTabCompleter().removeEntry(TabCompletionType.CHANNEL_NICK,
-                client.getClient().getNickname());
+                client.getNickname());
 
-        if (client.getClient().equals(server.getParser().get().getLocalClient())) {
+        if (client.getUser().equals(server.getLocalUser())) {
             resetWindow();
         }
     }
@@ -360,13 +359,13 @@ public class Channel extends MessageTarget implements GroupChat {
      *
      * @param clients The list of clients to use
      */
-    public void setClients(final Collection<ChannelClientInfo> clients) {
+    public void setClients(final Collection<GroupChatUser> clients) {
         getEventBus().publishAsync(new NickListClientsChangedEvent(this, clients));
 
         getTabCompleter().clear(TabCompletionType.CHANNEL_NICK);
 
         getTabCompleter().addEntries(TabCompletionType.CHANNEL_NICK,
-            clients.stream().map(c -> c.getClient().getNickname()).collect(Collectors.toList()));
+            clients.stream().map(GroupChatUser::getNickname).collect(Collectors.toList()));
     }
 
     /**
@@ -549,4 +548,9 @@ public class Channel extends MessageTarget implements GroupChat {
         return groupChatUserFactory.getGroupChatUser(user, this);
     }
 
+    public Collection<GroupChatUser> getUsers() {
+        return channelInfo.getChannelClients().stream().map(this::getUserFromClient)
+                .collect(Collectors.toList());
+    }
+
 }

src/com/dmdirc/ChannelEventHandler.java

@@ -76,6 +76,7 @@ import com.google.common.base.Strings;
 
 import java.util.Date;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 
@@ -148,7 +149,9 @@ public class ChannelEventHandler extends EventHandler implements
     public void onChannelGotNames(final Parser parser, final Date date, final ChannelInfo channel) {
         checkParser(parser);
 
-        owner.setClients(channel.getChannelClients());
+        owner.setClients(channel.getChannelClients().stream()
+                .map(owner::getUserFromClient)
+                .collect(Collectors.toList()));
         eventBus.publishAsync(new ChannelGotnamesEvent(owner));
     }
 
@@ -192,9 +195,9 @@ public class ChannelEventHandler extends EventHandler implements
         final Optional<Topic> currentTopic = owner.getCurrentTopic();
         final boolean hasNewTopic = !Strings.isNullOrEmpty(channel.getTopic());
         if (!isJoinTopic
-                || (!currentTopic.isPresent() && hasNewTopic)
-                || (currentTopic.isPresent() && !channel.getTopic().equals(
-                        owner.getCurrentTopic().get().getTopic()))) {
+                || !currentTopic.isPresent() && hasNewTopic
+                || currentTopic.isPresent() && !channel.getTopic().equals(
+                        owner.getCurrentTopic().get().getTopic())) {
             // Only add the topic if:
             //  - It's being set while we're in the channel (rather than discovered on join), or
             //  - We think the current topic is empty and are discovering a new one, or
@@ -211,7 +214,7 @@ public class ChannelEventHandler extends EventHandler implements
         final ChannelJoinEvent event = new ChannelJoinEvent(owner, client);
         final String format = EventUtils.postDisplayable(eventBus, event, "channelJoin");
         owner.doNotification(date, format, client);
-        owner.addClient(client);
+        owner.addClient(owner.getUserFromClient(client));
     }
 
     @Override
@@ -225,7 +228,7 @@ public class ChannelEventHandler extends EventHandler implements
                 + (isMyself(client) ? "Self" : "") + "Part"
                 + (reason.isEmpty() ? "" : "Reason"));
         owner.doNotification(date, format, client, reason);
-        owner.removeClient(client);
+        owner.removeClient(owner.getUserFromClient(client));
     }
 
     @Override
@@ -238,7 +241,7 @@ public class ChannelEventHandler extends EventHandler implements
         final String format = EventUtils.postDisplayable(eventBus, event,
                 "channelKick" + (reason.isEmpty() ? "" : "Reason"));
         owner.doNotification(date, format, client, kickedClient, reason);
-        owner.removeClient(kickedClient);
+        owner.removeClient(owner.getUserFromClient(kickedClient));
     }
 
     @Override
@@ -250,7 +253,7 @@ public class ChannelEventHandler extends EventHandler implements
         final String format = EventUtils.postDisplayable(eventBus, event,
                 "channelQuit" + (reason.isEmpty() ? "" : "Reason"));
         owner.doNotification(date, format, client, reason);
-        owner.removeClient(client);
+        owner.removeClient(owner.getUserFromClient(client));
     }
 
     @Override

src/com/dmdirc/events/NickListClientAddedEvent.java

@@ -23,27 +23,27 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fired when a user is added to the list of users.
  */
 public class NickListClientAddedEvent extends NickListEvent {
 
-    private final ChannelClientInfo user;
+    private final GroupChatUser user;
 
     public NickListClientAddedEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo user) {
+            final GroupChatUser user) {
         super(timestamp, channel);
         this.user = user;
     }
 
-    public NickListClientAddedEvent(final Channel channel, final ChannelClientInfo user) {
+    public NickListClientAddedEvent(final Channel channel, final GroupChatUser user) {
         super(channel);
         this.user = user;
     }
 
-    public ChannelClientInfo getUser() {
+    public GroupChatUser getUser() {
         return user;
     }
 }

src/com/dmdirc/events/NickListClientRemovedEvent.java

@@ -23,27 +23,27 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fired when a user is removed from the list of users.
  */
 public class NickListClientRemovedEvent extends NickListEvent {
 
-    private final ChannelClientInfo user;
+    private final GroupChatUser user;
 
     public NickListClientRemovedEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo user) {
+            final GroupChatUser user) {
         super(timestamp, channel);
         this.user = user;
     }
 
-    public NickListClientRemovedEvent(final Channel channel, final ChannelClientInfo user) {
+    public NickListClientRemovedEvent(final Channel channel, final GroupChatUser user) {
         super(channel);
         this.user = user;
     }
 
-    public ChannelClientInfo getUser() {
+    public GroupChatUser getUser() {
         return user;
     }
 }

src/com/dmdirc/events/NickListClientsChangedEvent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 import com.google.common.collect.Lists;
 
@@ -35,21 +35,21 @@ import java.util.Collections;
  */
 public class NickListClientsChangedEvent extends NickListEvent {
 
-    private final Collection<ChannelClientInfo> users;
+    private final Collection<GroupChatUser> users;
 
     public NickListClientsChangedEvent(final long timestamp, final Channel channel,
-            final Iterable<ChannelClientInfo> users) {
+            final Iterable<GroupChatUser> users) {
         super(timestamp, channel);
         this.users = Lists.newArrayList(users);
     }
 
     public NickListClientsChangedEvent(final Channel channel,
-            final Iterable<ChannelClientInfo> users) {
+            final Iterable<GroupChatUser> users) {
         super(channel);
         this.users = Lists.newArrayList(users);
     }
 
-    public Collection<ChannelClientInfo> getUsers() {
+    public Collection<GroupChatUser> getUsers() {
         return Collections.unmodifiableCollection(users);
     }
 }