Kaynağa Gözat

Fix logging plugin's handling of self query events

Log entries should always go to the file corresponding
to the Query, rather than to the user that happened
to send the message.

Closes #430
pull/470/head
Chris Smith 8 yıl önce
ebeveyn
işleme
39a8d51f5c

+ 3
- 4
logging/src/com/dmdirc/addons/logging/LoggingManager.java Dosyayı Görüntüle

@@ -116,8 +116,7 @@ public class LoggingManager implements ConfigChangeListener {
116 116
     /** The manager to add history windows to. */
117 117
     private final WindowManager windowManager;
118 118
     /** Map of open files. */
119
-    private final Map<String, OpenFile> openFiles = Collections.synchronizedMap(
120
-            new HashMap<>());
119
+    private final Map<String, OpenFile> openFiles = Collections.synchronizedMap(new HashMap<>());
121 120
     private final DMDircMBassador eventBus;
122 121
     private final Provider<String> directoryProvider;
123 122
     private final BackBufferFactory backBufferFactory;
@@ -249,14 +248,14 @@ public class LoggingManager implements ConfigChangeListener {
249 248
 
250 249
     @Handler
251 250
     public void handleQueryActions(final BaseQueryActionEvent event) {
252
-        final User user = event.getUser();
251
+        final User user = event.getQuery().getUser();
253 252
         final String filename = locator.getLogFile(user);
254 253
         appendLine(filename, "* %s %s", user.getNickname(), event.getMessage());
255 254
     }
256 255
 
257 256
     @Handler
258 257
     public void handleQueryMessages(final BaseQueryMessageEvent event) {
259
-        final User user = event.getUser();
258
+        final User user = event.getQuery().getUser();
260 259
         final String filename = locator.getLogFile(user);
261 260
         appendLine(filename, "<%s> %s", user.getNickname(), event.getMessage());
262 261
     }

Loading…
İptal
Kaydet