Преглед изворни кода

Merge pull request #80 from csmith/master

Use fake clients in a couple of places.
pull/81/head
Greg Holmes пре 9 година
родитељ
комит
451299f4e2

+ 1
- 4
irc/src/com/dmdirc/parser/irc/processors/ProcessMessage.java Прегледај датотеку

217
                 // callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got message for channel ("+targetName+") that I am not on.", parser.getLastLine()));
217
                 // callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got message for channel ("+targetName+") that I am not on.", parser.getLastLine()));
218
                 return;
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
             if ("PRIVMSG".equalsIgnoreCase(sParam)) {
221
             if ("PRIVMSG".equalsIgnoreCase(sParam)) {
225
                 if (isAction) {
222
                 if (isAction) {
226
                     callChannelAction(date, iChannel, iChannelClient, sMessage, firstToken);
223
                     callChannelAction(date, iChannel, iChannelClient, sMessage, firstToken);

+ 2
- 2
irc/src/com/dmdirc/parser/irc/processors/ProcessMode.java Прегледај датотеку

140
             nCurrent = iChannel.getMode();
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
         // Facilitate dmdirc formatter
144
         // Facilitate dmdirc formatter
145
         if (IRCParser.ALWAYS_UPDATECLIENT && setterCCI != null && setterCCI.getClient().getHostname().isEmpty()) {
145
         if (IRCParser.ALWAYS_UPDATECLIENT && setterCCI != null && setterCCI.getClient().getHostname().isEmpty()) {
146
             setterCCI.getClient().setUserBits(token[0], false);
146
             setterCCI.getClient().setUserBits(token[0], false);
280
 
280
 
281
         iChannel.setMode(nCurrent);
281
         iChannel.setMode(nCurrent);
282
         if ("324".equals(sParam)) {
282
         if ("324".equals(sParam)) {
283
-            callChannelModeChanged(iChannel, null, "", sFullModeStr.toString().trim());
283
+            callChannelModeChanged(iChannel, setterCCI, "", sFullModeStr.toString().trim());
284
         } else {
284
         } else {
285
             callChannelModeChanged(iChannel, setterCCI, token[0], sFullModeStr.toString().trim());
285
             callChannelModeChanged(iChannel, setterCCI, token[0], sFullModeStr.toString().trim());
286
             getCallbackManager().publish(
286
             getCallbackManager().publish(

Loading…
Откажи
Сачувај