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
         if (text) {
93
         if (text) {
94
             event.getUser().getMap().put(ChannelClientProperty.TEXT_FOREGROUND, colour);
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
     @Handler
101
     @Handler
103
         if (text) {
106
         if (text) {
104
             event.getUser().getMap().remove(ChannelClientProperty.TEXT_FOREGROUND);
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
 
22
 
23
 package com.dmdirc.addons.awaycolours;
23
 package com.dmdirc.addons.awaycolours;
24
 
24
 
25
+import com.dmdirc.Channel;
25
 import com.dmdirc.ChannelClientProperty;
26
 import com.dmdirc.ChannelClientProperty;
26
 import com.dmdirc.DMDircMBassador;
27
 import com.dmdirc.DMDircMBassador;
27
 import com.dmdirc.config.ConfigBinder;
28
 import com.dmdirc.config.ConfigBinder;
54
     @Mock private ChannelUserAwayEvent awayEvent;
55
     @Mock private ChannelUserAwayEvent awayEvent;
55
     @Mock private ChannelUserBackEvent backEvent;
56
     @Mock private ChannelUserBackEvent backEvent;
56
     @Mock private ChannelClientInfo user;
57
     @Mock private ChannelClientInfo user;
58
+    @Mock private Channel channel;
57
     @Mock private Map<Object, Object> map;
59
     @Mock private Map<Object, Object> map;
58
     @Mock private ColourManager colourManager;
60
     @Mock private ColourManager colourManager;
59
     private AwayColoursManager instance;
61
     private AwayColoursManager instance;
69
         redColour = Colour.RED;
71
         redColour = Colour.RED;
70
         blackColour = Colour.BLACK;
72
         blackColour = Colour.BLACK;
71
         when(awayEvent.getUser()).thenReturn(user);
73
         when(awayEvent.getUser()).thenReturn(user);
74
+        when(awayEvent.getChannel()).thenReturn(channel);
72
         when(backEvent.getUser()).thenReturn(user);
75
         when(backEvent.getUser()).thenReturn(user);
76
+        when(backEvent.getChannel()).thenReturn(channel);
73
         when(user.getMap()).thenReturn(map);
77
         when(user.getMap()).thenReturn(map);
74
         when(config.getBinder()).thenReturn(binder);
78
         when(config.getBinder()).thenReturn(binder);
75
         when(binder.withDefaultDomain(anyString())).thenReturn(binder);
79
         when(binder.withDefaultDomain(anyString())).thenReturn(binder);

Loading…
Cancel
Save