From f98deaba70fabd9f5d27eb1b3d0e3beb41594153 Mon Sep 17 00:00:00 2001
From: Max Leiter <mleiter18@priorypanther.com>
Date: Mon, 27 Nov 2017 13:58:10 -0800
Subject: [PATCH] update nick regex for linking nicks in text

---
 src/plugins/irc-events/message.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/irc-events/message.js b/src/plugins/irc-events/message.js
index 4b648bc2..5ddcc0f3 100644
--- a/src/plugins/irc-events/message.js
+++ b/src/plugins/irc-events/message.js
@@ -4,7 +4,7 @@ const Chan = require("../../models/chan");
 const Msg = require("../../models/msg");
 const LinkPrefetch = require("./link");
 const cleanIrcMessage = require("../../../client/js/libs/handlebars/ircmessageparser/cleanIrcMessage");
-const nickRegExp = /[\w[\]\\`^{|}-]{4,}/gi;
+const nickRegExp = /(?:\x03[0-9]{1,2}(?:,[0-9]{1,2})?)?([\w[\]\\`^{|}-]{4,})/g;
 
 module.exports = function(irc, network) {
 	const client = this;
@@ -92,8 +92,8 @@ module.exports = function(irc, network) {
 		const users = [];
 		let match;
 		while ((match = nickRegExp.exec(data.message))) {
-			if (chan.findUser(match[0])) {
-				users.push(match[0]);
+			if (chan.findUser(match[1])) {
+				users.push(match[1]);
 			}
 		}