Add support for external messages and actions

Fixes issue 2927

Change-Id: Ide1f4303fe71708bf44c7436a998b814ad01515f
Reviewed-on: http://gerrit.dmdirc.com/975
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

src/com/dmdirc/Query.java

@@ -43,6 +43,7 @@ import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.QueryWindow;
 
 import java.awt.Toolkit;
+import java.util.List;
 
 /**
  * The Query class represents the client's view of a query with another user.
@@ -130,22 +131,31 @@ public class Query extends MessageTarget implements PrivateActionListener,
             return;
         }
 
-        final ClientInfo client = server.getParser().getLocalClient();
-
         for (String part : splitLine(window.getTranscoder().encode(line))) {
             if (!part.isEmpty()) {
                 server.getParser().sendMessage(getNickname(), part);
 
-                final StringBuffer buff = new StringBuffer("querySelfMessage");
-
-                ActionManager.processEvent(CoreActionType.QUERY_SELF_MESSAGE, buff, this, part);
-
-                addLine(buff, client.getNickname(), client.getUsername(),
-                        client.getHostname(), part);
+                doNotification("querySelfMessage",
+                        CoreActionType.QUERY_SELF_MESSAGE,
+                        server.getParser().getLocalClient(), line);
             }
         }
     }
 
+    /** {@inheritDoc} */
+    @Override
+    protected boolean processNotificationArg(final Object arg, final List<Object> args) {
+        if (arg instanceof ClientInfo) {
+            final ClientInfo clientInfo = (ClientInfo) arg;
+            args.add(clientInfo.getNickname());
+            args.add(clientInfo.getUsername());
+            args.add(clientInfo.getHostname());
+            return true;
+        } else {
+            return super.processNotificationArg(arg, args);
+        }
+    }
+
     /** {@inheritDoc} */
     @Override
     public int getMaxLineLength() {
@@ -172,12 +182,8 @@ public class Query extends MessageTarget implements PrivateActionListener,
             server.getParser().sendAction(getNickname(),
                     window.getTranscoder().encode(action));
 
-            final StringBuffer buff = new StringBuffer("querySelfAction");
-
-            ActionManager.processEvent(CoreActionType.QUERY_SELF_ACTION, buff, this, action);
-
-            addLine(buff, client.getNickname(), client.getUsername(),
-                    client.getHostname(), window.getTranscoder().encode(action));
+            doNotification("querySelfAction", CoreActionType.QUERY_SELF_ACTION,
+                    server.getParser().getLocalClient(), action);
         } else {
             addLine("actionTooLong", action.length());
         }

src/com/dmdirc/ServerEventHandler.java

@@ -41,14 +41,18 @@ import com.dmdirc.parser.irc.IRCParser;
  *
  * @author chris
  */
-public final class ServerEventHandler extends EventHandler
-        implements ChannelSelfJoinListener, PrivateMessageListener, PrivateActionListener,
-        ErrorInfoListener, PrivateCtcpListener, PrivateCtcpReplyListener, SocketCloseListener,
-        PrivateNoticeListener, MotdStartListener, MotdLineListener, MotdEndListener, NumericListener, PingFailureListener,
-        PingSuccessListener, AwayStateListener, ConnectErrorListener, NickInUseListener, Post005Listener,
-        AuthNoticeListener, UnknownNoticeListener, UserModeChangeListener, InviteListener, WallopListener,
-        WalluserListener, WallDesyncListener, NickChangeListener, ServerErrorListener, PingSentListener,
-        UserModeDiscoveryListener, ServerNoticeListener {
+public final class ServerEventHandler extends EventHandler implements
+        ChannelSelfJoinListener, PrivateMessageListener, PrivateActionListener,
+        ErrorInfoListener, PrivateCtcpListener, PrivateCtcpReplyListener,
+        SocketCloseListener, PrivateNoticeListener, MotdStartListener,
+        MotdLineListener, MotdEndListener, NumericListener, PingFailureListener,
+        PingSuccessListener, AwayStateListener, ConnectErrorListener,
+        NickInUseListener, Post005Listener, AuthNoticeListener,
+        UnknownNoticeListener, UserModeChangeListener, InviteListener,
+        WallopListener, WalluserListener, WallDesyncListener,
+        NickChangeListener, ServerErrorListener, PingSentListener,
+        UserModeDiscoveryListener, ServerNoticeListener, UnknownMessageListener,
+        UnknownActionListener {
 
     /** The server instance that owns this event handler. */
     private final Server owner;
@@ -309,6 +313,46 @@ public final class ServerEventHandler extends EventHandler
                 sHost, sTarget, sMessage);
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public void onUnknownMessage(final Parser tParser, final String sMessage,
+            final String sTarget, final String sHost) {
+        checkParser(tParser);
+
+        if (tParser.getLocalClient().equals(tParser.getClient(sHost))) {
+            // Local client
+            if (!owner.hasQuery(sTarget)) {
+                owner.addQuery(sTarget);
+            }
+
+            owner.getQuery(sTarget).doNotification("querySelfExternalMessage",
+                    CoreActionType.QUERY_SELF_MESSAGE, tParser.getLocalClient(), sMessage);
+        } else {
+            owner.doNotification("unknownMessage", CoreActionType.SERVER_UNKNOWNNOTICE,
+                    sHost, sTarget, sMessage);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void onUnknownAction(final Parser tParser, final String sMessage,
+            final String sTarget, final String sHost) {
+        checkParser(tParser);
+
+        if (tParser.getLocalClient().equals(tParser.getClient(sHost))) {
+            // Local client
+            if (!owner.hasQuery(sTarget)) {
+                owner.addQuery(sTarget);
+            }
+
+            owner.getQuery(sTarget).doNotification("querySelfExternalAction",
+                    CoreActionType.QUERY_SELF_ACTION, tParser.getLocalClient(), sMessage);
+        } else {
+            owner.doNotification("unknownAction", CoreActionType.SERVER_UNKNOWNACTION,
+                    sHost, sTarget, sMessage);
+        }
+    }
+
     /** {@inheritDoc} */
     @Override
     public void onUserModeChanged(final Parser tParser,
@@ -407,4 +451,5 @@ public final class ServerEventHandler extends EventHandler
                     + owner.getStatus().getTransitionHistory());
         }
     }
+
 }

src/com/dmdirc/actions/CoreActionType.java

@@ -94,8 +94,12 @@ public enum CoreActionType implements ActionType {
     
     /** Auth notice received. */
     SERVER_AUTHNOTICE(ServerEvents.SERVER_EVENT_WITH_ARG, "Received auth notice"),
+    /** Unknown action received. */
+    SERVER_UNKNOWNACTION(ServerEvents.SERVER_UNKNOWN_EVENT, "Received unknown action"),
     /** Unknown notice received. */
     SERVER_UNKNOWNNOTICE(ServerEvents.SERVER_UNKNOWN_EVENT, "Received unknown notice"),
+    /** Unknown message received. */
+    SERVER_UNKNOWNMESSAGE(ServerEvents.SERVER_UNKNOWN_EVENT, "Received unknown message"),
     
     /** User modes changed. */
     SERVER_USERMODES(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "User modes changed"),
@@ -201,9 +205,9 @@ public enum CoreActionType implements ActionType {
     /** Query action received. */
     QUERY_ACTION(QueryEvents.QUERY_EVENT_WITH_ARG, "Private action received"),
     /** Query message sent. */
-    QUERY_SELF_MESSAGE(QueryEvents.QUERY_EVENT_WITH_ARG, "Private message sent"),
+    QUERY_SELF_MESSAGE(QueryEvents.QUERY_SOURCED_EVENT_WITH_ARG, "Private message sent"),
     /** Query action sent. */
-    QUERY_SELF_ACTION(QueryEvents.QUERY_EVENT_WITH_ARG, "Private action sent"),
+    QUERY_SELF_ACTION(QueryEvents.QUERY_SOURCED_EVENT_WITH_ARG, "Private action sent"),
     /** Query quit event. */
     QUERY_QUIT(QueryEvents.QUERY_EVENT_WITH_ARG, "Query: user quit"),
     /** Query nick change. */

src/com/dmdirc/actions/metatypes/QueryEvents.java

@@ -24,6 +24,7 @@ package com.dmdirc.actions.metatypes;
 
 import com.dmdirc.Query;
 import com.dmdirc.actions.interfaces.ActionMetaType;
+import com.dmdirc.parser.interfaces.ClientInfo;
 
 /**
  * Defines query-related events.
@@ -35,7 +36,9 @@ public enum QueryEvents implements ActionMetaType {
     /** Query event type. */
     QUERY_EVENT(new String[]{"query"}, Query.class),
     /** Query event with argument. */
-    QUERY_EVENT_WITH_ARG(new String[]{"query", "message"}, Query.class, String.class);
+    QUERY_EVENT_WITH_ARG(new String[]{"query", "message"}, Query.class, String.class),
+    /** Query event with argument and source. */
+    QUERY_SOURCED_EVENT_WITH_ARG(new String[]{"query", "source", "message"}, Query.class, ClientInfo.class, String.class);
     
     /** The names of the arguments for this meta type. */
     private String[] argNames;