X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientignorelistmanager.cpp;h=5ab91dcf179f88a3219d8a09591be3c2b6b24635;hb=db00831bca59a012242d1ad5fac52a20c6cd2956;hp=f04296904576a34f2e445e2cd6f02768eddda196;hpb=27302bba72a29977e81b9a0b2d8cde3a62ebc818;p=quassel.git

diff --git a/src/client/clientignorelistmanager.cpp b/src/client/clientignorelistmanager.cpp
index f0429690..5ab91dcf 100644
--- a/src/client/clientignorelistmanager.cpp
+++ b/src/client/clientignorelistmanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,18 +15,36 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "clientignorelistmanager.h"
 
-ClientIgnoreListManager::ClientIgnoreListManager(QObject *parent)
+ClientIgnoreListManager::ClientIgnoreListManager(QObject* parent)
     : IgnoreListManager(parent)
 {
-  connect(this, SIGNAL(updated(const QVariantMap&)), this, SLOT(ignoreListUpdated(const QVariantMap&)));
+    connect(this, &SyncableObject::updatedRemotely, this, &ClientIgnoreListManager::ignoreListChanged);
 }
 
-void ClientIgnoreListManager::ignoreListUpdated(const QVariantMap &newMap) {
-  if(newMap != initIgnoreList())
-    emit ignoreListChanged();
+bool ClientIgnoreListManager::pureMatch(const IgnoreListItem& item, const QString& string) const
+{
+    return (item.contentsMatcher().match(string));
+}
+
+QMap<QString, bool> ClientIgnoreListManager::matchingRulesForHostmask(const QString& hostmask,
+                                                                      const QString& network,
+                                                                      const QString& channel) const
+{
+    QMap<QString, bool> result;
+    foreach (IgnoreListItem item, ignoreList()) {
+        if (item.type() == SenderIgnore && pureMatch(item, hostmask)
+            && ((network.isEmpty() && channel.isEmpty()) || item.scope() == GlobalScope
+                || (item.scope() == NetworkScope && item.scopeRuleMatcher().match(network))
+                || (item.scope() == ChannelScope && item.scopeRuleMatcher().match(channel)))) {
+            result[item.contents()] = item.isEnabled();
+            // qDebug() << "matchingRulesForHostmask found: " << item.contents()
+            //         << "is active: " << item.isActive;
+        }
+    }
+    return result;
 }