Make more things use GroupChatUser.

  - Also by AutoValue Topic
  - Also make getUser in Topic Optional

src/com/dmdirc/Channel.java

@@ -481,9 +481,9 @@ public class Channel extends MessageTarget implements GroupChat {
             // Format topics
             final Topic topic = (Topic) arg;
             args.add("");
-            args.add(topic.getClient().getNickname());
-            args.add(topic.getClient().getUsername().orElse(""));
-            args.add(topic.getClient().getHostname().orElse(""));
+            args.add(topic.getClient().map(GroupChatUser::getNickname).orElse("Unknown"));
+            args.add(topic.getClient().flatMap(GroupChatUser::getUsername).orElse(""));
+            args.add(topic.getClient().flatMap(GroupChatUser::getHostname).orElse(""));
             args.add(topic.getTopic());
             args.add(topic.getTime() * 1000);
 

src/com/dmdirc/ChannelEventHandler.java

@@ -161,7 +161,7 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelInfo channel, final boolean isJoinTopic) {
         checkParser(parser);
 
-        final Topic topic = new Topic(channel.getTopic(),
+        final Topic topic = Topic.create(channel.getTopic(),
                 owner.getUser(getConnection().getUser(channel.getTopicSetter())).orElse(null),
                 channel.getTopicTime());
 
@@ -212,7 +212,7 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelClientInfo client) {
         checkParser(parser);
 
-        final ChannelJoinEvent event = new ChannelJoinEvent(owner, client);
+        final ChannelJoinEvent event = new ChannelJoinEvent(owner, owner.getUserFromClient(client));
         final String format = EventUtils.postDisplayable(eventBus, event, "channelJoin");
         owner.doNotification(date, format, client);
         owner.addClient(owner.getUserFromClient(client));
@@ -223,7 +223,8 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelClientInfo client, final String reason) {
         checkParser(parser);
 
-        final ChannelPartEvent event = new ChannelPartEvent(owner, client, reason);
+        final ChannelPartEvent event = new ChannelPartEvent(owner, owner.getUserFromClient(client),
+                reason);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 "channel"
                 + (isMyself(client) ? "Self" : "") + "Part"
@@ -238,7 +239,8 @@ public class ChannelEventHandler extends EventHandler implements
             final String reason, final String host) {
         checkParser(parser);
 
-        final ChannelKickEvent event = new ChannelKickEvent(owner, client, kickedClient, reason);
+        final ChannelKickEvent event = new ChannelKickEvent(owner, owner.getUserFromClient
+                (client), owner.getUserFromClient(kickedClient), reason);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 "channelKick" + (reason.isEmpty() ? "" : "Reason"));
         owner.doNotification(date, format, client, kickedClient, reason);
@@ -250,7 +252,8 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelClientInfo client, final String reason) {
         checkParser(parser);
 
-        final ChannelQuitEvent event = new ChannelQuitEvent(owner, client, reason);
+        final ChannelQuitEvent event = new ChannelQuitEvent(owner, owner.getUserFromClient(client),
+                reason);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 "channelQuit" + (reason.isEmpty() ? "" : "Reason"));
         owner.doNotification(date, format, client, reason);
@@ -275,7 +278,8 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelInfo channel, final ChannelClientInfo client, final String oldNick) {
         checkParser(parser);
 
-        final ChannelNickchangeEvent event = new ChannelNickchangeEvent(owner, client, oldNick);
+        final ChannelNickchangeEvent event = new ChannelNickchangeEvent(owner,
+                owner.getUserFromClient(client), oldNick);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 isMyself(client) ? "channelSelfNickChange" : "channelNickChange");
         owner.doNotification(date, format, client, oldNick);
@@ -297,7 +301,8 @@ public class ChannelEventHandler extends EventHandler implements
                         modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
                 owner.doNotification(date, format, modes.length() <= 1 ? "" : modes);
             } else {
-                final ChannelModechangeEvent event = new ChannelModechangeEvent(owner, client, modes);
+                final ChannelModechangeEvent event = new ChannelModechangeEvent(owner,
+                        owner.getUserFromClient(client), modes);
                 final String format = EventUtils.postDisplayable(eventBus, event,
                         isMyself(client) ? "channelSelfModeChanged" : "channelModeChanged");
                 owner.doNotification(date, format, client, modes);
@@ -391,7 +396,8 @@ public class ChannelEventHandler extends EventHandler implements
                         modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
                 owner.doNotification(date, format, modes.length() <= 1 ? "" : modes);
             } else {
-                final ChannelModechangeEvent event = new ChannelModechangeEvent(owner, client, modes);
+                final ChannelModechangeEvent event = new ChannelModechangeEvent(owner,
+                        owner.getUserFromClient(client), modes);
                 final String format = EventUtils.postDisplayable(eventBus, event,
                         isMyself(client) ? "channelSelfModeChanged" : "channelModeChanged");
                 owner.doNotification(date, format, client, modes);

src/com/dmdirc/Topic.java

@@ -24,61 +24,28 @@ package com.dmdirc;
 
 import com.dmdirc.interfaces.GroupChatUser;
 
+import com.google.auto.value.AutoValue;
+
+import java.util.Optional;
+
 /**
  * Stores information about a channel topic.
  */
-public class Topic {
+@AutoValue
+public abstract class Topic {
+
+    Topic() {}
 
     /** Topic. */
-    private final String topic;
+    public abstract String getTopic();
     /** Topic client. */
-    private final GroupChatUser client;
+    public abstract Optional<GroupChatUser> getClient();
     /** Topic time. */
-    private final long time;
-
-    /**
-     * Creates a new topic.
-     *
-     * @param topic  Topic
-     * @param client Topic client
-     * @param time   Topic time
-     */
-    public Topic(final String topic, final GroupChatUser client, final long time) {
-        this.topic = topic;
-        this.client = client;
-        this.time = time;
-    }
-
-    /**
-     * Returns the client who set the topic.
-     *
-     * @return client
-     */
-    public GroupChatUser getClient() {
-        return client;
-    }
-
-    /**
-     * Returns the time the topic was set.
-     *
-     * @return topic time
-     */
-    public long getTime() {
-        return time;
-    }
+    public abstract long getTime();
 
-    /**
-     * Returns the topic this object represents.
-     *
-     * @return topic
-     */
-    public String getTopic() {
-        return topic;
+    public static Topic create(final String topic,
+            final GroupChatUser groupChatUser,
+            final long time) {
+        return new AutoValue_Topic(topic, Optional.ofNullable(groupChatUser), time);
     }
-
-    @Override
-    public String toString() {
-        return topic;
-    }
-
 }

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

@@ -71,7 +71,7 @@ public class ShowTopic extends Command implements ExternalCommand {
         if (args.getArguments().length == 0) {
             final Optional<Topic> topic = channel.getCurrentTopic();
             if (topic.isPresent()) {
-                final Optional<GroupChatUser> user = topic.map(Topic::getClient);
+                final Optional<GroupChatUser> user = topic.map(Topic::getClient).get();
                 sendLine(origin, args.isSilent(), "channelTopicDiscovered", "",
                         user.map(GroupChatUser::getNickname).orElse(""),
                         user.flatMap(GroupChatUser::getUsername).orElse(""),

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

src/com/dmdirc/events/ChannelKickEvent.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 user is kicked from a channel.
  */
 public class ChannelKickEvent extends ChannelDisplayableEvent {
 
-    private final ChannelClientInfo client;
-    private final ChannelClientInfo victim;
+    private final GroupChatUser client;
+    private final GroupChatUser victim;
     private final String reason;
 
     public ChannelKickEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, final ChannelClientInfo victim, final String reason) {
+            final GroupChatUser client, final GroupChatUser victim, final String reason) {
         super(timestamp, channel);
         this.client = client;
         this.victim = victim;
@@ -43,18 +43,18 @@ public class ChannelKickEvent extends ChannelDisplayableEvent {
     }
 
     public ChannelKickEvent(final Channel channel,
-            final ChannelClientInfo client, final ChannelClientInfo victim, final String reason) {
+            final GroupChatUser client, final GroupChatUser victim, final String reason) {
         super(channel);
         this.client = client;
         this.victim = victim;
         this.reason = reason;
     }
 
-    public ChannelClientInfo getClient() {
+    public GroupChatUser getClient() {
         return client;
     }
 
-    public ChannelClientInfo getVictim() {
+    public GroupChatUser getVictim() {
         return victim;
     }
 

src/com/dmdirc/events/ChannelModechangeEvent.java

@@ -23,31 +23,31 @@
 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 changed.
  */
 public class ChannelModechangeEvent extends ChannelDisplayableEvent {
 
-    private final ChannelClientInfo client;
+    private final GroupChatUser client;
     private final String modes;
 
     public ChannelModechangeEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, final String modes) {
+            final GroupChatUser client, final String modes) {
         super(timestamp, channel);
         this.client = client;
         this.modes = modes;
     }
 
     public ChannelModechangeEvent(final Channel channel,
-            final ChannelClientInfo client, final String modes) {
+            final GroupChatUser client, final String modes) {
         super(channel);
         this.client = client;
         this.modes = modes;
     }
 
-    public ChannelClientInfo getClient() {
+    public GroupChatUser getClient() {
         return client;
     }
 

src/com/dmdirc/events/ChannelNickchangeEvent.java

@@ -23,32 +23,31 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fired when a user changes nickname in a channel.
  */
 public class ChannelNickchangeEvent extends ChannelDisplayableEvent {
 
-    private final ChannelClientInfo client;
+    private final GroupChatUser client;
     private final String oldNick;
 
     public ChannelNickchangeEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client,
-            final String oldNick) {
+            final GroupChatUser client, final String oldNick) {
         super(timestamp, channel);
         this.client = client;
         this.oldNick = oldNick;
     }
 
-    public ChannelNickchangeEvent(final Channel channel, final ChannelClientInfo client,
+    public ChannelNickchangeEvent(final Channel channel, final GroupChatUser client,
             final String oldNick) {
         super(channel);
         this.client = client;
         this.oldNick = oldNick;
     }
 
-    public ChannelClientInfo getClient() {
+    public GroupChatUser getClient() {
         return client;
     }
 

src/com/dmdirc/events/ChannelPartEvent.java

@@ -23,31 +23,31 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fired when a user parts a channel.
  */
 public class ChannelPartEvent extends ChannelDisplayableEvent {
 
-    private final ChannelClientInfo client;
+    private final GroupChatUser client;
     private final String message;
 
     public ChannelPartEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, final String message) {
+            final GroupChatUser client, final String message) {
         super(timestamp, channel);
         this.client = client;
         this.message = message;
     }
 
-    public ChannelPartEvent(final Channel channel, final ChannelClientInfo client,
+    public ChannelPartEvent(final Channel channel, final GroupChatUser client,
             final String message) {
         super(channel);
         this.client = client;
         this.message = message;
     }
 
-    public ChannelClientInfo getClient() {
+    public GroupChatUser getClient() {
         return client;
     }
 

src/com/dmdirc/events/ChannelQuitEvent.java

@@ -23,31 +23,31 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fired when a user quits in a channel.
  */
 public class ChannelQuitEvent extends ChannelDisplayableEvent {
 
-    private final ChannelClientInfo client;
+    private final GroupChatUser client;
     private final String message;
 
     public ChannelQuitEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, final String message) {
+            final GroupChatUser client, final String message) {
         super(timestamp, channel);
         this.client = client;
         this.message = message;
     }
 
-    public ChannelQuitEvent(final Channel channel, final ChannelClientInfo client,
+    public ChannelQuitEvent(final Channel channel, final GroupChatUser client,
             final String message) {
         super(channel);
         this.client = client;
         this.message = message;
     }
 
-    public ChannelClientInfo getClient() {
+    public GroupChatUser getClient() {
         return client;
     }
 

test/com/dmdirc/TopicTest.java

@@ -39,25 +39,25 @@ public class TopicTest {
 
     @Test
     public void testGetClient() {
-        final Topic test = new Topic("abc", user, 1);
+        final Topic test = Topic.create("abc", user, 1);
         assertEquals(user, test.getClient());
     }
 
     @Test
     public void testGetTime() {
-        final Topic test = new Topic("abc", user, 1);
+        final Topic test = Topic.create("abc", user, 1);
         assertEquals(1L, test.getTime());
     }
 
     @Test
     public void testGetTopic() {
-        final Topic test = new Topic("abc", user, 1);
+        final Topic test = Topic.create("abc", user, 1);
         assertEquals("abc", test.getTopic());
     }
 
     @Test
     public void testToString() {
-        final Topic test = new Topic("abc", user, 1);
+        final Topic test = Topic.create("abc", user, 1);
         assertEquals("abc", test.toString());
     }