From 1b37757583492f193b63ef9ee85fd725a63c1748 Mon Sep 17 00:00:00 2001 From: MassCraziness Date: Mon, 26 Jan 2015 12:24:57 -0600 Subject: [PATCH 1/7] Update tab_supervisor.cpp --- cockatrice/src/tab_supervisor.cpp | 37 ++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp index 166a766ab..f0213aa15 100644 --- a/cockatrice/src/tab_supervisor.cpp +++ b/cockatrice/src/tab_supervisor.cpp @@ -365,13 +365,13 @@ TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus if (receiverName == QString::fromStdString(userInfo->name())) return 0; - ServerInfo_User otherUser; + ServerInfo_User Self; UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(receiverName); if (twi) - otherUser = twi->getUserInfo(); + Self = twi->getUserInfo(); else - otherUser.set_name(receiverName.toStdString()); - TabMessage *tab = new TabMessage(this, client, *userInfo, otherUser); + Self.set_name(receiverName.toStdString()); + TabMessage *tab = new TabMessage(this, client, *userInfo, Self); connect(tab, SIGNAL(talkClosing(TabMessage *)), this, SLOT(talkLeft(TabMessage *))); int tabIndex = myAddTab(tab); addCloseButtonToTab(tab, tabIndex); @@ -446,11 +446,36 @@ void TabSupervisor::processGameEventContainer(const GameEventContainer &cont) void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event) { - TabMessage *tab = messageTabs.value(QString::fromStdString(event.sender_name())); + QString senderName = QString::fromStdString(event.sender_name()); + + UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(senderName); + + ServerInfo_User Self; + + if (twi) + Self = twi->getUserInfo(); + else + Self.set_name(senderName.toStdString()); + + UserLevelFlags SelfLevel = UserLevelFlags(Self.user_level()); + + if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsUnegistered)) + return; + + if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsRegistered)) + return; + + if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsModerator)) + return; + + if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsAdministrator)) + return; + +TabMessage *tab = messageTabs.value(senderName); if (!tab) tab = messageTabs.value(QString::fromStdString(event.receiver_name())); if (!tab) - tab = addMessageTab(QString::fromStdString(event.sender_name()), false); + tab = addMessageTab(senderName, false); if (!tab) return; tab->processUserMessageEvent(event); From 5b912650c50baecce6dedacf507e652eee36f9d3 Mon Sep 17 00:00:00 2001 From: MassCraziness Date: Mon, 26 Jan 2015 12:39:09 -0600 Subject: [PATCH 2/7] Update tab_supervisor.cpp --- cockatrice/src/tab_supervisor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp index f0213aa15..c194f0f2c 100644 --- a/cockatrice/src/tab_supervisor.cpp +++ b/cockatrice/src/tab_supervisor.cpp @@ -365,13 +365,13 @@ TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus if (receiverName == QString::fromStdString(userInfo->name())) return 0; - ServerInfo_User Self; + ServerInfo_User otherUser; UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(receiverName); if (twi) - Self = twi->getUserInfo(); + otherUser = twi->getUserInfo(); else - Self.set_name(receiverName.toStdString()); - TabMessage *tab = new TabMessage(this, client, *userInfo, Self); + otherUser.set_name(receiverName.toStdString()); + TabMessage *tab = new TabMessage(this, client, *userInfo, otherUser); connect(tab, SIGNAL(talkClosing(TabMessage *)), this, SLOT(talkLeft(TabMessage *))); int tabIndex = myAddTab(tab); addCloseButtonToTab(tab, tabIndex); From ac6effabc3e9818a0ca6f5dfccb768e52f6f7205 Mon Sep 17 00:00:00 2001 From: MassCraziness Date: Mon, 26 Jan 2015 13:03:37 -0600 Subject: [PATCH 3/7] Update tab_supervisor.cpp --- cockatrice/src/tab_supervisor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp index c194f0f2c..c00858f3f 100644 --- a/cockatrice/src/tab_supervisor.cpp +++ b/cockatrice/src/tab_supervisor.cpp @@ -459,7 +459,7 @@ void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event) UserLevelFlags SelfLevel = UserLevelFlags(Self.user_level()); - if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsUnegistered)) + if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsNormal)) return; if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsRegistered)) @@ -468,7 +468,7 @@ void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event) if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsModerator)) return; - if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsAdministrator)) + if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsAdmin)) return; TabMessage *tab = messageTabs.value(senderName); From cb55c793b6f471300eeee966bd7d9e4e6aad8ba0 Mon Sep 17 00:00:00 2001 From: MassCraziness Date: Mon, 26 Jan 2015 13:28:59 -0600 Subject: [PATCH 4/7] Update tab_supervisor.cpp --- cockatrice/src/tab_supervisor.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp index c00858f3f..918437bd2 100644 --- a/cockatrice/src/tab_supervisor.cpp +++ b/cockatrice/src/tab_supervisor.cpp @@ -459,18 +459,9 @@ void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event) UserLevelFlags SelfLevel = UserLevelFlags(Self.user_level()); - if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsNormal)) - return; - - if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsRegistered)) + if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsUser)) || !SelfLevel.testFlag(ServerInfo_User::IsRegistered)) || !SelfLevel.testFlag(ServerInfo_User::IsModerator)) || !SelfLevel.testFlag(ServerInfo_User::IsAdmin)) return; - if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsModerator)) - return; - - if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsAdmin)) - return; - TabMessage *tab = messageTabs.value(senderName); if (!tab) tab = messageTabs.value(QString::fromStdString(event.receiver_name())); From 3b2d666494777650e9741091784610498ef4eadf Mon Sep 17 00:00:00 2001 From: MassCraziness Date: Mon, 26 Jan 2015 13:32:14 -0600 Subject: [PATCH 5/7] Update tab_supervisor.cpp --- cockatrice/src/tab_supervisor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp index 918437bd2..768c7d878 100644 --- a/cockatrice/src/tab_supervisor.cpp +++ b/cockatrice/src/tab_supervisor.cpp @@ -450,12 +450,12 @@ void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event) UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(senderName); - ServerInfo_User Self; + ServerInfo_User otherUser; if (twi) - Self = twi->getUserInfo(); + otherUser = twi->getUserInfo(); else - Self.set_name(senderName.toStdString()); + otherUser.set_name(senderName.toStdString()); UserLevelFlags SelfLevel = UserLevelFlags(Self.user_level()); From 1f91a0783a22475c65bb720f080961fd921c0266 Mon Sep 17 00:00:00 2001 From: MassCraziness Date: Mon, 26 Jan 2015 14:00:33 -0600 Subject: [PATCH 6/7] Update tab_supervisor.cpp --- cockatrice/src/tab_supervisor.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp index 768c7d878..33a057ad2 100644 --- a/cockatrice/src/tab_supervisor.cpp +++ b/cockatrice/src/tab_supervisor.cpp @@ -450,18 +450,27 @@ void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event) UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(senderName); - ServerInfo_User otherUser; + ServerInfo_User Self; if (twi) - otherUser = twi->getUserInfo(); + Self = twi->getUserInfo(); else - otherUser.set_name(senderName.toStdString()); + Self.set_name(senderName.toStdString()); UserLevelFlags SelfLevel = UserLevelFlags(Self.user_level()); - if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsUser)) || !SelfLevel.testFlag(ServerInfo_User::IsRegistered)) || !SelfLevel.testFlag(ServerInfo_User::IsModerator)) || !SelfLevel.testFlag(ServerInfo_User::IsAdmin)) + if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsUser)) return; + if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsRegistered)) + return; + + if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsModerator)) + return; + + if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsAdmin)) + return; + TabMessage *tab = messageTabs.value(senderName); if (!tab) tab = messageTabs.value(QString::fromStdString(event.receiver_name())); From cf9c44494e78eece3cfaf7704be3ee166ee24171 Mon Sep 17 00:00:00 2001 From: MassCraziness Date: Mon, 26 Jan 2015 17:11:14 -0600 Subject: [PATCH 7/7] Update tab_supervisor.cpp --- cockatrice/src/tab_supervisor.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp index 33a057ad2..2adeed124 100644 --- a/cockatrice/src/tab_supervisor.cpp +++ b/cockatrice/src/tab_supervisor.cpp @@ -459,17 +459,8 @@ void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event) UserLevelFlags SelfLevel = UserLevelFlags(Self.user_level()); - if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsUser)) - return; - - if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsRegistered)) - return; - - if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsModerator)) - return; - - if (settingsCache->getIgnoreUnregisteredUsers() && !SelfLevel.testFlag(ServerInfo_User::IsAdmin)) - return; + if (settingsCache->getIgnoreUnregisteredUsers() && (!SelfLevel.testFlag(ServerInfo_User::IsUser) || !SelfLevel.testFlag(ServerInfo_User::IsRegistered) || !SelfLevel.testFlag(ServerInfo_User::IsModerator) || !SelfLevel.testFlag(ServerInfo_User::IsAdmin))) + return; TabMessage *tab = messageTabs.value(senderName); if (!tab)