jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-12 21:10:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge f60bce5452 into aa1814ef8f

Browse source
This commit is contained in:
MassCraziness 2015-01-27 01:33:43 +00:00
commit db9b2792d1
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cockatrice/src/tab_supervisor.cpp
View file

@ -446,11 +446,27 @@ void TabSupervisor::processGameEventContainer(const GameEventContainer &cont)
void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event) 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::IsUser) || !SelfLevel.testFlag(ServerInfo_User::IsRegistered) || !SelfLevel.testFlag(ServerInfo_User::IsModerator) || !SelfLevel.testFlag(ServerInfo_User::IsAdmin)))
return;
TabMessage *tab = messageTabs.value(senderName);
if (!tab) if (!tab)
tab = messageTabs.value(QString::fromStdString(event.receiver_name())); tab = messageTabs.value(QString::fromStdString(event.receiver_name()));
if (!tab) if (!tab)
tab = addMessageTab(QString::fromStdString(event.sender_name()), false); tab = addMessageTab(senderName, false);
if (!tab) if (!tab)
return; return;
tab->processUserMessageEvent(event); tab->processUserMessageEvent(event);