Merge pull request thelounge#454 from thelounge/xpaw/custom-hl

Only trigger custom highlights for non-self messages and notices
matburnham · Jul 3, 2016 · d2d650b · d2d650b
2 parents c907b13 + d22bf80
commit d2d650b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/client/js/lounge.js b/client/js/lounge.js
@@ -222,7 +222,7 @@ $(function() {
 		var chan = chat.find(target);
 		var msg;
 
-		if (highlights.some(function(h) {
+		if (!data.msg.highlight && !data.msg.self && (type === "message" || type === "notice") && highlights.some(function(h) {
 			return data.msg.text.indexOf(h) > -1;
 		})) {
 			data.msg.highlight = true;