Use GroupChat in Connection.getChannels().

Fix the channel message sink actually doing common channels...
I guess we're not really using that one.

src/com/dmdirc/Server.java

@@ -87,6 +87,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -489,8 +490,10 @@ public class Server extends FrameContainer implements Connection {
     }
 
     @Override
-    public Collection<Channel> getChannels() {
-        return channels.getAll();
+    public Collection<GroupChat> getChannels() {
+        return channels.getAll().parallelStream()
+                .map(c -> (GroupChat) c)
+                .collect(Collectors.toList());
     }
 
     @Override

src/com/dmdirc/commandparser/CommandManager.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser;
 
-import com.dmdirc.Channel;
 import com.dmdirc.GlobalWindow;
 import com.dmdirc.Query;
 import com.dmdirc.commandparser.commands.Command;
@@ -31,6 +30,7 @@ import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -178,8 +178,9 @@ public class CommandManager implements CommandController {
 
             if (command.getType() == CommandType.TYPE_CHANNEL
                     || command.getType() == CommandType.TYPE_CHAT) {
-                for (Channel channel : server.getChannels()) {
-                    registerCommandName(channel.getTabCompleter(),commandName, register);
+                for (GroupChat channel : server.getChannels()) {
+                    registerCommandName(channel.getWindowModel().getTabCompleter(),
+                            commandName, register);
                 }
             }
 

src/com/dmdirc/commandparser/commands/server/AllChannels.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.server;
 
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -34,6 +33,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
 
@@ -70,8 +70,9 @@ public class AllChannels extends Command implements IntelligentCommand {
         final Connection server = ((ServerCommandContext) context).getConnection();
         final String command = args.getArgumentsAsString();
 
-        for (Channel channel : server.getChannels()) {
-            channel.getCommandParser().parseCommand(channel, command);
+        for (GroupChat channel : server.getChannels()) {
+            channel.getWindowModel().getCommandParser().parseCommand(channel.getWindowModel(),
+                    command);
         }
     }
 

src/com/dmdirc/interfaces/Connection.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.interfaces;
 
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Invite;
 import com.dmdirc.Query;
@@ -169,7 +168,7 @@ public interface Connection {
      *
      * @return collection of channels belonging to this connection
      */
-    Collection<Channel> getChannels();
+    Collection<GroupChat> getChannels();
 
     /**
      * Retrieves this server's ignore list.

src/com/dmdirc/ui/messages/sink/ChannelMessageSink.java

@@ -22,11 +22,12 @@
 
 package com.dmdirc.ui.messages.sink;
 
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChat;
 
 import java.util.Date;
+import java.util.Optional;
 import java.util.regex.Pattern;
 
 import javax.inject.Inject;
@@ -55,18 +56,13 @@ public class ChannelMessageSink implements MessageSink {
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
-        final String user = String.format(patternMatches[0], args);
-        boolean found = false;
-
+        final String channelName = String.format(patternMatches[0], args);
         final Connection connection = source.getConnection().get();
-        for (Channel channel : connection.getChannels()) {
-            if (channel.getChannelInfo().getChannelClient(user) != null) {
-                channel.addLine(messageType, date, args);
-                found = true;
-            }
-        }
+        final Optional<GroupChat> channel = connection.getChannel(channelName);
 
-        if (!found) {
+        if (channel.isPresent()) {
+            channel.get().getWindowModel().addLine(messageType, date, args);
+        } else {
             if (patternMatches[1] == null) {
                 // No fallback specified
                 source.addLine(messageType, date, args);

src/com/dmdirc/ui/messages/sink/CommonChannelsMessageSink.java

@@ -22,9 +22,10 @@
 
 package com.dmdirc.ui.messages.sink;
 
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.User;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -56,13 +57,14 @@ public class CommonChannelsMessageSink implements MessageSink {
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
-        final String user = String.format(patternMatches[0], args);
+        final String username = String.format(patternMatches[0], args);
         final Connection connection = source.getConnection().get();
+        final User user = connection.getUser(username);
         boolean found = false;
 
-        for (Channel channel : connection.getChannels()) {
-            if (channel.getChannelInfo().getChannelClient(user) != null) {
-                channel.addLine(messageType, date, args);
+        for (GroupChat channel : connection.getChannels()) {
+            if (channel.getUser(user).isPresent()) {
+                channel.getWindowModel().addLine(messageType, date, args);
                 found = true;
             }
         }