/***************************************************************************
- * 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 *
* 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)
{
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;
+ return (item.contentsMatcher().match(string));
}
{
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;
+ 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;