More GroupChatUsers

src/com/dmdirc/ChannelEventHandler.java

@@ -46,6 +46,7 @@ import com.dmdirc.events.ChannelUserBackEvent;
 import com.dmdirc.events.ChannelUserEvent;
 import com.dmdirc.events.ChannelUsermodechangeEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
@@ -345,15 +346,16 @@ public class ChannelEventHandler extends EventHandler implements
             final ClientInfo client, final AwayState oldState, final AwayState state) {
         checkParser(parser);
 
-        final ChannelClientInfo channelClient = owner.getChannelInfo().getChannelClient(client);
+        final Optional<GroupChatUser> channelClient
+                = owner.getUser(owner.getConnection().get().getUser(client.getNickname()));
 
-        if (channelClient != null) {
+        if (channelClient.isPresent()) {
             final boolean away = state == AwayState.AWAY;
             final boolean discovered = oldState == AwayState.UNKNOWN;
 
             final ChannelUserEvent event = away
-                    ? new ChannelUserAwayEvent(date.getTime(), owner, channelClient)
-                    : new ChannelUserBackEvent(date.getTime(), owner, channelClient);
+                    ? new ChannelUserAwayEvent(date.getTime(), owner, channelClient.get())
+                    : new ChannelUserBackEvent(date.getTime(), owner, channelClient.get());
             final String format = EventUtils.postDisplayable(eventBus, event,
                     (away ? "channelUserAway" : "channelUserBack")
                     + (discovered ? "Discovered" : ""));

src/com/dmdirc/events/ChannelDisplayableUserEvent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Base type for displayable events that occur in channels against users.
@@ -31,11 +31,11 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 public abstract class ChannelDisplayableUserEvent extends ChannelUserEvent {
 
     public ChannelDisplayableUserEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo user) {
+            final GroupChatUser user) {
         super(timestamp, channel, user);
     }
 
-    public ChannelDisplayableUserEvent(final Channel channel, final ChannelClientInfo user) {
+    public ChannelDisplayableUserEvent(final Channel channel, final GroupChatUser user) {
         super(channel, user);
     }
 

src/com/dmdirc/events/ChannelUserAwayEvent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fire when a user sets away.
@@ -31,11 +31,11 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 public class ChannelUserAwayEvent extends ChannelUserEvent {
 
     public ChannelUserAwayEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo user) {
+            final GroupChatUser user) {
         super(timestamp, channel, user);
     }
 
-    public ChannelUserAwayEvent(final Channel channel, final ChannelClientInfo user) {
+    public ChannelUserAwayEvent(final Channel channel, final GroupChatUser user) {
         super(channel, user);
     }
 

src/com/dmdirc/events/ChannelUserBackEvent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fired when a user sets back.
@@ -31,11 +31,11 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 public class ChannelUserBackEvent extends ChannelUserEvent {
 
     public ChannelUserBackEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo user) {
+            final GroupChatUser user) {
         super(timestamp, channel, user);
     }
 
-    public ChannelUserBackEvent(final Channel channel, final ChannelClientInfo user) {
+    public ChannelUserBackEvent(final Channel channel, final GroupChatUser user) {
         super(channel, user);
     }
 

src/com/dmdirc/events/ChannelUserEvent.java

@@ -23,27 +23,27 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Base type for events that occur in channels against users.
  */
 public abstract class ChannelUserEvent extends ChannelDisplayableEvent {
 
-    private final ChannelClientInfo user;
+    private final GroupChatUser user;
 
     public ChannelUserEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo user) {
+            final GroupChatUser user) {
         super(timestamp, channel);
         this.user = user;
     }
 
-    public ChannelUserEvent(final Channel channel, final ChannelClientInfo user) {
+    public ChannelUserEvent(final Channel channel, final GroupChatUser user) {
         super(channel);
         this.user = user;
     }
 
-    public ChannelClientInfo getUser() {
+    public GroupChatUser getUser() {
         return user;
     }