Browse Source

Merge pull request #133 from greboid/master

Fix non refreshing away colours.
pull/134/head
Chris Smith 9 years ago
parent
commit
19a28effbe

+ 6
- 0
awaycolours/src/com/dmdirc/addons/awaycolours/AwayColoursManager.java View File

@@ -93,6 +93,9 @@ public class AwayColoursManager {
93 93
         if (text) {
94 94
             event.getUser().getMap().put(ChannelClientProperty.TEXT_FOREGROUND, colour);
95 95
         }
96
+        if (nicklist || text) {
97
+            event.getChannel().refreshClients();
98
+        }
96 99
     }
97 100
 
98 101
     @Handler
@@ -103,5 +106,8 @@ public class AwayColoursManager {
103 106
         if (text) {
104 107
             event.getUser().getMap().remove(ChannelClientProperty.TEXT_FOREGROUND);
105 108
         }
109
+        if (nicklist || text) {
110
+            event.getChannel().refreshClients();
111
+        }
106 112
     }
107 113
 }

+ 4
- 0
awaycolours/test/com/dmdirc/addons/awaycolours/AwayColoursManagerTest.java View File

@@ -22,6 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.awaycolours;
24 24
 
25
+import com.dmdirc.Channel;
25 26
 import com.dmdirc.ChannelClientProperty;
26 27
 import com.dmdirc.DMDircMBassador;
27 28
 import com.dmdirc.config.ConfigBinder;
@@ -54,6 +55,7 @@ public class AwayColoursManagerTest {
54 55
     @Mock private ChannelUserAwayEvent awayEvent;
55 56
     @Mock private ChannelUserBackEvent backEvent;
56 57
     @Mock private ChannelClientInfo user;
58
+    @Mock private Channel channel;
57 59
     @Mock private Map<Object, Object> map;
58 60
     @Mock private ColourManager colourManager;
59 61
     private AwayColoursManager instance;
@@ -69,7 +71,9 @@ public class AwayColoursManagerTest {
69 71
         redColour = Colour.RED;
70 72
         blackColour = Colour.BLACK;
71 73
         when(awayEvent.getUser()).thenReturn(user);
74
+        when(awayEvent.getChannel()).thenReturn(channel);
72 75
         when(backEvent.getUser()).thenReturn(user);
76
+        when(backEvent.getChannel()).thenReturn(channel);
73 77
         when(user.getMap()).thenReturn(map);
74 78
         when(config.getBinder()).thenReturn(binder);
75 79
         when(binder.withDefaultDomain(anyString())).thenReturn(binder);

Loading…
Cancel
Save