From 1190863e1eb760186c6bcbb760944325a09364f0 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 27 Aug 2017 20:39:15 +0000
Subject: [PATCH] ACL automentions are now in the new format

---
 js/acl.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/js/acl.js b/js/acl.js
index ac0bb3c7ef..1ed354bbfa 100644
--- a/js/acl.js
+++ b/js/acl.js
@@ -47,7 +47,14 @@ ACL.prototype.remove_mention = function(id) {
 		return;
 	}
 	var nick = this.data[id].nick;
-	var searchText = "@" + nick + "+" + id + " ";
+	var addr = this.data[id].addr;
+
+	if (addr != "") {
+		var searchText = "@" + addr + " ";
+	} else {
+		var searchText = "@" + nick + "+" + id + " ";
+	}
+
 	var start = this.element.val().indexOf(searchText);
 	if (start < 0) {
 		return;
@@ -61,7 +68,14 @@ ACL.prototype.add_mention = function(id) {
 		return;
 	}
 	var nick = this.data[id].nick;
-	var searchText =  "@" + nick + "+" + id + " ";
+	var addr = this.data[id].addr;
+
+	if (addr != "") {
+		var searchText = "@" + addr + " ";
+	} else {
+		var searchText = "@" + nick + "+" + id + " ";
+	}
+
 	if (this.element.val().indexOf( searchText) >= 0 ) {
 		return;
 	}