X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreignorelistmanager.cpp;h=9a7b3e73a31a04be4adff60e81e277516596c234;hb=48017b680ede0dbfb121d1184dfbd13536cfc53f;hp=140d1238647285a812c027f74462af6cb40b5671;hpb=12feae2e4609b90c87d3c1857031909248143fd7;p=quassel.git

diff --git a/src/core/coreignorelistmanager.cpp b/src/core/coreignorelistmanager.cpp
index 140d1238..9a7b3e73 100644
--- a/src/core/coreignorelistmanager.cpp
+++ b/src/core/coreignorelistmanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   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 "coreignorelistmanager.h"
@@ -23,35 +23,45 @@
 #include "core.h"
 #include "coresession.h"
 
-INIT_SYNCABLE_OBJECT(CoreIgnoreListManager)
+CoreIgnoreListManager::CoreIgnoreListManager(CoreSession* parent)
+    : IgnoreListManager(parent)
+{
+    auto* session = qobject_cast<CoreSession*>(parent);
+    if (!session) {
+        qWarning() << "CoreIgnoreListManager: unable to load IgnoreList. Parent is not a Coresession!";
+        // loadDefaults();
+        return;
+    }
+
+    initSetIgnoreList(Core::getUserSetting(session->user(), "IgnoreList").toMap());
+
+    // we store our settings whenever they change
+    connect(this, &SyncableObject::updatedRemotely, this, &CoreIgnoreListManager::save);
 
-CoreIgnoreListManager::CoreIgnoreListManager(CoreSession *parent)
-  : IgnoreListManager(parent)
+    // if(isEmpty())
+    // loadDefaults();
+}
+
+IgnoreListManager::StrictnessType CoreIgnoreListManager::match(const RawMessage& rawMsg, const QString& networkName)
 {
-  CoreSession *session = qobject_cast<CoreSession *>(parent);
-  if(!session) {
-    qWarning() << "CoreIgnoreListManager: unable to load IgnoreList. Parent is not a Coresession!";
-    //loadDefaults();
-    return;
-  }
-
-  initSetIgnoreList(Core::getUserSetting(session->user(), "IgnoreList").toMap());
-  //if(isEmpty())
-    //loadDefaults();
+    // StrictnessType _match(const QString &msgContents, const QString &msgSender, Message::Type msgType, const QString &network, const QString &bufferName);
+    return _match(rawMsg.text, rawMsg.sender, rawMsg.type, networkName, rawMsg.target);
 }
 
-CoreIgnoreListManager::~CoreIgnoreListManager() {
-  CoreSession *session = qobject_cast<CoreSession *>(parent());
-  if(!session) {
-    qWarning() << "CoreIgnoreListManager: unable to save IgnoreList. Parent is not a Coresession!";
-    return;
-  }
+void CoreIgnoreListManager::save() const
+{
+    auto* session = qobject_cast<CoreSession*>(parent());
+    if (!session) {
+        qWarning() << "CoreIgnoreListManager: unable to save IgnoreList. Parent is not a Coresession!";
+        return;
+    }
 
-  Core::setUserSetting(session->user(), "IgnoreList", initIgnoreList());
+    Core::setUserSetting(session->user(), "IgnoreList", initIgnoreList());
 }
 
-//void CoreIgnoreListManager::loadDefaults() {
+// void CoreIgnoreListManager::loadDefaults() {
 //  foreach(IgnoreListItem item, IgnoreListManager::defaults()) {
-//    addIgnoreListItem(item.ignoreRule, item.isRegEx, item.strictness, item.scope, item.scopeRule);
+//    addIgnoreListItem(item.contents(), item.isRegEx(), item.strictness(), item.scope(),
+//                      item.scopeRule());
 //  }
 //}