Switch events to User.

src/com/dmdirc/Client.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc;
 
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.User;
 
@@ -36,19 +37,23 @@ import java.util.Optional;
 public class Client implements User {
 
     private final Collection<GroupChat> groupChats;
+    private final Connection connection;
     private String nickname;
     private Optional<String> username;
     private Optional<String> hostname;
     private Optional<String> realname;
     private Optional<String> awayMessage;
 
-    public Client(final String nickname) {
-        this(nickname, Optional.empty(), Optional.empty(), Optional.empty());
+    public Client(final String nickname, final Connection connection) {
+        this(nickname, connection, Optional.empty(), Optional.empty(), Optional.empty());
     }
 
-    public Client(final String nickname, final Optional<String> username,
-            final Optional<String> hostname, final Optional<String> realname) {
+    public Client(final String nickname, final Connection connection,
+            final Optional<String> username,
+            final Optional<String> hostname,
+            final Optional<String> realname) {
         this.nickname = nickname;
+        this.connection = connection;
         this.username = username;
         this.hostname = hostname;
         this.realname = realname;
@@ -120,4 +125,9 @@ public class Client implements User {
     public void setAwayMessage(final Optional<String> awayMessage) {
         this.awayMessage = awayMessage;
     }
+
+    @Override
+    public Connection getConnection() {
+        return connection;
+    }
 }

src/com/dmdirc/Query.java

@@ -68,6 +68,8 @@ public class Query extends MessageTarget implements PrivateActionListener,
         PrivateMessageListener, NickChangeListener, QuitListener,
         CompositionStateChangeListener, PrivateChat {
 
+    /** User factory. */
+    private final UserFactory userFactory;
     /** The Server this Query is on. */
     private final Server server;
     /** The full host of the client associated with this query. */
@@ -92,7 +94,8 @@ public class Query extends MessageTarget implements PrivateActionListener,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final BackBufferFactory backBufferFactory) {
+            final BackBufferFactory backBufferFactory,
+            final UserFactory userFactory) {
         super(newServer, "query", newServer.parseHostmask(newHost)[0],
                 newServer.parseHostmask(newHost)[0],
                 newServer.getConfigManager(),
@@ -108,6 +111,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
                         WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));
 
+        this.userFactory = userFactory;
         this.server = newServer;
         this.host = newHost;
         this.nickname = server.parseHostmask(host)[0];
@@ -129,8 +133,17 @@ public class Query extends MessageTarget implements PrivateActionListener,
         splitLine(line).stream().filter(part -> !part.isEmpty()).forEach(part -> {
             server.getParser().get().sendMessage(target, part);
 
+            final ClientInfo me = server.getParser().get().getLocalClient();
+            userFactory.getUser(me.getNickname(), getConnection().get(),
+                    Optional.ofNullable(me.getUsername()),
+                    Optional.ofNullable(me.getHostname()),
+                    Optional.ofNullable(me.getRealname()));
             final String format = EventUtils.postDisplayable(getEventBus(),
-                    new QuerySelfMessageEvent(this, server.getParser().get().getLocalClient(),
+                    new QuerySelfMessageEvent(this,
+                            userFactory.getUser(me.getNickname(), getConnection().get(),
+                            Optional.ofNullable(me.getUsername()),
+                            Optional.ofNullable(me.getHostname()),
+                            Optional.ofNullable(me.getRealname())),
                             part),
                     "querySelfMessage");
             doNotification(format, server.getParser().get().getLocalClient(), part);
@@ -170,7 +183,11 @@ public class Query extends MessageTarget implements PrivateActionListener,
             server.getParser().get().sendAction(getNickname(), action);
 
             final String format = EventUtils.postDisplayable(getEventBus(),
-                    new QuerySelfActionEvent(this, client, action),
+                    new QuerySelfActionEvent(this,
+                            userFactory.getUser(client.getNickname(), getConnection().get(),
+                            Optional.ofNullable(client.getUsername()),
+                            Optional.ofNullable(client.getHostname()),
+                            Optional.ofNullable(client.getRealname())), action),
                     "querySelfAction");
             doNotification(format, client, action);
         } else {
@@ -183,8 +200,13 @@ public class Query extends MessageTarget implements PrivateActionListener,
             final String message, final String host) {
         final String[] parts = server.parseHostmask(host);
 
+        final ClientInfo client = parser.getClient(host);
         final String format = EventUtils.postDisplayable(getEventBus(),
-                new QueryMessageEvent(this, parser.getClient(host), message), "queryMessage");
+                new QueryMessageEvent(this,
+                        userFactory.getUser(client.getNickname(), getConnection().get(),
+                        Optional.ofNullable(client.getUsername()),
+                        Optional.ofNullable(client.getHostname()),
+                        Optional.ofNullable(client.getRealname())), message), "queryMessage");
         addLine(format, parts[0], parts[1], parts[2], message);
     }
 
@@ -193,8 +215,13 @@ public class Query extends MessageTarget implements PrivateActionListener,
             final String message, final String host) {
         final String[] parts = server.parseHostmask(host);
 
+        final ClientInfo client = parser.getClient(host);
         final String format = EventUtils.postDisplayable(getEventBus(),
-                new QueryActionEvent(this, parser.getClient(host), message),
+                new QueryActionEvent(this,
+                        userFactory.getUser(client.getNickname(), getConnection().get(),
+                        Optional.ofNullable(client.getUsername()),
+                        Optional.ofNullable(client.getHostname()),
+                        Optional.ofNullable(client.getRealname())), message),
                 "queryAction");
         addLine(format, parts[0], parts[1], parts[2], message);
     }

src/com/dmdirc/QueryFactory.java

@@ -42,21 +42,24 @@ public class QueryFactory {
     private final MessageSinkManager messageSinkManager;
     private final URLBuilder urlBuilder;
     private final BackBufferFactory backBufferFactory;
+    private final UserFactory userFactory;
 
     @Inject
     public QueryFactory(final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController, final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder, final BackBufferFactory backBufferFactory) {
+            final URLBuilder urlBuilder, final BackBufferFactory backBufferFactory,
+            final UserFactory userFactory) {
         this.tabCompleterFactory = tabCompleterFactory;
         this.commandController = commandController;
         this.messageSinkManager = messageSinkManager;
         this.urlBuilder = urlBuilder;
         this.backBufferFactory = backBufferFactory;
+        this.userFactory = userFactory;
     }
 
     public Query getQuery(final Server server, final String host) {
         return new Query(server, host, tabCompleterFactory, commandController,
-                messageSinkManager, urlBuilder, backBufferFactory);
+                messageSinkManager, urlBuilder, backBufferFactory, userFactory);
     }
 
 }

src/com/dmdirc/Server.java

@@ -216,7 +216,8 @@ public class Server extends FrameContainer implements Connection {
             final ScheduledExecutorService executorService,
             @Nonnull final URI uri,
             @Nonnull final Profile profile,
-            final BackBufferFactory backBufferFactory) {
+            final BackBufferFactory backBufferFactory,
+            final UserFactory userFactory) {
         super(null, "server-disconnected",
                 getHost(uri),
                 getHost(uri),
@@ -246,7 +247,7 @@ public class Server extends FrameContainer implements Connection {
         this.messageEncoderFactory = messageEncoderFactory;
 
         awayMessage = Optional.empty();
-        eventHandler = new ServerEventHandler(this, eventBus);
+        eventHandler = new ServerEventHandler(this, eventBus, userFactory);
 
         this.address = uri;
         this.profile = profile;

src/com/dmdirc/ServerEventHandler.java

@@ -117,6 +117,8 @@ public class ServerEventHandler extends EventHandler implements
     private final Server owner;
     /** Event bus to post events to. */
     private final DMDircMBassador eventBus;
+    /** User factory to create Users. */
+    private final UserFactory userFactory;
 
     /**
      * Creates a new instance of ServerEventHandler.
@@ -124,10 +126,12 @@ public class ServerEventHandler extends EventHandler implements
      * @param owner    The Server instance that we're handling events for
      * @param eventBus The event bus to post events to
      */
-    public ServerEventHandler(final Server owner, final DMDircMBassador eventBus) {
+    public ServerEventHandler(final Server owner, final DMDircMBassador eventBus,
+            final UserFactory userFactory) {
         super(eventBus);
         this.owner = owner;
         this.eventBus = eventBus;
+        this.userFactory = userFactory;
     }
 
     @Override
@@ -374,8 +378,12 @@ public class ServerEventHandler extends EventHandler implements
 
         if (parser.getLocalClient().equals(parser.getClient(host))) {
             // Local client
+            final ClientInfo me = parser.getLocalClient();
             final QuerySelfMessageEvent event = new QuerySelfMessageEvent(owner.getQuery(target),
-                    parser.getLocalClient(), message);
+                    userFactory.getUser(me.getNickname(), owner.getConnection().get(),
+                            Optional.ofNullable(me.getUsername()),
+                            Optional.ofNullable(me.getHostname()),
+                            Optional.ofNullable(me.getRealname())), message);
             final String format = EventUtils.postDisplayable(eventBus, event,
                     "querySelfExternalMessage");
             owner.getQuery(target).doNotification(format, parser.getLocalClient(), message);
@@ -394,8 +402,12 @@ public class ServerEventHandler extends EventHandler implements
 
         if (parser.getLocalClient().equals(parser.getClient(host))) {
             // Local client
+            final ClientInfo me = parser.getLocalClient();
             final QuerySelfActionEvent event = new QuerySelfActionEvent(owner.getQuery(target),
-                    parser.getLocalClient(), message);
+                    userFactory.getUser(me.getNickname(), owner.getConnection().get(),
+                            Optional.ofNullable(me.getUsername()),
+                            Optional.ofNullable(me.getHostname()),
+                            Optional.ofNullable(me.getRealname())), message);
             final String format = EventUtils.postDisplayable(eventBus, event,
                     "querySelfExternalAction");
             owner.getQuery(target).doNotification(format, parser.getLocalClient(), message);

src/com/dmdirc/ServerFactoryImpl.java

@@ -60,6 +60,7 @@ public class ServerFactoryImpl {
     private final MessageEncoderFactory messageEncoderFactory;
     private final ConfigProvider userSettings;
     private final BackBufferFactory backBufferFactory;
+    private final UserFactory userFactory;
 
     @Inject
     public ServerFactoryImpl(
@@ -76,7 +77,8 @@ public class ServerFactoryImpl {
             final DMDircMBassador eventBus,
             final MessageEncoderFactory messageEncoderFactory,
             @ClientModule.UserConfig final ConfigProvider userSettings,
-            final BackBufferFactory backBufferFactory) {
+            final BackBufferFactory backBufferFactory,
+            final UserFactory userFactory) {
         this.manager = manager;
         this.parserFactory = parserFactory;
         this.tabCompleterFactory = tabCompleterFactory;
@@ -91,6 +93,7 @@ public class ServerFactoryImpl {
         this.messageEncoderFactory = messageEncoderFactory;
         this.userSettings = userSettings;
         this.backBufferFactory = backBufferFactory;
+        this.userFactory = userFactory;
     }
 
     public Server getServer(
@@ -103,6 +106,6 @@ public class ServerFactoryImpl {
                 tabCompleterFactory, identityFactory, messageSinkManager, windowManager,
                 channelFactory.get(), queryFactory.get(), rawFactory.get(),urlBuilder, eventBus,
                 messageEncoderFactory, userSettings, executorService, uri, profile,
-                backBufferFactory);
+                backBufferFactory, userFactory);
     }
 }

src/com/dmdirc/UserFactory.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc;
 
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.User;
 
 import java.util.Optional;
@@ -37,12 +38,13 @@ public class UserFactory {
     public UserFactory() {
     }
 
-    public User getUser(final String nickname) {
-        return new Client(nickname);
+    public User getUser(final String nickname, final Connection connection) {
+        return new Client(nickname, connection);
     }
 
-    public User getUser(final String nickname, final Optional<String> username,
-            final Optional<String> hostname, final Optional<String> realname) {
-        return new Client(nickname, username, hostname, realname);
+    public User getUser(final String nickname, final Connection connection,
+            final Optional<String> username, final Optional<String> hostname,
+            final Optional<String> realname) {
+        return new Client(nickname, connection, username, hostname, realname);
     }
 }

src/com/dmdirc/events/BaseQueryActionEvent.java

@@ -23,20 +23,20 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Query;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Base class for query action events.
  */
 public abstract class BaseQueryActionEvent extends BaseQueryTextEvent {
 
-    public BaseQueryActionEvent(final long timestamp, final Query query, final ClientInfo client,
+    public BaseQueryActionEvent(final long timestamp, final Query query, final User user,
             final String message) {
-        super(timestamp, query, client, message);
+        super(timestamp, query, user, message);
     }
 
-    public BaseQueryActionEvent(final Query query, final ClientInfo client, final String message) {
-        super(query, client, message);
+    public BaseQueryActionEvent(final Query query, final User user, final String message) {
+        super(query, user, message);
     }
 
 }

src/com/dmdirc/events/BaseQueryMessageEvent.java

@@ -23,20 +23,20 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Query;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Base class for query message events.
  */
 public abstract class BaseQueryMessageEvent extends BaseQueryTextEvent {
 
-    public BaseQueryMessageEvent(final long timestamp, final Query query, final ClientInfo client,
+    public BaseQueryMessageEvent(final long timestamp, final Query query, final User user,
             final String message) {
-        super(timestamp, query, client, message);
+        super(timestamp, query, user, message);
     }
 
-    public BaseQueryMessageEvent(final Query query, final ClientInfo client, final String message) {
-        super(query, client, message);
+    public BaseQueryMessageEvent(final Query query, final User user, final String message) {
+        super(query, user, message);
     }
 
 }

src/com/dmdirc/events/BaseQueryTextEvent.java

@@ -23,31 +23,31 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Query;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Base class for query message and action events.
  */
 public abstract class BaseQueryTextEvent extends QueryDisplayableEvent {
 
-    private final ClientInfo client;
+    private final User user;
     private final String message;
 
-    public BaseQueryTextEvent(final long timestamp, final Query query, final ClientInfo client,
+    public BaseQueryTextEvent(final long timestamp, final Query query, final User user,
             final String message) {
         super(timestamp, query);
-        this.client = client;
+        this.user = user;
         this.message = message;
     }
 
-    public BaseQueryTextEvent(final Query query, final ClientInfo client, final String message) {
+    public BaseQueryTextEvent(final Query query, final User user, final String message) {
         super(query);
-        this.client = client;
+        this.user = user;
         this.message = message;
     }
 
-    public ClientInfo getClient() {
-        return client;
+    public User getUser() {
+        return user;
     }
 
     public String getMessage() {

src/com/dmdirc/events/QueryActionEvent.java

@@ -23,20 +23,20 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Query;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Fired when an action occurs in a query.
  */
 public class QueryActionEvent extends BaseQueryActionEvent {
 
-    public QueryActionEvent(final long timestamp, final Query query, final ClientInfo client,
+    public QueryActionEvent(final long timestamp, final Query query, final User user,
             final String message) {
-        super(timestamp, query, client, message);
+        super(timestamp, query, user, message);
     }
 
-    public QueryActionEvent(final Query query, final ClientInfo client, final String message) {
-        super(query, client, message);
+    public QueryActionEvent(final Query query, final User user, final String message) {
+        super(query, user, message);
     }
 
 }

src/com/dmdirc/events/QueryMessageEvent.java

@@ -23,20 +23,20 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Query;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Fired when a message occurs in a query.
  */
 public class QueryMessageEvent extends BaseQueryMessageEvent {
 
-    public QueryMessageEvent(final long timestamp, final Query query, final ClientInfo client,
+    public QueryMessageEvent(final long timestamp, final Query query, final User user,
             final String message) {
-        super(timestamp, query, client, message);
+        super(timestamp, query, user, message);
     }
 
-    public QueryMessageEvent(final Query query, final ClientInfo client, final String message) {
-        super(query, client, message);
+    public QueryMessageEvent(final Query query, final User user, final String message) {
+        super(query, user, message);
     }
 
 }

src/com/dmdirc/events/QuerySelfActionEvent.java

@@ -23,20 +23,20 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Query;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Fired when a self action is sent in query.
  */
 public class QuerySelfActionEvent extends BaseQueryActionEvent {
 
-    public QuerySelfActionEvent(final long timestamp, final Query query, final ClientInfo client,
+    public QuerySelfActionEvent(final long timestamp, final Query query, final User user,
             final String message) {
-        super(timestamp, query, client, message);
+        super(timestamp, query, user, message);
     }
 
-    public QuerySelfActionEvent(final Query query, final ClientInfo client, final String message) {
-        super(query, client, message);
+    public QuerySelfActionEvent(final Query query, final User user, final String message) {
+        super(query, user, message);
     }
 
 }

src/com/dmdirc/events/QuerySelfMessageEvent.java

@@ -23,19 +23,19 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Query;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Fired when a self message happens in a query.
  */
 public class QuerySelfMessageEvent extends BaseQueryMessageEvent {
 
-    public QuerySelfMessageEvent(final long timestamp, final Query query, final ClientInfo client,
+    public QuerySelfMessageEvent(final long timestamp, final Query query, final User user,
             final String message) {
-        super(timestamp, query, client, message);
+        super(timestamp, query, user, message);
     }
 
-    public QuerySelfMessageEvent(final Query query, final ClientInfo client, final String message) {
-        super(query, client, message);
+    public QuerySelfMessageEvent(final Query query, final User user, final String message) {
+        super(query, user, message);
     }
 }

src/com/dmdirc/interfaces/User.java

@@ -120,4 +120,11 @@ public interface User {
      * @param awayMessage Optional.empty if the user is not away, wrapped away reason if they are
      */
     void setAwayMessage(final Optional<String> awayMessage);
+
+    /**
+     * Gets the {@link Connection} for this client.
+     *
+     * @return Non-Null connection for this connection
+     */
+    Connection getConnection();
 }

test/com/dmdirc/ServerEventHandlerTest.java

@@ -66,6 +66,7 @@ public class ServerEventHandlerTest {
     @Mock private CallbackManager callbackManager;
     @Mock private DMDircMBassador eventBus;
     @Mock private ChannelInfo channelInfo;
+    @Mock private UserFactory userFactory;
     @Mock private ClientInfo clientInfo;
     @Mock private Query query;
     @Mock private Date date;
@@ -76,7 +77,7 @@ public class ServerEventHandlerTest {
         when(server.getState()).thenReturn(ServerState.CONNECTED);
         when(parser.getCallbackManager()).thenReturn(callbackManager);
 
-        final ServerEventHandler handler = new ServerEventHandler(server, eventBus);
+        final ServerEventHandler handler = new ServerEventHandler(server, eventBus, userFactory);
         handler.registerCallbacks();
     }
 

test/com/dmdirc/ServerTest.java

@@ -72,6 +72,7 @@ public class ServerTest {
     @Mock private ScheduledExecutorService executorService;
     @Mock private MessageEncoderFactory messageEncoderFactory;
     @Mock private BackBufferFactory backBufferFactory;
+    @Mock private UserFactory userFactory;
 
     private Server server;
 
@@ -102,7 +103,8 @@ public class ServerTest {
                 executorService,
                 new URI("irc-test://255.255.255.255"),
                 profile,
-                backBufferFactory);
+                backBufferFactory,
+                userFactory);
     }
 
     @Test