|
@@ -142,12 +142,8 @@ public class ChannelEventHandler extends EventHandler implements
|
142
|
142
|
final String message, final String host) {
|
143
|
143
|
checkParser(parser);
|
144
|
144
|
|
145
|
|
- final ChannelMessageEvent event = new ChannelMessageEvent(owner,
|
146
|
|
- groupChatUserManager.getUserFromClient(client, owner), message);
|
147
|
|
- final String format = EventUtils.postDisplayable(eventBus, event,
|
148
|
|
- isMyself(client) ? "channelSelfExternalMessage" : "channelMessage");
|
149
|
|
- owner.doNotification(date, format, groupChatUserManager.getUserFromClient(client, owner),
|
150
|
|
- message);
|
|
145
|
+ eventBus.publishAsync(new ChannelMessageEvent(owner,
|
|
146
|
+ groupChatUserManager.getUserFromClient(client, owner), message));
|
151
|
147
|
}
|
152
|
148
|
|
153
|
149
|
@Override
|
|
@@ -271,11 +267,8 @@ public class ChannelEventHandler extends EventHandler implements
|
271
|
267
|
final String host) {
|
272
|
268
|
checkParser(parser);
|
273
|
269
|
|
274
|
|
- final ChannelActionEvent event = new ChannelActionEvent(owner,
|
275
|
|
- groupChatUserManager.getUserFromClient(client, owner), message);
|
276
|
|
- final String format = EventUtils.postDisplayable(eventBus, event,
|
277
|
|
- isMyself(client) ? "channelSelfExternalAction" : "channelAction");
|
278
|
|
- owner.doNotification(date, format, groupChatUserManager.getUserFromClient(client, owner), message);
|
|
270
|
+ eventBus.publishAsync(new ChannelActionEvent(owner,
|
|
271
|
+ groupChatUserManager.getUserFromClient(client, owner), message));
|
279
|
272
|
}
|
280
|
273
|
|
281
|
274
|
@Override
|
|
@@ -383,10 +376,8 @@ public class ChannelEventHandler extends EventHandler implements
|
383
|
376
|
final String message, final String host) {
|
384
|
377
|
checkParser(parser);
|
385
|
378
|
|
386
|
|
- final ChannelNoticeEvent event = new ChannelNoticeEvent(owner,
|
387
|
|
- groupChatUserManager.getUserFromClient(client, owner), message);
|
388
|
|
- final String format = EventUtils.postDisplayable(eventBus, event, "channelNotice");
|
389
|
|
- owner.doNotification(date, format, groupChatUserManager.getUserFromClient(client, owner), message);
|
|
379
|
+ eventBus.publishAsync(new ChannelNoticeEvent(owner,
|
|
380
|
+ groupChatUserManager.getUserFromClient(client, owner), message));
|
390
|
381
|
}
|
391
|
382
|
|
392
|
383
|
@Override
|
|
@@ -422,11 +413,9 @@ public class ChannelEventHandler extends EventHandler implements
|
422
|
413
|
final String host) {
|
423
|
414
|
checkParser(parser);
|
424
|
415
|
|
425
|
|
- final ChannelModeNoticeEvent event = new ChannelModeNoticeEvent(owner,
|
|
416
|
+ eventBus.publishAsync(new ChannelModeNoticeEvent(owner,
|
426
|
417
|
groupChatUserManager.getUserFromClient(client, owner), String.valueOf(prefix),
|
427
|
|
- message);
|
428
|
|
- final String format = EventUtils.postDisplayable(eventBus, event, "channelModeNotice");
|
429
|
|
- owner.doNotification(date, format, groupChatUserManager.getUserFromClient(client, owner), String.valueOf(prefix), message);
|
|
418
|
+ message));
|
430
|
419
|
}
|
431
|
420
|
|
432
|
421
|
@Override
|