Sfoglia il codice sorgente

Use fake clients in a couple of places.

pull/80/head
Chris Smith 9 anni fa
parent
commit
528d7ddd31

+ 1
- 4
irc/src/com/dmdirc/parser/irc/processors/ProcessMessage.java Vedi File

@@ -217,10 +217,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
217 217
                 // callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got message for channel ("+targetName+") that I am not on.", parser.getLastLine()));
218 218
                 return;
219 219
             }
220
-            IRCChannelClientInfo iChannelClient = null;
221
-            if (iClient != null) {
222
-                iChannelClient = iChannel.getChannelClient(iClient);
223
-            }
220
+            final IRCChannelClientInfo iChannelClient = iChannel.getChannelClient(token[0], true);
224 221
             if ("PRIVMSG".equalsIgnoreCase(sParam)) {
225 222
                 if (isAction) {
226 223
                     callChannelAction(date, iChannel, iChannelClient, sMessage, firstToken);

+ 2
- 2
irc/src/com/dmdirc/parser/irc/processors/ProcessMode.java Vedi File

@@ -140,7 +140,7 @@ public class ProcessMode extends IRCProcessor {
140 140
             nCurrent = iChannel.getMode();
141 141
         }
142 142
 
143
-        final IRCChannelClientInfo setterCCI = iChannel.getChannelClient(token[0]);
143
+        final IRCChannelClientInfo setterCCI = iChannel.getChannelClient(token[0], true);
144 144
         // Facilitate dmdirc formatter
145 145
         if (IRCParser.ALWAYS_UPDATECLIENT && setterCCI != null && setterCCI.getClient().getHostname().isEmpty()) {
146 146
             setterCCI.getClient().setUserBits(token[0], false);
@@ -280,7 +280,7 @@ public class ProcessMode extends IRCProcessor {
280 280
 
281 281
         iChannel.setMode(nCurrent);
282 282
         if ("324".equals(sParam)) {
283
-            callChannelModeChanged(iChannel, null, "", sFullModeStr.toString().trim());
283
+            callChannelModeChanged(iChannel, setterCCI, "", sFullModeStr.toString().trim());
284 284
         } else {
285 285
             callChannelModeChanged(iChannel, setterCCI, token[0], sFullModeStr.toString().trim());
286 286
             getCallbackManager().publish(

Loading…
Annulla
Salva