Fix notifications in queries, limit message highlights to channels
This commit is contained in:
parent
e6990e0fc7
commit
1c57363106
@ -868,9 +868,9 @@ button,
|
||||
|
||||
#chat .error,
|
||||
#chat .error .from,
|
||||
#chat .highlight .from,
|
||||
#chat .highlight .text,
|
||||
#chat .highlight .user {
|
||||
#chat .channel .highlight .from,
|
||||
#chat .channel .highlight .text,
|
||||
#chat .channel .highlight .user {
|
||||
color: #f00;
|
||||
}
|
||||
|
||||
|
@ -827,8 +827,7 @@ $(function() {
|
||||
}
|
||||
}
|
||||
|
||||
button = button.filter(":not(.active)");
|
||||
if (button.length === 0) {
|
||||
if (button.hasClass("active")) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -163,8 +163,8 @@ QUIT #d0907d
|
||||
|
||||
#chat .error,
|
||||
#chat .error .from,
|
||||
#chat .highlight,
|
||||
#chat .highlight .from {
|
||||
#chat .channel .highlight,
|
||||
#chat .channel .highlight .from {
|
||||
color: #f92772;
|
||||
}
|
||||
|
||||
|
@ -193,8 +193,8 @@ body {
|
||||
|
||||
#chat .error,
|
||||
#chat .error .from,
|
||||
#chat .highlight,
|
||||
#chat .highlight .from {
|
||||
#chat .channel .highlight,
|
||||
#chat .channel .highlight .from {
|
||||
color: #bc6c4c;
|
||||
}
|
||||
|
||||
|
@ -46,7 +46,6 @@ module.exports = function(irc, network) {
|
||||
if (data.type === Msg.Type.NOTICE) {
|
||||
chan = network.channels[0];
|
||||
} else {
|
||||
highlight = !self;
|
||||
chan = new Chan({
|
||||
type: Chan.Type.QUERY,
|
||||
name: target
|
||||
@ -58,10 +57,14 @@ module.exports = function(irc, network) {
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Query messages (unless self) always highlight
|
||||
if (chan.type === Chan.Type.QUERY) {
|
||||
highlight = !self;
|
||||
}
|
||||
}
|
||||
|
||||
// Query messages (unless self) always highlight
|
||||
// Self messages are never highlighted
|
||||
// Self messages in channels are never highlighted
|
||||
// Non-self messages are highlighted as soon as the nick is detected
|
||||
if (!highlight && !self) {
|
||||
highlight = network.highlightRegex.test(data.message);
|
||||
|
Loading…
Reference in New Issue
Block a user