X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fignorelistmanager.cpp;h=1095681b99ad5185a506003f252fcaa9ffd52129;hp=077189d147dd3560568d326f32bf39005b1032b4;hb=HEAD;hpb=cc6e7c08709c4e761e2fd9c2e322751015497003

diff --git a/src/common/ignorelistmanager.cpp b/src/common/ignorelistmanager.cpp
index 077189d1..1095681b 100644
--- a/src/common/ignorelistmanager.cpp
+++ b/src/common/ignorelistmanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2019 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,17 +22,8 @@
 
 #include <QDebug>
 #include <QStringList>
-#include <QtCore>
 
-IgnoreListManager& IgnoreListManager::operator=(const IgnoreListManager& other)
-{
-    if (this == &other)
-        return *this;
-
-    SyncableObject::operator=(other);
-    _ignoreList = other._ignoreList;
-    return *this;
-}
+#include "util.h"
 
 int IgnoreListManager::indexOf(const QString& ignore) const
 {
@@ -142,10 +133,12 @@ IgnoreListManager::StrictnessType IgnoreListManager::_match(
         if (item.scope() == GlobalScope || (item.scope() == NetworkScope && item.scopeRuleMatcher().match(network))
             || (item.scope() == ChannelScope && item.scopeRuleMatcher().match(bufferName))) {
             QString str;
-            if (item.type() == MessageIgnore)
-                str = msgContents;
-            else
+            if (item.type() == MessageIgnore) {
+                // TODO: Make this configurable?  Pre-0.14, format codes were not removed
+                str = stripFormatCodes(msgContents);
+            } else {
                 str = msgSender;
+            }
 
             //      qDebug() << "IgnoreListManager::match: ";
             //      qDebug() << "string: " << str;