Skip to content

Commit

Permalink
Merge pull request #516 from csmith/master
Browse files Browse the repository at this point in the history 
Make more server events use the new formatter.
  • Loading branch information
@greboid
greboid committed Jan 16, 2015
2 parents 6d7e629 + 70a3692 commit f9bd291
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 42 deletions.
34 changes: 24 additions & 10 deletions res/com/dmdirc/ui/messages/format.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,30 @@ ServerReconnectScheduledEvent:
ServerStonedEvent:
format: "-!- Disconnected from a non-responsive server."
colour: 2
ServerMotdStartEvent:
format: "{{message}}"
colour: 10
ServerMotdLineEvent:
format: "{{message}}"
colour: 10
ServerMotdEndEvent:
format: "{{message}}"
colour: 10
ServerAwayEvent:
format: "You are now marked as away ({{reason}})."
colour: 14
ServerBackEvent:
format: "You are no longer marked as away."
colour: 14

################## Server messaging events #########################################################

ServerNoticeEvent:
format: "-{{user.nickname}}- {{message}}"
colour: 5
ServerServerNoticeEvent:
format: "-{{user.nickname}}- {{message}}"
colour: 5

################## Channel join/part/quit events ###################################################

Expand Down Expand Up @@ -139,11 +163,8 @@ CommandOutputEvent:
format: "{{message}}"

################## TODO ############################################################################
# channelSplitUserMode_default=3* %1$s%2$s sets mode %9$s on %6$s.
# channelNoModes=3* There are no channel modes for %2$s.
# channelModeDiscovered=3* Channel modes for %2$s are: %1$s.
# privateNotice=5-%1$s- %4$s
# serverNotice=5-%1$s- %4$s
# userModeChanged=3* %1$s sets user mode: %4$s.
# userNoModes=3* No user modes.
# userModeDiscovered=3* User modes are: %4$s.
Expand All @@ -155,18 +176,11 @@ CommandOutputEvent:
# selfNotice=5>%1$s> %2$s
# selfMessage=>[%1$s]> %2$s
# serverConnecting=Connecting to %1$s:%2$s...
# back=14You are no longer marked as away.
# serverDisconnectInProgress=A disconnection attempt is in progress, please wait...
# serverConnectInProgress=A connection attempt is in progress, please wait...
# authNotice=5-AUTH- %1$s
# away=14You are now marked as away (%1$s14).
# rawCommand=10>>> %1$s
# unknownCommand=14Unknown command %1$s.
# motdStart=10%1$s
# motdLine=10%1$s
# motdEnd=10%1$s
# rawIn=<< %1$s
# rawOut=>> %1$s
# commandOutput=%1$s
# actionTooLong=Warning: action too long to be sent
# tabCompletion=14Multiple possibilities: %1$s
Expand Down
42 changes: 10 additions & 32 deletions src/com/dmdirc/ServerEventHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ public void onPrivateAction(final Parser parser, final Date date, final String m
}
}

@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
@Override
public void onErrorInfo(final Parser parser, final Date date, final ParserError errorInfo) {
final ErrorLevel errorLevel = ErrorLevel.UNKNOWN;

final StringBuilder errorString = new StringBuilder();
errorString.append("Parser exception.\n\n");
Expand All @@ -206,6 +206,7 @@ public void onErrorInfo(final Parser parser, final Date date, final ParserError
final Exception ex = errorInfo.isException() ? errorInfo.getException()
: new Exception(errorString.toString()); // NOPMD

final ErrorLevel errorLevel = ErrorLevel.UNKNOWN;
if (errorInfo.isUserError()) {
eventBus.publishAsync(new UserErrorEvent(errorLevel, ex, errorInfo.getData(), ""));
} else {
Expand All @@ -230,7 +231,6 @@ public void onPrivateCTCP(final Parser parser, final Date date, final String typ
public void onPrivateCTCPReply(final Parser parser, final Date date, final String type,
final String message, final String host) {
checkParser(parser);

eventBus.publish(new ServerCtcpReplyEvent(owner, owner.getUser(host), type, message));
}

Expand All @@ -245,50 +245,34 @@ public void onSocketClosed(final Parser parser, final Date date) {
public void onPrivateNotice(final Parser parser, final Date date,
final String message, final String host) {
checkParser(parser);

final ServerNoticeEvent event = new ServerNoticeEvent(owner, owner.getLocalUser().get(),
message);
final String format = EventUtils.postDisplayable(eventBus, event, "privateNotice");
owner.doNotification(format, owner.getUser(host), message);
eventBus.publishAsync(new ServerNoticeEvent(owner, owner.getLocalUser().get(), message));
}

@Override
public void onServerNotice(final Parser parser, final Date date,
final String message, final String host) {
checkParser(parser);

final ServerServerNoticeEvent event = new ServerServerNoticeEvent(owner,
owner.getLocalUser().get(), message);
final String format = EventUtils.postDisplayable(eventBus, event, "serverNotice");
owner.doNotification(format, owner.getUser(host), message);
eventBus.publishAsync(new ServerServerNoticeEvent(owner, owner.getLocalUser().get(),
message));
}

@Override
public void onMOTDStart(final Parser parser, final Date date, final String data) {
checkParser(parser);

final ServerMotdStartEvent event = new ServerMotdStartEvent(owner, data);
final String format = EventUtils.postDisplayable(eventBus, event, "motdStart");
owner.doNotification(format, data);
eventBus.publishAsync(new ServerMotdStartEvent(owner, data));
}

@Override
public void onMOTDLine(final Parser parser, final Date date, final String data) {
checkParser(parser);

final ServerMotdLineEvent event = new ServerMotdLineEvent(owner, data);
final String format = EventUtils.postDisplayable(eventBus, event, "motdLine");
owner.doNotification(format, data);
eventBus.publishAsync(new ServerMotdLineEvent(owner, data));
}

@Override
public void onMOTDEnd(final Parser parser, final Date date,
final boolean noMOTD, final String data) {
checkParser(parser);

final ServerMotdEndEvent event = new ServerMotdEndEvent(owner, data);
final String format = EventUtils.postDisplayable(eventBus, event, "motdEnd");
owner.doNotification(format, data);
eventBus.publishAsync(new ServerMotdEndEvent(owner, data));
}

@Override
Expand Down Expand Up @@ -340,14 +324,12 @@ public void onPingFailed(final Parser parser, final Date date) {
@Override
public void onPingSent(final Parser parser, final Date date) {
checkParser(parser);

eventBus.publishAsync(new ServerPingSentEvent(owner));
}

@Override
public void onPingSuccess(final Parser parser, final Date date) {
checkParser(parser);

eventBus.publishAsync(new ServerGotPingEvent(owner,
owner.getParser().get().getServerLatency()));
}
Expand All @@ -360,13 +342,9 @@ public void onAwayState(final Parser parser, final Date date, final AwayState ol
owner.updateAwayState(currentState == AwayState.AWAY ? Optional.of(reason) : Optional.empty());

if (currentState == AwayState.AWAY) {
final ServerAwayEvent event = new ServerAwayEvent(owner, reason);
final String format = EventUtils.postDisplayable(eventBus, event, "away");
owner.doNotification(format, reason);
eventBus.publishAsync(new ServerAwayEvent(owner, reason));
} else if (oldState != AwayState.UNKNOWN) {
final ServerBackEvent event = new ServerBackEvent(owner);
final String format = EventUtils.postDisplayable(eventBus, event, "back");
owner.doNotification(format);
eventBus.publishAsync(new ServerBackEvent(owner));
}
}

Expand Down

0 comments on commit f9bd291

Please sign in to comment.