Revert "[GH-5915] Clicking on @mention of a user in a post shows the profile popover (#6129)" (#6289)

This reverts commit 83f819451a80a767170b927eb2f0d5ed63f03239.

3 files changed, 11 insertions, 19 deletions

diff --git a/webapp/utils/channel_intro_messages.jsx b/webapp/utils/channel_intro_messages.jsx
index cc5071047..31ba8708d 100644
--- a/webapp/utils/channel_intro_messages.jsx
+++ b/webapp/utils/channel_intro_messages.jsx
@@ -5,14 +5,14 @@ import * as Utils from './utils.jsx';
 import ChannelInviteModal from 'components/channel_invite_modal';
 import EditChannelHeaderModal from 'components/edit_channel_header_modal.jsx';
 import ToggleModalButton from 'components/toggle_modal_button.jsx';
-import UserProfile from 'components/profile_popover/username_profile_popover.jsx';
+import UserProfile from 'components/user_profile.jsx';
 import ChannelStore from 'stores/channel_store.jsx';
 import UserStore from 'stores/user_store.jsx';
 import TeamStore from 'stores/team_store.jsx';
 import Constants from 'utils/constants.jsx';
 import * as GlobalActions from 'actions/global_actions.jsx';
 import Client from 'client/web_client.jsx';
-import ProfilePicture from 'components/profile_popover/picture_profile_popover.jsx';
+import ProfilePicture from 'components/profile_picture.jsx';
 
 import {showManagementOptions} from './channel_utils.jsx';
 
diff --git a/webapp/utils/text_formatting.jsx b/webapp/utils/text_formatting.jsx
index bd718b363..c2c71a4e1 100644
--- a/webapp/utils/text_formatting.jsx
+++ b/webapp/utils/text_formatting.jsx
@@ -166,13 +166,8 @@ export function autolinkAtMentions(text, tokens, usernameMap) {
         const index = tokens.size;
         const alias = `$MM_ATMENTION${index}`;
 
-        let tokenValue = `<span data-mention='${username}'><a class='mention-link' href='#'>${mention}</a></span>`;
-        if (Constants.SPECIAL_MENTIONS.indexOf(username) >= 0) {
-            tokenValue = mention;
-        }
-
         tokens.set(alias, {
-            value: tokenValue,
+            value: `<a class='mention-link' href='#' data-mention='${username}'>${mention}</a>`,
             originalText: mention
         });
         return alias;
@@ -186,7 +181,8 @@ export function autolinkAtMentions(text, tokens, usernameMap) {
             const truncated = usernameLower.substring(0, c);
             const suffix = usernameLower.substring(c);
 
-            if (mentionExists(truncated) && (c === usernameLower.length || punctuation.test(usernameLower[c]))) {
+            // If we've found a username or run out of punctuation to trim off, render it as an at mention
+            if (mentionExists(truncated) || !punctuation.test(truncated[truncated.length - 1])) {
                 const alias = addToken(truncated, '@' + truncated);
                 return prefix + alias + suffix;
             }
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index 9b29c5362..f56b9bb09 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -989,16 +989,12 @@ export function changeOpacity(oldColor, opacity) {
 }
 
 export function getFullName(user) {
-    if (user !== null && typeof user !== 'undefined' && typeof user === 'object') {
-        const firstName = user.hasOwnProperty('first_name') ? user.first_name : '';
-        const lastName = user.hasOwnProperty('last_name') ? user.last_name : '';
-        if (firstName && lastName) {
-            return firstName + ' ' + lastName;
-        } else if (firstName) {
-            return firstName;
-        } else if (lastName) {
-            return lastName;
-        }
+    if (user.first_name && user.last_name) {
+        return user.first_name + ' ' + user.last_name;
+    } else if (user.first_name) {
+        return user.first_name;
+    } else if (user.last_name) {
+        return user.last_name;
     }
 
     return '';