From 80e0a8db1d70ca387c654d9ac6bded0fb1e352a6 Mon Sep 17 00:00:00 2001
From: Pat Lathem <patl@codero.com>
Date: Sat, 24 Oct 2015 18:54:01 -0500
Subject: [PATCH] Fix off by one error

---
 web/react/utils/text_formatting.jsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx
index 9fd22e6b94..c49bdf9164 100644
--- a/web/react/utils/text_formatting.jsx
+++ b/web/react/utils/text_formatting.jsx
@@ -148,23 +148,23 @@ function autolinkAtMentions(text, tokens) {
 
     function replaceAtMentionWithToken(fullMatch, prefix, mention, username) {
         let usernameLower = username.toLowerCase();
-        
+
         if (mentionExists(usernameLower)) {
             // Exact match
             const alias = addToken(usernameLower, mention, '');
             return prefix + alias;
-         }
+        }
 
         // Not an exact match, attempt to truncate any punctuation to see if we can find a user
         const originalUsername = usernameLower;
-    
+
         for (let c = usernameLower.length; c > 0; c--) {
-            if (isPunctuation(usernameLower[c-1])) {
-                usernameLower = usernameLower.substring(0, c);
+            if (isPunctuation(usernameLower[c - 1])) {
+                usernameLower = usernameLower.substring(0, c - 1);
 
                 if (mentionExists(usernameLower)) {
-                    const extraText = originalUsername.substr(c);
-                    const alias = addToken(usernameLower, mention, extraText);
+                    const extraText = originalUsername.substr(c - 1);
+                    const alias = addToken(usernameLower, '@' + usernameLower, extraText);
                     return prefix + alias;
                 }
             } else {