|
@@ -32,6 +32,7 @@ import com.dmdirc.events.QueryHighlightEvent;
|
32
|
32
|
import com.dmdirc.events.ServerConnectedEvent;
|
33
|
33
|
import com.dmdirc.events.ServerNickChangeEvent;
|
34
|
34
|
import com.dmdirc.interfaces.User;
|
|
35
|
+import com.dmdirc.interfaces.WindowModel;
|
35
|
36
|
import com.dmdirc.interfaces.config.AggregateConfigProvider;
|
36
|
37
|
import com.dmdirc.util.colours.Colour;
|
37
|
38
|
|
|
@@ -53,6 +54,7 @@ public class HighlightManager {
|
53
|
54
|
"(\\p{Space}|\\p{Punct}|$).*";
|
54
|
55
|
|
55
|
56
|
private final Collection<Pattern> patterns = new ArrayList<>();
|
|
57
|
+ private final WindowModel serverWindow;
|
56
|
58
|
private final AggregateConfigProvider configProvider;
|
57
|
59
|
private final ColourManager colourManager;
|
58
|
60
|
|
|
@@ -62,8 +64,10 @@ public class HighlightManager {
|
62
|
64
|
private Optional<Colour> foregroundColour = Optional.empty();
|
63
|
65
|
|
64
|
66
|
public HighlightManager(
|
|
67
|
+ final WindowModel serverWindow,
|
65
|
68
|
final AggregateConfigProvider configProvider,
|
66
|
69
|
final ColourManager colourManager) {
|
|
70
|
+ this.serverWindow = serverWindow;
|
67
|
71
|
this.configProvider = configProvider;
|
68
|
72
|
this.colourManager = colourManager;
|
69
|
73
|
}
|
|
@@ -78,7 +82,8 @@ public class HighlightManager {
|
78
|
82
|
|
79
|
83
|
@Handler
|
80
|
84
|
void handleChannelMessage(final BaseChannelTextEvent event) {
|
81
|
|
- if (patterns.stream().anyMatch(p -> p.matcher(event.getMessage()).matches())) {
|
|
85
|
+ if (event.getChannel().getConnection().get().getWindowModel().equals(serverWindow)
|
|
86
|
+ && patterns.stream().anyMatch(p -> p.matcher(event.getMessage()).matches())) {
|
82
|
87
|
setColours(event);
|
83
|
88
|
event.getChannel().getEventBus().publishAsync(new ChannelHighlightEvent(event));
|
84
|
89
|
}
|
|
@@ -86,7 +91,8 @@ public class HighlightManager {
|
86
|
91
|
|
87
|
92
|
@Handler
|
88
|
93
|
void handleQueryMessage(final BaseQueryTextEvent event) {
|
89
|
|
- if (patterns.stream().anyMatch(p -> p.matcher(event.getMessage()).matches())) {
|
|
94
|
+ if (event.getUser().getConnection().getWindowModel().equals(serverWindow)
|
|
95
|
+ && patterns.stream().anyMatch(p -> p.matcher(event.getMessage()).matches())) {
|
90
|
96
|
setColours(event);
|
91
|
97
|
event.getQuery().getEventBus().publishAsync(new QueryHighlightEvent(event));
|
92
|
98
|
}
|
|
@@ -94,21 +100,25 @@ public class HighlightManager {
|
94
|
100
|
|
95
|
101
|
@Handler
|
96
|
102
|
void handleNickChange(final ServerNickChangeEvent event) {
|
97
|
|
- setNickname(event.getNewNick());
|
|
103
|
+ if (event.getConnection().getWindowModel().equals(serverWindow)) {
|
|
104
|
+ setNickname(event.getNewNick());
|
|
105
|
+ }
|
98
|
106
|
}
|
99
|
107
|
|
100
|
108
|
@Handler
|
101
|
109
|
void handleConnected(final ServerConnectedEvent event) {
|
102
|
|
- patterns.clear();
|
|
110
|
+ if (event.getConnection().getWindowModel().equals(serverWindow)) {
|
|
111
|
+ patterns.clear();
|
103
|
112
|
|
104
|
|
- event.getConnection().getProfile().getHighlights()
|
105
|
|
- .stream()
|
106
|
|
- .map(this::compile)
|
107
|
|
- .forEach(patterns::add);
|
|
113
|
+ event.getConnection().getProfile().getHighlights()
|
|
114
|
+ .stream()
|
|
115
|
+ .map(this::compile)
|
|
116
|
+ .forEach(patterns::add);
|
108
|
117
|
|
109
|
|
- event.getConnection().getLocalUser()
|
110
|
|
- .map(User::getNickname)
|
111
|
|
- .ifPresent(this::setNickname);
|
|
118
|
+ event.getConnection().getLocalUser()
|
|
119
|
+ .map(User::getNickname)
|
|
120
|
+ .ifPresent(this::setNickname);
|
|
121
|
+ }
|
112
|
122
|
}
|
113
|
123
|
|
114
|
124
|
@ConfigBinding(domain = "ui", key = "highlightLineForegroundColour", required = false)
|