Switch topics over to events, fix lots of bugs in the events.

res/com/dmdirc/ui/messages/format.yml

@@ -15,13 +15,22 @@ ChannelSelfMessageEvent:
 ChannelSelfActionEvent:
   format: "* {{client.modePrefixedNickname}} {{message}}"
   colour: 6
+ChannelGottopicEvent:
+  format: "* The topic for {{channel.name}} is '{{topic.topic}}'.\nTopic was set by {{user.nickname}} at {{topic.time}}."
+  colour: 3
+ChannelTopicChangeEvent:
+  format: "* {{user.nickname}} has changed the topic to  {{topic.topic}}."
+  colour: 3
+ChannelNotopicEvent:
+  format: "* There is no topic set for {{channel.name}}."
+  colour: 3
+ChannelTopicUnsetEvent:
+  format: "* {{client.modePrefixedNickname}} has removed the topic on {{channel.name}}."
+  colour: 3
 
 # TODO:
-#  channelTopicChanged=3* %1$s%2$s has changed the topic to '%5$s'.
-#  channelTopicRemoved=3* %1$s%2$s has removed the topic on %6$s.
 #  channelModeChanged=3* %1$s%2$s sets mode: %5$s.
 #  channelSelfModeChanged=3* You set mode: %5$s.
-#  channelTopicDiscovered=3* The topic for %7$s is '%5$s'.\n3* Topic was set by %2$s at %6$tR on %6$tA, %6$tB %6$te %6$tY.
 #  channelCTCP=4-!- CTCP %5$S from %1$s%2$s
 #  channelPart=3* %1$s%2$s (%3$s@%4$s) has left %6$s.
 #  channelPartReason=3* %1$s%2$s (%3$s@%4$s) has left %6$s (%5$s).
@@ -75,7 +84,6 @@ ChannelSelfActionEvent:
 #  serverConnectInProgress=A connection attempt is in progress, please wait...
 #  authNotice=5-AUTH- %1$s
 #  away=14You are now marked as away (%1$s14).
-#  channelNoTopic=3* There is no topic set for %1$s.
 #  rawCommand=10>>> %1$s
 #  unknownCommand=14Unknown command %1$s.
 #  socketClosed=2-!- You have been disconnected from the server.

src/com/dmdirc/Channel.java

@@ -28,7 +28,6 @@ import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ChannelClosedEvent;
 import com.dmdirc.events.ChannelSelfActionEvent;
 import com.dmdirc.events.ChannelSelfMessageEvent;
-import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.NickListClientAddedEvent;
 import com.dmdirc.events.NickListClientRemovedEvent;
@@ -485,8 +484,6 @@ public class Channel extends MessageTarget implements GroupChat {
             topics.add(topic);
         }
         updateTitle();
-
-        getEventBus().publishAsync(new ChannelTopicChangeEvent(this, topic));
     }
 
     @Override

src/com/dmdirc/ChannelEventHandler.java

@@ -24,7 +24,6 @@ package com.dmdirc;
 
 import com.dmdirc.events.ChannelActionEvent;
 import com.dmdirc.events.ChannelCtcpEvent;
-import com.dmdirc.events.ChannelDisplayableEvent;
 import com.dmdirc.events.ChannelGotnamesEvent;
 import com.dmdirc.events.ChannelGottopicEvent;
 import com.dmdirc.events.ChannelJoinEvent;
@@ -167,30 +166,21 @@ public class ChannelEventHandler extends EventHandler implements
 
         if (isJoinTopic) {
             if (Strings.isNullOrEmpty(channel.getTopic())) {
-                final ChannelNotopicEvent event = new ChannelNotopicEvent(owner);
-                final String format = EventUtils.postDisplayable(eventBus, event, "channelNoTopic");
-                owner.doNotification(date, format);
+                eventBus.publishAsync(new ChannelNotopicEvent(owner));
             } else {
-                final ChannelGottopicEvent event = new ChannelGottopicEvent(owner, topic);
-                final String format = EventUtils.postDisplayable(eventBus, event,
-                        "channelTopicDiscovered");
-                owner.doNotification(date, format, topic);
+                eventBus.publishAsync(new ChannelGottopicEvent(owner, topic,
+                        owner.getConnection().get().getUser(channel.getTopicSetter())));
             }
         } else {
-            final ChannelDisplayableEvent event;
-            final String format;
             if (Strings.isNullOrEmpty(channel.getTopic())) {
-                event = new ChannelTopicChangeEvent(date.getTime(), owner, topic);
-                format = EventUtils.postDisplayable(eventBus, event,
-                        "channelTopicRemoved");
-            } else {
-                event = new ChannelTopicUnsetEvent(date.getTime(), owner,
+                eventBus.publishAsync(new ChannelTopicUnsetEvent(date.getTime(), owner,
                         owner.getUser(owner.getConnection().get()
-                                .getUser(channel.getTopicSetter())).orElse(null));
-                format = EventUtils.postDisplayable(eventBus, event, "channelTopicChanged");
+                                .getUser(channel.getTopicSetter())).orElse(null)));
+            } else {
+                eventBus.publishAsync(new ChannelTopicChangeEvent(date.getTime(), owner, topic,
+                        topic.getClient().get()));
+
             }
-            owner.doNotification(date, format, channel.getChannelClient(channel.getTopicSetter(),
-                    true), channel.getTopic());
         }
 
         final Optional<Topic> currentTopic = owner.getCurrentTopic();

src/com/dmdirc/events/ChannelGottopicEvent.java

@@ -24,6 +24,7 @@ package com.dmdirc.events;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Topic;
+import com.dmdirc.interfaces.User;
 
 /**
  * Fired when a channel topic is changed.
@@ -31,19 +32,28 @@ import com.dmdirc.Topic;
 public class ChannelGottopicEvent extends ChannelDisplayableEvent {
 
     private final Topic topic;
+    private final User user;
 
-    public ChannelGottopicEvent(final long timestamp, final Channel channel, final Topic topic) {
+    public ChannelGottopicEvent(final long timestamp, final Channel channel, final Topic topic,
+            final User user) {
         super(timestamp, channel);
         this.topic = topic;
+        this.user = user;
     }
 
-    public ChannelGottopicEvent(final Channel channel, final Topic topic) {
+    public ChannelGottopicEvent(final Channel channel, final Topic topic,
+            final User user) {
         super(channel);
         this.topic = topic;
+        this.user = user;
     }
 
     public Topic getTopic() {
         return topic;
     }
 
+    public User getUser() {
+        return user;
+    }
+
 }

src/com/dmdirc/events/ChannelTopicChangeEvent.java

@@ -24,6 +24,7 @@ package com.dmdirc.events;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Topic;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Fired when a topic is changed.
@@ -31,20 +32,28 @@ import com.dmdirc.Topic;
 public class ChannelTopicChangeEvent extends ChannelDisplayableEvent {
 
     private final Topic topic;
+    private final GroupChatUser user;
 
     public ChannelTopicChangeEvent(final long timestamp, final Channel channel,
-            final Topic topic) {
+            final Topic topic, final GroupChatUser user) {
         super(timestamp, channel);
         this.topic = topic;
+        this.user = user;
     }
 
-    public ChannelTopicChangeEvent(final Channel channel, final Topic topic) {
+    public ChannelTopicChangeEvent(final Channel channel, final Topic topic,
+            final GroupChatUser user) {
         super(channel);
         this.topic = topic;
+        this.user = user;
     }
 
     public Topic getTopic() {
         return topic;
     }
 
+    public GroupChatUser getUser() {
+        return user;
+    }
+
 }

src/com/dmdirc/ui/messages/EventPropertyManager.java

@@ -56,6 +56,8 @@ public class EventPropertyManager {
                 + property.substring(1);
         try {
             final Method method = type.getMethod(methodName);
+            // TODO: This is needed for AutoValues, should probably get return types not real types
+            method.setAccessible(true);
             return Optional.ofNullable(method.invoke(object));
         } catch (ReflectiveOperationException ex) {
             eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex,