From 63d68b3e36c2deaaeb7174edc1950fab3752d887 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Mon, 30 Jan 2017 10:59:00 -0500
Subject: Fix @ mentions not always highlighting (#5223)

---
 webapp/stores/user_store.jsx | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'webapp')

diff --git a/webapp/stores/user_store.jsx b/webapp/stores/user_store.jsx
index fb1e36590..bcc59b690 100644
--- a/webapp/stores/user_store.jsx
+++ b/webapp/stores/user_store.jsx
@@ -540,6 +540,11 @@ class UserStoreClass extends EventEmitter {
             keys.push('@all');
         }
 
+        const usernameKey = '@' + user.username;
+        if (keys.indexOf(usernameKey) === -1) {
+            keys.push(usernameKey);
+        }
+
         return keys;
     }
 
-- 
cgit v1.2.3-1-g7c22