Make events use User.

src/com/dmdirc/ServerEventHandler.java

@@ -206,8 +206,12 @@ public class ServerEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        final ServerCtcpEvent event = new ServerCtcpEvent(owner, owner.getParser().get()
-                .getClient(host), type, message);
+        final ClientInfo client = owner.getParser().get().getClient(host);
+        final ServerCtcpEvent event = new ServerCtcpEvent(owner,
+                userFactory.getUser(client.getNickname(), owner.getConnection().get(),
+                        Optional.ofNullable(client.getUsername()),
+                        Optional.ofNullable(client.getHostname()),
+                        Optional.ofNullable(client.getRealname())), type, message);
         final String format = EventUtils.postDisplayable(eventBus, event, "privateCTCP");
         owner.doNotification(format, owner.getParser().get().getClient(host), type, message);
         if (!event.isHandled()) {
@@ -220,8 +224,12 @@ public class ServerEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
+        final ClientInfo client = owner.getParser().get().getClient(host);
         final ServerCtcprEvent event = new ServerCtcprEvent(owner,
-                owner.getParser().get().getClient(host), type, message);
+                userFactory.getUser(client.getNickname(), owner.getConnection().get(),
+                        Optional.ofNullable(client.getUsername()),
+                        Optional.ofNullable(client.getHostname()),
+                        Optional.ofNullable(client.getRealname())), type, message);
         final String format = EventUtils.postDisplayable(eventBus, event, "privateCTCPreply");
         owner.doNotification(format, owner.getParser().get().getClient(host), type, message);
     }
@@ -238,8 +246,12 @@ public class ServerEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        final ServerNoticeEvent event = new ServerNoticeEvent(owner, owner.getParser().get()
-                .getClient(host), message);
+        final ClientInfo client = owner.getParser().get().getClient(host);
+        final ServerNoticeEvent event = new ServerNoticeEvent(owner,
+                userFactory.getUser(client.getNickname(), owner.getConnection().get(),
+                        Optional.ofNullable(client.getUsername()),
+                        Optional.ofNullable(client.getHostname()),
+                        Optional.ofNullable(client.getRealname())), message);
         final String format = EventUtils.postDisplayable(eventBus, event, "privateNotice");
         owner.doNotification(format, owner.getParser().get().getClient(host), message);
     }
@@ -249,8 +261,12 @@ public class ServerEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        final ServerServernoticeEvent event = new ServerServernoticeEvent(owner, owner.getParser()
-                .get().getClient(host), message);
+        final ClientInfo client = owner.getParser().get().getClient(host);
+        final ServerServernoticeEvent event = new ServerServernoticeEvent(owner,
+                userFactory.getUser(client.getNickname(), owner.getConnection().get(),
+                        Optional.ofNullable(client.getUsername()),
+                        Optional.ofNullable(client.getHostname()),
+                        Optional.ofNullable(client.getRealname())), message);
         final String format = EventUtils.postDisplayable(eventBus, event, "serverNotice");
         owner.doNotification(format, owner.getParser().get().getClient(host), message);
     }
@@ -425,7 +441,10 @@ public class ServerEventHandler extends EventHandler implements
         checkParser(parser);
 
         final ServerUsermodesEvent event = new ServerUsermodesEvent(owner,
-                owner.getParser().get().getClient(host), modes);
+                userFactory.getUser(client.getNickname(), owner.getConnection().get(),
+                        Optional.ofNullable(client.getUsername()),
+                        Optional.ofNullable(client.getHostname()),
+                        Optional.ofNullable(client.getRealname())), modes);
         final String format = EventUtils.postDisplayable(eventBus, event, "userModeChanged");
         owner.doNotification(format, owner.getParser().get().getClient(host), modes);
     }
@@ -435,7 +454,11 @@ public class ServerEventHandler extends EventHandler implements
             final ClientInfo client, final String modes) {
         checkParser(parser);
 
-        final ServerUsermodesEvent event = new ServerUsermodesEvent(owner, client, modes);
+        final ServerUsermodesEvent event = new ServerUsermodesEvent(owner,
+                userFactory.getUser(client.getNickname(), owner.getConnection().get(),
+                        Optional.ofNullable(client.getUsername()),
+                        Optional.ofNullable(client.getHostname()),
+                        Optional.ofNullable(client.getRealname())), modes);
         final String format = EventUtils.postDisplayable(eventBus, event, modes.isEmpty()
                 || "+".equals(modes) ? "userNoModes" : "userModeDiscovered");
         owner.doNotification(format, client, modes);
@@ -446,9 +469,13 @@ public class ServerEventHandler extends EventHandler implements
             final String channel) {
         checkParser(parser);
 
+        final ClientInfo client = owner.getParser().get().getClient(userHost);
         owner.addInvite(new Invite(owner, channel, userHost));
         final ServerInviteReceivedEvent event = new ServerInviteReceivedEvent(owner,
-                owner.getParser().get().getClient(userHost), channel);
+                userFactory.getUser(client.getNickname(), owner.getConnection().get(),
+                        Optional.ofNullable(client.getUsername()),
+                        Optional.ofNullable(client.getHostname()),
+                        Optional.ofNullable(client.getRealname())), channel);
         final String format = EventUtils.postDisplayable(eventBus, event, "inviteReceived");
         owner.doNotification(format, owner.getParser().get().getClient(userHost), channel);
     }
@@ -458,8 +485,12 @@ public class ServerEventHandler extends EventHandler implements
             final String host) {
         checkParser(parser);
 
+        final ClientInfo client = owner.getParser().get().getClient(host);
         final ServerWallopsEvent event = new ServerWallopsEvent(owner,
-                owner.getParser().get().getClient(host), message);
+                userFactory.getUser(client.getNickname(), owner.getConnection().get(),
+                        Optional.ofNullable(client.getUsername()),
+                        Optional.ofNullable(client.getHostname()),
+                        Optional.ofNullable(client.getRealname())), message);
         final String format = EventUtils.postDisplayable(eventBus, event, "wallop");
         owner.doNotification(format, owner.getParser().get().getClient(host), message);
 
@@ -470,8 +501,12 @@ public class ServerEventHandler extends EventHandler implements
             final String host) {
         checkParser(parser);
 
+        final ClientInfo client = owner.getParser().get().getClient(host);
         final ServerWallusersEvent event = new ServerWallusersEvent(owner,
-                owner.getParser().get().getClient(host), message);
+                userFactory.getUser(client.getNickname(), owner.getConnection().get(),
+                        Optional.ofNullable(client.getUsername()),
+                        Optional.ofNullable(client.getHostname()),
+                        Optional.ofNullable(client.getRealname())), message);
         final String format = EventUtils.postDisplayable(eventBus, event, "walluser");
         owner.doNotification(format, owner.getParser().get().getClient(host), message);
     }
@@ -481,8 +516,12 @@ public class ServerEventHandler extends EventHandler implements
             final String host) {
         checkParser(parser);
 
+        final ClientInfo client = owner.getParser().get().getClient(host);
         final ServerWalldesyncEvent event = new ServerWalldesyncEvent(owner,
-                owner.getParser().get().getClient(host), message);
+                userFactory.getUser(client.getNickname(), owner.getConnection().get(),
+                        Optional.ofNullable(client.getUsername()),
+                        Optional.ofNullable(client.getHostname()),
+                        Optional.ofNullable(client.getRealname())), message);
         final String format = EventUtils.postDisplayable(eventBus, event, "walldesync");
         owner.doNotification(format, owner.getParser().get().getClient(host), message);
     }

src/com/dmdirc/events/ServerCtcpEvent.java

@@ -23,36 +23,36 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Fired when receiving a CTCP event.
  */
 public class ServerCtcpEvent extends ServerDisplayableEvent {
 
-    private final ClientInfo client;
+    private final User user;
     private final String type;
     private final String content;
     private boolean handled;
 
     public ServerCtcpEvent(final long timestamp, final Connection connection,
-            final ClientInfo client, final String type, final String content) {
+            final User user, final String type, final String content) {
         super(timestamp, connection);
-        this.client = client;
+        this.user = user;
         this.type = type;
         this.content = content;
     }
 
-    public ServerCtcpEvent(final Connection connection, final ClientInfo client, final String type,
+    public ServerCtcpEvent(final Connection connection, final User user, final String type,
             final String content) {
         super(connection);
-        this.client = client;
+        this.user = user;
         this.type = type;
         this.content = content;
     }
 
-    public ClientInfo getClient() {
-        return client;
+    public User getUser() {
+        return user;
     }
 
     public String getType() {

src/com/dmdirc/events/ServerCtcprEvent.java

@@ -23,35 +23,35 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Fired when sending a CTCP reply.
  */
 public class ServerCtcprEvent extends ServerDisplayableEvent {
 
-    private final ClientInfo client;
+    private final User user;
     private final String type;
     private final String content;
 
     public ServerCtcprEvent(final long timestamp, final Connection connection,
-            final ClientInfo client, final String type, final String content) {
+            final User user, final String type, final String content) {
         super(timestamp, connection);
-        this.client = client;
+        this.user = user;
         this.type = type;
         this.content = content;
     }
 
-    public ServerCtcprEvent(final Connection connection, final ClientInfo client, final String type,
+    public ServerCtcprEvent(final Connection connection, final User user, final String type,
             final String content) {
         super(connection);
-        this.client = client;
+        this.user = user;
         this.type = type;
         this.content = content;
     }
 
-    public ClientInfo getClient() {
-        return client;
+    public User getUser() {
+        return user;
     }
 
     public String getType() {

src/com/dmdirc/events/ServerInviteReceivedEvent.java

@@ -23,32 +23,32 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Fired when an invite is received.
  */
 public class ServerInviteReceivedEvent extends ServerDisplayableEvent {
 
-    private final ClientInfo client;
+    private final User user;
     private final String channel;
 
     public ServerInviteReceivedEvent(final long timestamp, final Connection connection,
-            final ClientInfo client, final String channel) {
+            final User user, final String channel) {
         super(timestamp, connection);
-        this.client = client;
+        this.user = user;
         this.channel = channel;
     }
 
-    public ServerInviteReceivedEvent(final Connection connection, final ClientInfo client,
+    public ServerInviteReceivedEvent(final Connection connection, final User user,
             final String channel) {
         super(connection);
-        this.client = client;
+        this.user = user;
         this.channel = channel;
     }
 
-    public ClientInfo getClient() {
-        return client;
+    public User getUser() {
+        return user;
     }
 
     public String getChannel() {

src/com/dmdirc/events/ServerNoticeEvent.java

@@ -23,32 +23,32 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Fired when receiving a notice.
  */
 public class ServerNoticeEvent extends ServerDisplayableEvent {
 
-    private final ClientInfo client;
+    private final User user;
     private final String message;
 
     public ServerNoticeEvent(final long timestamp, final Connection connection,
-            final ClientInfo client, final String message) {
+            final User user, final String message) {
         super(timestamp, connection);
-        this.client = client;
+        this.user = user;
         this.message = message;
     }
 
-    public ServerNoticeEvent(final Connection connection, final ClientInfo client,
+    public ServerNoticeEvent(final Connection connection, final User user,
             final String message) {
         super(connection);
-        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/ServerServernoticeEvent.java

@@ -23,32 +23,32 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Fired when receiving a server notice.
  */
 public class ServerServernoticeEvent extends ServerDisplayableEvent {
 
-    private final ClientInfo client;
+    private final User user;
     private final String message;
 
     public ServerServernoticeEvent(final long timestamp, final Connection connection,
-            final ClientInfo client, final String message) {
+            final User user, final String message) {
         super(timestamp, connection);
-        this.client = client;
+        this.user = user;
         this.message = message;
     }
 
-    public ServerServernoticeEvent(final Connection connection, final ClientInfo client,
+    public ServerServernoticeEvent(final Connection connection, final User user,
             final String message) {
         super(connection);
-        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/ServerUsermodesEvent.java

@@ -23,32 +23,32 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Fired in on receipt of user modes.
  */
 public class ServerUsermodesEvent extends ServerDisplayableEvent {
 
-    private final ClientInfo client;
+    private final User user;
     private final String message;
 
     public ServerUsermodesEvent(final long timestamp, final Connection connection,
-            final ClientInfo client, final String message) {
+            final User user, final String message) {
         super(timestamp, connection);
-        this.client = client;
+        this.user = user;
         this.message = message;
     }
 
-    public ServerUsermodesEvent(final Connection connection, final ClientInfo client,
+    public ServerUsermodesEvent(final Connection connection, final User user,
             final String message) {
         super(connection);
-        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/ServerWalldesyncEvent.java

@@ -23,32 +23,32 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Fired when receiving a server walldesync.
  */
 public class ServerWalldesyncEvent extends ServerDisplayableEvent {
 
-    private final ClientInfo client;
+    private final User user;
     private final String message;
 
     public ServerWalldesyncEvent(final long timestamp, final Connection connection,
-            final ClientInfo client, final String message) {
+            final User user, final String message) {
         super(timestamp, connection);
-        this.client = client;
+        this.user = user;
         this.message = message;
     }
 
-    public ServerWalldesyncEvent(final Connection connection, final ClientInfo client,
+    public ServerWalldesyncEvent(final Connection connection, final User user,
             final String message) {
         super(connection);
-        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/ServerWallopsEvent.java

@@ -23,32 +23,32 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Fired when receiving a server wallops.
  */
 public class ServerWallopsEvent extends ServerDisplayableEvent {
 
-    private final ClientInfo client;
+    private final User user;
     private final String message;
 
     public ServerWallopsEvent(final long timestamp, final Connection connection,
-            final ClientInfo client, final String message) {
+            final User user, final String message) {
         super(timestamp, connection);
-        this.client = client;
+        this.user = user;
         this.message = message;
     }
 
-    public ServerWallopsEvent(final Connection connection, final ClientInfo client,
+    public ServerWallopsEvent(final Connection connection, final User user,
             final String message) {
         super(connection);
-        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/ServerWallusersEvent.java

@@ -23,32 +23,32 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.interfaces.User;
 
 /**
  * Fired when receiving a server wallusers.
  */
 public class ServerWallusersEvent extends ServerDisplayableEvent {
 
-    private final ClientInfo client;
+    private final User user;
     private final String message;
 
     public ServerWallusersEvent(final long timestamp, final Connection connection,
-            final ClientInfo client, final String message) {
+            final User user, final String message) {
         super(timestamp, connection);
-        this.client = client;
+        this.user = user;
         this.message = message;
     }
 
-    public ServerWallusersEvent(final Connection connection, final ClientInfo client,
+    public ServerWallusersEvent(final Connection connection, final User user,
             final String message) {
         super(connection);
-        this.client = client;
+        this.user = user;
         this.message = message;
     }
 
-    public ClientInfo getClient() {
-        return client;
+    public User getUser() {
+        return user;
     }
 
     public String getMessage() {

test/com/dmdirc/ServerEventHandlerTest.java

@@ -210,7 +210,7 @@ public class ServerEventHandlerTest {
         final ServerCtcpEvent event = getEvent(ServerCtcpEvent.class);
         assertEquals("type", event.getType());
         assertEquals("message", event.getContent());
-        assertEquals(clientInfo, event.getClient());
+        assertEquals(clientInfo, event.getUser());
     }
 
     @Test