projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: strip format codes for Message ignores
[quassel.git]
/
src
/
common
/
ignorelistmanager.cpp
diff --git
a/src/common/ignorelistmanager.cpp
b/src/common/ignorelistmanager.cpp
index
d0ab71f
..
028066e
100644
(file)
--- a/
src/common/ignorelistmanager.cpp
+++ b/
src/common/ignorelistmanager.cpp
@@
-23,6
+23,8
@@
#include <QDebug>
#include <QStringList>
#include <QDebug>
#include <QStringList>
+#include "util.h"
+
int IgnoreListManager::indexOf(const QString& ignore) const
{
for (int i = 0; i < _ignoreList.count(); i++) {
int IgnoreListManager::indexOf(const QString& ignore) const
{
for (int i = 0; i < _ignoreList.count(); i++) {
@@
-131,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.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;
str = msgSender;
+ }
// qDebug() << "IgnoreListManager::match: ";
// qDebug() << "string: " << str;
// qDebug() << "IgnoreListManager::match: ";
// qDebug() << "string: " << str;