Browse Source

Make a couple more events use new formatter.

Stop ChannelListModesRetrieved being displayable - not sure
why it ever was, we don't have a formatter for it.
pull/557/head
Chris Smith 9 years ago
parent
commit
ea13622549

+ 9
- 3
res/com/dmdirc/ui/messages/format.yml View File

@@ -35,6 +35,15 @@ ServerAwayEvent:
35 35
 ServerBackEvent:
36 36
   format: "You are no longer marked as away."
37 37
   colour: 14
38
+ServerAuthNoticeEvent:
39
+  format: -AUTH- {{notice}}
40
+  colour: 5
41
+ServerInviteReceivedEvent:
42
+  format: * You have been invited to {{channel}} by {{user.nickname}}.
43
+  colour: 2
44
+ServerErrorEvent:
45
+  format: ERROR: {{reason}}
46
+  colour: 4
38 47
 
39 48
 ################## Server messaging events #########################################################
40 49
 
@@ -168,7 +177,6 @@ CommandOutputEvent:
168 177
 #  userModeChanged=3* %1$s sets user mode: %4$s.
169 178
 #  userNoModes=3* No user modes.
170 179
 #  userModeDiscovered=3* User modes are: %4$s.
171
-#  inviteReceived=2* You have been invited to %4$s by %1$s.
172 180
 #  walluser=5!%1$s! %4$s
173 181
 #  wallop=5$%1$s$ %4$s
174 182
 #  walldesync=5/%1$s/ %4$s
@@ -178,13 +186,11 @@ CommandOutputEvent:
178 186
 #  serverConnecting=Connecting to %1$s:%2$s...
179 187
 #  serverDisconnectInProgress=A disconnection attempt is in progress, please wait...
180 188
 #  serverConnectInProgress=A connection attempt is in progress, please wait...
181
-#  authNotice=5-AUTH- %1$s
182 189
 #  rawCommand=10>>> %1$s
183 190
 #  unknownCommand=14Unknown command %1$s.
184 191
 #  commandOutput=%1$s
185 192
 #  actionTooLong=Warning: action too long to be sent
186 193
 #  tabCompletion=14Multiple possibilities: %1$s
187
-#  serverError=4ERROR: %1$s
188 194
 #  serverUnknownProtocol=4Unknown protocol '%1$s'. Unable to connect.
189 195
 #  selfNickChange=3* You are now known as %2$s.
190 196
 #  unknownNotice=5-[%1$s:%2$s]- %3$s

+ 2
- 5
src/com/dmdirc/ChannelEventHandler.java View File

@@ -362,11 +362,8 @@ public class ChannelEventHandler extends EventHandler {
362 362
             return;
363 363
         }
364 364
 
365
-        final ChannelListModesRetrievedEvent coreEvent = new ChannelListModesRetrievedEvent(
366
-                event.getDate().getTime(), owner, event.getMode());
367
-        final String format = EventUtils.postDisplayable(eventBus, coreEvent,
368
-                "channelListModeRetrieved");
369
-        owner.doNotification(event.getDate(), format, event.getMode());
365
+        eventBus.publishAsync(new ChannelListModesRetrievedEvent(
366
+                event.getDate().getTime(), owner, event.getMode()));
370 367
     }
371 368
 
372 369
     private boolean checkChannel(final ChannelInfo channelInfo) {

+ 4
- 10
src/com/dmdirc/ServerEventHandler.java View File

@@ -361,9 +361,7 @@ public class ServerEventHandler extends EventHandler {
361 361
     public void onNoticeAuth(final AuthNoticeEvent event) {
362 362
         checkParser(event.getParser());
363 363
 
364
-        final ServerAuthNoticeEvent coreEvent = new ServerAuthNoticeEvent(owner, event.getMessage());
365
-        final String format = EventUtils.postDisplayable(eventBus, coreEvent, "authNotice");
366
-        owner.doNotification(format, event.getDate());
364
+        eventBus.publishAsync(new ServerAuthNoticeEvent(owner, event.getMessage()));
367 365
     }
368 366
 
369 367
     @Handler
@@ -439,10 +437,8 @@ public class ServerEventHandler extends EventHandler {
439 437
         final Invite invite = new Invite(owner.getInviteManager(), event.getChannel(),
440 438
                 owner.getUser(event.getUserHost()));
441 439
         owner.getInviteManager().addInvite(invite);
442
-        final ServerInviteReceivedEvent coreEvent = new ServerInviteReceivedEvent(owner,
443
-                owner.getUser(event.getUserHost()), event.getChannel(), invite);
444
-        final String format = EventUtils.postDisplayable(eventBus, coreEvent, "inviteReceived");
445
-        owner.doNotification(format, owner.getUser(event.getUserHost()), event.getChannel());
440
+        eventBus.publishAsync(new ServerInviteReceivedEvent(owner,
441
+                owner.getUser(event.getUserHost()), event.getChannel(), invite));
446 442
     }
447 443
 
448 444
     @Handler
@@ -493,9 +489,7 @@ public class ServerEventHandler extends EventHandler {
493 489
     public void onServerError(final com.dmdirc.parser.events.ServerErrorEvent event) {
494 490
         checkParser(event.getParser());
495 491
 
496
-        final ServerErrorEvent coreEvent = new ServerErrorEvent(owner, event.getMessage());
497
-        final String format = EventUtils.postDisplayable(eventBus, coreEvent, "serverError");
498
-        owner.doNotification(format, event.getMessage());
492
+        eventBus.publishAsync(new ServerErrorEvent(owner, event.getMessage()));
499 493
     }
500 494
 
501 495
     @Override

+ 1
- 1
src/com/dmdirc/events/ChannelListModesRetrievedEvent.java View File

@@ -27,7 +27,7 @@ import com.dmdirc.interfaces.GroupChat;
27 27
 /**
28 28
  * Fired when channel list modes are retrieved.
29 29
  */
30
-public class ChannelListModesRetrievedEvent extends ChannelDisplayableEvent {
30
+public class ChannelListModesRetrievedEvent extends ChannelEvent {
31 31
 
32 32
     private final char mode;
33 33
 

Loading…
Cancel
Save