X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientignorelistmanager.cpp;h=02a4e23fa70f8fbc28361c159073ef70f67d0e41;hp=f4b1f9176eafd9e158119192a2f83f8deae3e771;hb=24acf1efa9e91c58d9e64d76e03e7683ac0ac889;hpb=12feae2e4609b90c87d3c1857031909248143fd7

diff --git a/src/client/clientignorelistmanager.cpp b/src/client/clientignorelistmanager.cpp
index f4b1f917..02a4e23f 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-2013 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,20 +15,46 @@
  *   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"
 
+#include <QRegExp>
+
 INIT_SYNCABLE_OBJECT(ClientIgnoreListManager)
 
 ClientIgnoreListManager::ClientIgnoreListManager(QObject *parent)
     : IgnoreListManager(parent)
 {
-  connect(this, SIGNAL(updated(const QVariantMap&)), this, SLOT(ignoreListUpdated(const QVariantMap&)));
+    connect(this, SIGNAL(updatedRemotely()), SIGNAL(ignoreListChanged()));
+}
+
+
+bool ClientIgnoreListManager::pureMatch(const IgnoreListItem &item, const QString &string) const
+{
+    QRegExp ruleRx = QRegExp(item.ignoreRule);
+    ruleRx.setCaseSensitivity(Qt::CaseInsensitive);
+    if (!item.isRegEx)
+        ruleRx.setPatternSyntax(QRegExp::Wildcard);
+
+    if ((!item.isRegEx && ruleRx.exactMatch(string)) ||
+        (item.isRegEx && ruleRx.indexIn(string) != -1))
+        return true;
+    return false;
 }
 
-void ClientIgnoreListManager::ignoreListUpdated(const QVariantMap &newMap) {
-  if(newMap != initIgnoreList())
-    emit ignoreListChanged();
+
+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 && scopeMatch(item.scopeRule, network))
+                || (item.scope == ChannelScope && scopeMatch(item.scopeRule, channel)))) {
+            result[item.ignoreRule] = item.isActive;
+//      qDebug() << "matchingRulesForHostmask found: " << item.ignoreRule << "is active: " << item.isActive;
+        }
+    }
+    return result;
 }