Merge pull request #660 from Cockatrice/ignore-unreg-pm

Ignore unreg pm

cockatrice/src/dlg_settings.cpp

@@ -571,11 +571,14 @@ MessagesSettingsPage::MessagesSettingsPage()
     connect(&chatMentionCheckBox, SIGNAL(stateChanged(int)), settingsCache, SLOT(setChatMention(int)));
     
     ignoreUnregUsersMainChat.setChecked(settingsCache->getIgnoreUnregisteredUsers());
+    ignoreUnregUserMessages.setChecked(settingsCache->getIgnoreUnregisteredUserMessages());
     connect(&ignoreUnregUsersMainChat, SIGNAL(stateChanged(int)), settingsCache, SLOT(setIgnoreUnregisteredUsers(int)));
+    connect(&ignoreUnregUserMessages, SIGNAL(stateChanged(int)), settingsCache, SLOT(setIgnoreUnregisteredUserMessages(int)));
     
     QGridLayout *chatGrid = new QGridLayout;
     chatGrid->addWidget(&chatMentionCheckBox, 0, 0);
     chatGrid->addWidget(&ignoreUnregUsersMainChat, 1, 0);
+    chatGrid->addWidget(&ignoreUnregUserMessages, 2, 0);
     chatGroupBox = new QGroupBox;
     chatGroupBox->setLayout(chatGrid);
 
@@ -647,7 +650,8 @@ void MessagesSettingsPage::retranslateUi()
     chatGroupBox->setTitle(tr("Chat settings"));
     chatMentionCheckBox.setText(tr("Enable chat mentions ('@yourusername' in chat log will be highlighted)"));
     messageShortcuts->setTitle(tr("In-game message macros"));
-    ignoreUnregUsersMainChat.setText(tr("Ignore unregistered users in main chat"));
+    ignoreUnregUsersMainChat.setText(tr("Ignore chat room messages sent by unregistered users."));
+    ignoreUnregUserMessages.setText(tr("Ignore private messages sent by unregistered users."));
 }
 
 DlgSettings::DlgSettings(QWidget *parent)

cockatrice/src/dlg_settings.h

@@ -162,6 +162,7 @@ private:
     QAction *aRemove;
     QCheckBox chatMentionCheckBox;
     QCheckBox ignoreUnregUsersMainChat;
+    QCheckBox ignoreUnregUserMessages;
     QGroupBox *chatGroupBox;
     QGroupBox *messageShortcuts;
 

cockatrice/src/settingscache.cpp

@@ -57,6 +57,7 @@ SettingsCache::SettingsCache()
     priceTagSource = settings->value("deckeditor/pricetagsource", 0).toInt();
 
     ignoreUnregisteredUsers = settings->value("chat/ignore_unregistered", false).toBool();
+    ignoreUnregisteredUserMessages = settings->value("chat/ignore_unregistered_messages", false).toBool();
 
     attemptAutoConnect = settings->value("server/auto_connect", 0).toBool(); 
 }
@@ -293,6 +294,12 @@ void SettingsCache::setIgnoreUnregisteredUsers(int _ignoreUnregisteredUsers)
     settings->setValue("chat/ignore_unregistered", ignoreUnregisteredUsers);
 }
 
+void SettingsCache::setIgnoreUnregisteredUserMessages(int _ignoreUnregisteredUserMessages)
+{
+    ignoreUnregisteredUserMessages = _ignoreUnregisteredUserMessages;
+    settings->setValue("chat/ignore_unregistered_messages", ignoreUnregisteredUserMessages);
+}
+
 void SettingsCache::setMainWindowGeometry(const QByteArray &_mainWindowGeometry)
 {
     mainWindowGeometry = _mainWindowGeometry;

cockatrice/src/settingscache.h

@@ -36,6 +36,7 @@ signals:
     void soundPathChanged();
     void priceTagFeatureChanged(int enabled);
     void ignoreUnregisteredUsersChanged();
+    void ignoreUnregisteredUserMessagesChanged();
     void pixmapCacheSizeChanged(int newSizeInMBs);
 private:
     QSettings *settings;
@@ -63,6 +64,7 @@ private:
     bool priceTagFeature;
     int priceTagSource;
     bool ignoreUnregisteredUsers;
+    bool ignoreUnregisteredUserMessages;
     QString picUrl;
     QString picUrlHq;
     QString picUrlFallback;
@@ -108,6 +110,7 @@ public:
     bool getPriceTagFeature() const { return priceTagFeature; }
     int getPriceTagSource() const { return priceTagSource; }
     bool getIgnoreUnregisteredUsers() const { return ignoreUnregisteredUsers; }
+    bool getIgnoreUnregisteredUserMessages() const { return ignoreUnregisteredUserMessages; }
     QString getPicUrl() const { return picUrl; }
     QString getPicUrlHq() const { return picUrlHq; }
     QString getPicUrlFallback() const { return picUrlFallback; }
@@ -149,6 +152,7 @@ public slots:
     void setPriceTagFeature(int _priceTagFeature);
     void setPriceTagSource(int _priceTagSource);
     void setIgnoreUnregisteredUsers(int _ignoreUnregisteredUsers);
+    void setIgnoreUnregisteredUserMessages(int _ignoreUnregisteredUserMessages);
     void setPicUrl(const QString &_picUrl);
     void setPicUrlHq(const QString &_picUrlHq);
     void setPicUrlFallback(const QString &_picUrlFallback);

cockatrice/src/tab_supervisor.cpp

@@ -446,11 +446,21 @@ 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());
+    TabMessage *tab = messageTabs.value(senderName);
     if (!tab)
         tab = messageTabs.value(QString::fromStdString(event.receiver_name()));
-    if (!tab)
+    if (!tab) {
+        UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(senderName);
+        if (twi) {
+            UserLevelFlags userLevel = UserLevelFlags(twi->getUserInfo().user_level());
+            if (settingsCache->getIgnoreUnregisteredUserMessages() &&
+                !userLevel.testFlag(ServerInfo_User::IsRegistered))
+                // Flags are additive, so reg/mod/admin are all IsRegistered
+                return;
+        }
         tab = addMessageTab(QString::fromStdString(event.sender_name()), false);
+    }
     if (!tab)
         return;
     tab->processUserMessageEvent(event);