Merge pull request #542 from greboid/master

Add an optional reason to ChannelUserAwayEvent.

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

@@ -129,7 +129,7 @@ ChannelKickEvent:
              {{channel.name}}{{reason|bracketed}}.
   colour: 3
 ChannelUserAwayEvent:
-  format: "-- {{user.modePrefixedNickname}} is now away."
+  format: "-- {{user.modePrefixedNickname}} is now away{{reasonOrBlank|bracketed}}."
   colour: 14
 channelUserBackEvent:
   format: "-- {{user.modePrefixedNickname}} is now back."

src/com/dmdirc/events/ChannelUserAwayEvent.java

@@ -25,18 +25,44 @@ package com.dmdirc.events;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
+import java.util.Optional;
+
 /**
  * Fire when a user sets away.
  */
 public class ChannelUserAwayEvent extends ChannelUserEvent {
 
+    private final Optional<String> reason;
+
     public ChannelUserAwayEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser user) {
         super(timestamp, channel, user);
+        reason = Optional.empty();
     }
 
     public ChannelUserAwayEvent(final GroupChat channel, final GroupChatUser user) {
         super(channel, user);
+        reason = Optional.empty();
+    }
+
+    public ChannelUserAwayEvent(final long timestamp, final GroupChat channel,
+            final GroupChatUser user, final Optional<String> reason) {
+        super(timestamp, channel, user);
+        this.reason = reason;
+    }
+
+    public ChannelUserAwayEvent(final GroupChat channel, final GroupChatUser user,
+            final Optional<String> reason) {
+        super(channel, user);
+        this.reason = reason;
+    }
+
+    public Optional<String> getReason() {
+        return reason;
+    }
+
+    public String getReasonOrBlank() {
+        return reason.orElse("");
     }
 
 }