From ae4436ade7a04cdec9f135dee9317032ea38439d Mon Sep 17 00:00:00 2001
From: Zach H <Zoosorbs@gmail.com>
Date: Mon, 6 Jul 2015 12:45:08 -0400
Subject: [PATCH] mod global msg overrides settings

---
 cockatrice/src/chatview.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/cockatrice/src/chatview.cpp b/cockatrice/src/chatview.cpp
index 6acb9a86..2b967ac4 100644
--- a/cockatrice/src/chatview.cpp
+++ b/cockatrice/src/chatview.cpp
@@ -171,7 +171,7 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
     {
         // search for the first [ or @
         bracketFirstIndex = message.indexOf('[');
-        mentionFirstIndex = mentionEnabled ? message.indexOf('@') : -1;
+        mentionFirstIndex = message.indexOf('@');
         urlFirstIndex = message.indexOf(urlStarter);
 
         bool startsWithBracket = (bracketFirstIndex != -1);
@@ -298,20 +298,19 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
         }
         else if (index == mentionFirstIndex)
         {
-            if (tabSupervisor->getIsLocalGame())
+            int firstSpace = message.indexOf(" ");
+            QString fullMentionUpToSpaceOrEnd = (firstSpace == -1) ? message.mid(1) : message.mid(1, firstSpace - 1);
+            QString mentionIntact = fullMentionUpToSpaceOrEnd;
+
+            if ((!mentionEnabled && !isModeratorSendingGlobal(userLevel, fullMentionUpToSpaceOrEnd)) || tabSupervisor->getIsLocalGame())
             {
                 cursor.insertText("@");
                 message = message.mid(1);
             }
             else
             {
-
                 QMap<QString, UserListTWI *> userList = tabSupervisor->getUserListsTab()->getAllUsersList()->getUsers();
 
-                int firstSpace = message.indexOf(" ");
-                QString fullMentionUpToSpaceOrEnd = (firstSpace == -1) ? message.mid(1) : message.mid(1, firstSpace - 1);
-                QString mentionIntact = fullMentionUpToSpaceOrEnd;
-
                 do
                 {
                     if (isFullMentionAValidUser(userList, fullMentionUpToSpaceOrEnd)) // Is there a user online named this?