Merge pull request #334 from thelounge/xpaw/query-highlights

Fix notifications in query windows

client/css/style.css

@@ -901,9 +901,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;
 }
 

client/js/lounge.js

@@ -827,8 +827,7 @@ $(function() {
 			}
 		}
 
-		button = button.filter(":not(.active)");
-		if (button.length === 0) {
+		if (button.hasClass("active")) {
 			return;
 		}
 

client/themes/morning.css

@@ -192,8 +192,8 @@ QUIT #d0907d
 
 #chat .error,
 #chat .error .from,
-#chat .highlight,
-#chat .highlight .from {
+#chat .channel .highlight,
+#chat .channel .highlight .from {
 	color: #f92772;
 }
 

client/themes/zenburn.css

@@ -222,8 +222,8 @@ body {
 
 #chat .error,
 #chat .error .from,
-#chat .highlight,
-#chat .highlight .from {
+#chat .channel .highlight,
+#chat .channel .highlight .from {
 	color: #bc6c4c;
 }
 

src/plugins/irc-events/message.js

@@ -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
-		// Self messages are never highlighted
+			if (chan.type === Chan.Type.QUERY) {
+				highlight = !self;
+			}
+		}
+
+		// 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);