More GroupChatUser changes.

src/com/dmdirc/ChannelEventHandler.java

@@ -184,10 +184,9 @@ public class ChannelEventHandler extends EventHandler implements
                 format = EventUtils.postDisplayable(eventBus, event,
                         "channelTopicRemoved");
             } else {
-                event = new ChannelTopicUnsetEvent(owner,
-                        channel.getChannelClient(channel.getTopicSetter(), true));
-                format = EventUtils.postDisplayable(eventBus, event,
-                        "channelTopicChanged");
+                event = new ChannelTopicUnsetEvent(owner, owner.getUser(owner.getConnection().get()
+                        .getUser(channel.getTopicSetter())).orElse(null));
+                format = EventUtils.postDisplayable(eventBus, event, "channelTopicChanged");
             }
             owner.doNotification(date, format, channel.getChannelClient(channel.getTopicSetter(),
                     true), channel.getTopic());
@@ -325,8 +324,8 @@ public class ChannelEventHandler extends EventHandler implements
                 format = "channelSplitUserMode_default";
             }
 
-            final ChannelUsermodechangeEvent event = new ChannelUsermodechangeEvent(owner, client,
-                    targetClient, mode);
+            final ChannelUsermodechangeEvent event = new ChannelUsermodechangeEvent(owner,
+                    owner.getUserFromClient(client), owner.getUserFromClient(targetClient), mode);
             final String result = EventUtils.postDisplayable(eventBus, event, format);
             owner.doNotification(date, result, client, targetClient, mode);
         }
@@ -338,7 +337,8 @@ public class ChannelEventHandler extends EventHandler implements
             final String type, final String message, final String host) {
         checkParser(parser);
 
-        final ChannelCtcpEvent event = new ChannelCtcpEvent(owner, client, type, message);
+        final ChannelCtcpEvent event = new ChannelCtcpEvent(owner, owner.getUserFromClient(client),
+                type, message);
         final String format = EventUtils.postDisplayable(eventBus, event, "channelCTCP");
         if (!event.isHandled()) {
             getConnection().sendCTCPReply(client.getClient().getNickname(), type, message);
@@ -414,8 +414,8 @@ public class ChannelEventHandler extends EventHandler implements
             final String host) {
         checkParser(parser);
 
-        final ChannelModeNoticeEvent event = new ChannelModeNoticeEvent(owner, client,
-                String.valueOf(prefix), message);
+        final ChannelModeNoticeEvent event = new ChannelModeNoticeEvent(owner,
+                owner.getUserFromClient(client), String.valueOf(prefix), message);
         final String format = EventUtils.postDisplayable(eventBus, event, "channelModeNotice");
         owner.doNotification(date, format, client, String.valueOf(prefix), message);
     }

src/com/dmdirc/commandparser/commands/channel/Ban.java

@@ -33,10 +33,12 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import java.util.Optional;
+
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
@@ -66,15 +68,18 @@ public class Ban extends Command implements IntelligentCommand {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
 
         if (args.getArguments().length == 0) {
-            showUsage(origin, args.isSilent(), "ban", "<user|host>");
+            showUsage(origin, args.isSilent(), INFO.getName(), INFO.getHelp());
             return;
         }
 
         String host = args.getArguments()[0];
-        final ChannelClientInfo user = channel.getChannelInfo().getChannelClient(host);
-        if (user != null && !user.getClient().getHostname().isEmpty()) {
+
+        final Optional<GroupChatUser> user
+                = channel.getUser(channel.getConnection().get().getUser(host));
+        final String hostname = user.flatMap(GroupChatUser::getHostname).orElse("");
+        if (!hostname.isEmpty()) {
             // TODO: Customisable ban masks, somehow.
-            host = "*!*@" + user.getClient().getHostname();
+            host = "*!*@" + hostname;
         }
 
         channel.getChannelInfo().alterMode(true, 'b', host);

src/com/dmdirc/events/ChannelCtcpEvent.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 on receiving a channel CTCP request.
  */
 public class ChannelCtcpEvent extends ChannelDisplayableEvent {
 
-    private final ChannelClientInfo client;
+    private final GroupChatUser client;
     private final String type;
     private final String message;
     private boolean handled;
 
     public ChannelCtcpEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, final String type, final String message) {
+            final GroupChatUser client, final String type, final String message) {
         super(timestamp, channel);
         this.client = client;
         this.type = type;
         this.message = message;
     }
 
-    public ChannelCtcpEvent(final Channel channel, final ChannelClientInfo client,
+    public ChannelCtcpEvent(final Channel channel, final GroupChatUser client,
             final String type, final String message) {
         super(channel);
         this.client = client;
@@ -51,7 +51,7 @@ public class ChannelCtcpEvent extends ChannelDisplayableEvent {
         this.message = message;
     }
 
-    public ChannelClientInfo getClient() {
+    public GroupChatUser getClient() {
         return client;
     }
 

src/com/dmdirc/events/ChannelModeNoticeEvent.java

@@ -23,26 +23,26 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fired when a channel mode is received.
  */
 public class ChannelModeNoticeEvent extends ChannelDisplayableEvent {
 
-    private final ChannelClientInfo client;
+    private final GroupChatUser client;
     private final String prefix;
     private final String message;
 
     public ChannelModeNoticeEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, final String prefix, final String message) {
+            final GroupChatUser client, final String prefix, final String message) {
         super(timestamp, channel);
         this.client = client;
         this.prefix = prefix;
         this.message = message;
     }
 
-    public ChannelModeNoticeEvent(final Channel channel, final ChannelClientInfo client,
+    public ChannelModeNoticeEvent(final Channel channel, final GroupChatUser client,
             final String prefix, final String message) {
         super(channel);
         this.client = client;
@@ -50,7 +50,7 @@ public class ChannelModeNoticeEvent extends ChannelDisplayableEvent {
         this.message = message;
     }
 
-    public ChannelClientInfo getClient() {
+    public GroupChatUser getClient() {
         return client;
     }
 

src/com/dmdirc/events/ChannelTopicUnsetEvent.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 topic is cleared.
  */
 public class ChannelTopicUnsetEvent extends ChannelDisplayableEvent {
 
-    private final ChannelClientInfo client;
+    private final GroupChatUser client;
 
     public ChannelTopicUnsetEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client) {
+            final GroupChatUser client) {
         super(timestamp, channel);
         this.client = client;
     }
 
-    public ChannelTopicUnsetEvent(final Channel channel, final ChannelClientInfo client) {
+    public ChannelTopicUnsetEvent(final Channel channel, final GroupChatUser client) {
         super(channel);
         this.client = client;
     }
 
-    public ChannelClientInfo getClient() {
+    public GroupChatUser getClient() {
         return client;
     }
 

src/com/dmdirc/events/ChannelUsermodechangeEvent.java

@@ -23,19 +23,19 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fired when a channel user mode change occurs.
  */
 public class ChannelUsermodechangeEvent extends ChannelDisplayableEvent {
 
-    private final ChannelClientInfo user;
-    private final ChannelClientInfo victim;
+    private final GroupChatUser user;
+    private final GroupChatUser victim;
     private final String modes;
 
     public ChannelUsermodechangeEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo user, final ChannelClientInfo victim, final String modes) {
+            final GroupChatUser user, final GroupChatUser victim, final String modes) {
         super(timestamp, channel);
         this.user = user;
         this.victim = victim;
@@ -43,18 +43,18 @@ public class ChannelUsermodechangeEvent extends ChannelDisplayableEvent {
     }
 
     public ChannelUsermodechangeEvent(final Channel channel,
-            final ChannelClientInfo user, final ChannelClientInfo victim, final String modes) {
+            final GroupChatUser user, final GroupChatUser victim, final String modes) {
         super(channel);
         this.user = user;
         this.victim = victim;
         this.modes = modes;
     }
 
-    public ChannelClientInfo getUser() {
+    public GroupChatUser getUser() {
         return user;
     }
 
-    public ChannelClientInfo getVictim() {
+    public GroupChatUser getVictim() {
         return victim;
     }
 

test/com/dmdirc/commandparser/commands/channel/BanTest.java

@@ -27,9 +27,10 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChatUser;
+import com.dmdirc.interfaces.User;
 import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
 
 import java.util.Optional;
 
@@ -39,16 +40,34 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.anyChar;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class BanTest {
 
+    @Mock private Connection connection;
+    @Mock private User user1;
+    @Mock private User user2;
+    @Mock private GroupChatUser groupChatUser;
+    @Mock private Channel channel;
     @Mock private CommandController controller;
+    @Mock private FrameContainer container;
+    @Mock private ChannelInfo channelInfo;
     private Ban command;
 
     @Before
     public void setup() {
+        when(channel.getChannelInfo()).thenReturn(channelInfo);
+        when(channel.getConnection()).thenReturn(Optional.of(connection));
+        when(connection.getUser("user")).thenReturn(user1);
+        when(connection.getUser("*!*@my.host.name")).thenReturn(user2);
+        when(groupChatUser.getHostname()).thenReturn(Optional.of("HOSTNAME"));
+        when(channel.getUser(user1)).thenReturn(Optional.of(groupChatUser));
+        when(channel.getUser(user2)).thenReturn(Optional.empty());
         when(controller.getCommandChar()).thenReturn('/');
         when(controller.getSilenceChar()).thenReturn('.');
         command = new Ban(controller);
@@ -56,46 +75,25 @@ public class BanTest {
 
     @Test
     public void testUsage() {
-        final FrameContainer tiw = mock(FrameContainer.class);
-        final Channel channel = mock(Channel.class);
-        command.execute(tiw, new CommandArguments(controller, "/ban"),
+        command.execute(container, new CommandArguments(controller, "/ban"),
                 new ChannelCommandContext(null, Ban.INFO, channel));
 
-        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
+        verify(container).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
 
     /** Tests that the ban command uses the correct hostname if given a user. */
     @Test
     public void testKnownUser() {
-        final FrameContainer container = mock(FrameContainer.class);
-        final ChannelInfo channelInfo = mock(ChannelInfo.class);
-        final ChannelClientInfo ccInfo = mock(ChannelClientInfo.class);
-        final ClientInfo clientInfo = mock(ClientInfo.class);
-        final Channel channel = mock(Channel.class);
-
-        when(channel.getChannelInfo()).thenReturn(channelInfo);
-        when(channelInfo.getChannelClient("user")).thenReturn(ccInfo);
-        when(ccInfo.getClient()).thenReturn(clientInfo);
-        when(clientInfo.getHostname()).thenReturn("my.host.name");
-        when(container.getConnection()).thenReturn(Optional.empty());
-
         command.execute(container, new CommandArguments(controller, "/ban user"),
                 new ChannelCommandContext(null, Ban.INFO, channel));
 
-        verify(channelInfo).alterMode(true, 'b', "*!*@my.host.name");
+        verify(channelInfo).alterMode(true, 'b', "*!*@HOSTNAME");
         verify(channelInfo).flushModes();
     }
 
     /** Tests that the ban command works if given a mask not a username. */
     @Test
     public void testHostmask() {
-        final FrameContainer container = mock(FrameContainer.class);
-        final ChannelInfo channelInfo = mock(ChannelInfo.class);
-        final Channel channel = mock(Channel.class);
-
-        when(channel.getChannelInfo()).thenReturn(channelInfo);
-        when(container.getConnection()).thenReturn(Optional.empty());
-
         command.execute(container, new CommandArguments(controller, "/ban *!*@my.host.name"),
                 new ChannelCommandContext(null, Ban.INFO, channel));