X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagefilter.cpp;h=5efed2c13f055a167c74da0e266ca4d9f541b2ad;hp=238c7d57f1c5fdb5106b6f1d48b350e9ea595a5b;hb=921e54680da16fcf2adb7a90506875aceb6633a4;hpb=402f690fb8ca07adc2c063ba550d7e8fc0159ada diff --git a/src/client/messagefilter.cpp b/src/client/messagefilter.cpp index 238c7d57..5efed2c1 100644 --- a/src/client/messagefilter.cpp +++ b/src/client/messagefilter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-2015 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,139 +15,232 @@ * 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 "messagefilter.h" #include "buffersettings.h" #include "client.h" +#include "buffermodel.h" #include "messagemodel.h" #include "networkmodel.h" +#include "clientignorelistmanager.h" MessageFilter::MessageFilter(QAbstractItemModel *source, QObject *parent) - : QSortFilterProxyModel(parent), - _messageTypeFilter(0), - _bufferType(BufferInfo::InvalidBuffer) + : QSortFilterProxyModel(parent), + _messageTypeFilter(0) { - init(); - setSourceModel(source); + init(); + setSourceModel(source); } + MessageFilter::MessageFilter(MessageModel *source, const QList &buffers, QObject *parent) - : QSortFilterProxyModel(parent), + : QSortFilterProxyModel(parent), _validBuffers(buffers.toSet()), - _messageTypeFilter(0), - _bufferType(BufferInfo::InvalidBuffer) + _messageTypeFilter(0) { - init(); - setSourceModel(source); + init(); + setSourceModel(source); } -void MessageFilter::init() { - BufferSettings defaultSettings; - _messageTypeFilter = defaultSettings.messageFilter(); - defaultSettings.notify("MessageTypeFilter", this, SLOT(messageTypeFilterChanged())); - BufferSettings mySettings(idString()); - if(mySettings.hasFilter()) - _messageTypeFilter = mySettings.messageFilter(); - mySettings.notify("MessageTypeFilter", this, SLOT(messageTypeFilterChanged())); +void MessageFilter::init() +{ + setDynamicSortFilter(true); + + _userNoticesTarget = _serverNoticesTarget = _errorMsgsTarget = -1; + + BufferSettings defaultSettings; + defaultSettings.notify("UserNoticesTarget", this, SLOT(messageRedirectionChanged())); + defaultSettings.notify("ServerNoticesTarget", this, SLOT(messageRedirectionChanged())); + defaultSettings.notify("ErrorMsgsTarget", this, SLOT(messageRedirectionChanged())); + messageRedirectionChanged(); + + _messageTypeFilter = defaultSettings.messageFilter(); + defaultSettings.notify("MessageTypeFilter", this, SLOT(messageTypeFilterChanged())); + + BufferSettings mySettings(idString()); + if (mySettings.hasFilter()) + _messageTypeFilter = mySettings.messageFilter(); + mySettings.notify("MessageTypeFilter", this, SLOT(messageTypeFilterChanged())); + mySettings.notify("hasMessageTypeFilter", this, SLOT(messageTypeFilterChanged())); } -void MessageFilter::messageTypeFilterChanged() { - int newFilter; - BufferSettings defaultSettings; - newFilter = BufferSettings().messageFilter(); - BufferSettings mySettings(idString()); - if(mySettings.hasFilter()) - newFilter = mySettings.messageFilter(); +void MessageFilter::messageTypeFilterChanged() +{ + int newFilter; + BufferSettings defaultSettings; + newFilter = BufferSettings().messageFilter(); + + BufferSettings mySettings(idString()); + if (mySettings.hasFilter()) + newFilter = mySettings.messageFilter(); + + if (_messageTypeFilter != newFilter) { + _messageTypeFilter = newFilter; + _filteredQuitMsgs.clear(); + invalidateFilter(); + } +} + + +void MessageFilter::messageRedirectionChanged() +{ + BufferSettings bufferSettings; + bool changed = false; + + if (_userNoticesTarget != bufferSettings.userNoticesTarget()) { + _userNoticesTarget = bufferSettings.userNoticesTarget(); + changed = true; + } + + if (_serverNoticesTarget != bufferSettings.serverNoticesTarget()) { + _serverNoticesTarget = bufferSettings.serverNoticesTarget(); + changed = true; + } + + if (_errorMsgsTarget != bufferSettings.errorMsgsTarget()) { + _errorMsgsTarget = bufferSettings.errorMsgsTarget(); + changed = true; + } - if(_messageTypeFilter != newFilter) { - _messageTypeFilter = newFilter; - _filteredQuitMsgs.clear(); - invalidateFilter(); - } + if (changed) + invalidateFilter(); } -QString MessageFilter::idString() const { - if(_validBuffers.isEmpty()) - return "*"; - QList bufferIds = _validBuffers.toList();; - qSort(bufferIds); - - QStringList bufferIdStrings; - foreach(BufferId id, bufferIds) +QString MessageFilter::idString() const +{ + if (_validBuffers.isEmpty()) + return "*"; + + QList bufferIds = _validBuffers.toList(); + qSort(bufferIds); + + QStringList bufferIdStrings; + foreach(BufferId id, bufferIds) bufferIdStrings << QString::number(id.toInt()); - return bufferIdStrings.join("|"); + return bufferIdStrings.join("|"); } -bool MessageFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const { - Q_UNUSED(sourceParent); - QModelIndex sourceIdx = sourceModel()->index(sourceRow, 2); - Message::Type messageType = (Message::Type)sourceModel()->data(sourceIdx, MessageModel::TypeRole).toInt(); - - // apply message type filter - if(_messageTypeFilter & messageType) - return false; - - if(_validBuffers.isEmpty()) - return true; - - BufferId id = sourceModel()->data(sourceIdx, MessageModel::BufferIdRole).value(); - if(!id.isValid()) { - return true; - } - - if(_validBuffers.contains(id)) { - return true; - } else { - // show Quit messages in Query buffers: - if(bufferType() != BufferInfo::QueryBuffer) - return false; - if(!(messageType & Message::Quit)) - return false; - - uint messageTimestamp = sourceModel()->data(sourceIdx, MessageModel::TimestampRole).value().toTime_t(); - if(_filteredQuitMsgs.contains(messageTimestamp)) - return false; - - QString quiter = sourceModel()->data(sourceIdx, Qt::DisplayRole).toString().section(' ', 0, 0, QString::SectionSkipEmpty); - if(quiter.toLower() == bufferName().toLower()) { - MessageFilter *that = const_cast(this); - that->_filteredQuitMsgs << messageTimestamp; - return true; - } else { - return false; + +bool MessageFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const +{ + Q_UNUSED(sourceParent); + QModelIndex sourceIdx = sourceModel()->index(sourceRow, 2); + Message::Type messageType = (Message::Type)sourceIdx.data(MessageModel::TypeRole).toInt(); + + // apply message type filter + if (_messageTypeFilter & messageType) + return false; + + if (_validBuffers.isEmpty()) + return true; + + BufferId bufferId = sourceIdx.data(MessageModel::BufferIdRole).value(); + if (!bufferId.isValid()) { + return true; } - } -} -void MessageFilter::requestBacklog() { - QSet::const_iterator bufferIdIter = _validBuffers.constBegin(); - while(bufferIdIter != _validBuffers.constEnd()) { - Client::messageModel()->requestBacklog(*bufferIdIter); - bufferIdIter++; - } -} + // MsgId msgId = sourceIdx.data(MessageModel::MsgIdRole).value(); + Message::Flags flags = (Message::Flags)sourceIdx.data(MessageModel::FlagsRole).toInt(); + + NetworkId myNetworkId = networkId(); + NetworkId msgNetworkId = Client::networkModel()->networkId(bufferId); + if (myNetworkId != msgNetworkId) + return false; + + // ignorelist handling + // only match if message is not flagged as server msg + if (!(flags & Message::ServerMsg) && Client::ignoreListManager() + && Client::ignoreListManager()->match(sourceIdx.data(MessageModel::MessageRole).value(), Client::networkModel()->networkName(bufferId))) + return false; + + if (flags & Message::Redirected) { + int redirectionTarget = 0; + switch (messageType) { + case Message::Notice: + if (Client::networkModel()->bufferType(bufferId) != BufferInfo::ChannelBuffer) { + if (flags & Message::ServerMsg) { + // server notice + redirectionTarget = _serverNoticesTarget; + } + else { + redirectionTarget = _userNoticesTarget; + } + } + break; + case Message::Error: + redirectionTarget = _errorMsgsTarget; + break; + default: + break; + } + + if (redirectionTarget & BufferSettings::DefaultBuffer && _validBuffers.contains(bufferId)) + return true; + + if (redirectionTarget & BufferSettings::CurrentBuffer && !(flags & Message::Backlog)) { + BufferId redirectedTo = sourceModel()->data(sourceIdx, MessageModel::RedirectedToRole).value(); + if (!redirectedTo.isValid()) { + BufferId redirectedTo = Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value(); + if (redirectedTo.isValid()) + sourceModel()->setData(sourceIdx, QVariant::fromValue(redirectedTo), MessageModel::RedirectedToRole); + } + + if (_validBuffers.contains(redirectedTo)) + return true; + } + + if (redirectionTarget & BufferSettings::StatusBuffer) { + QSet::const_iterator idIter = _validBuffers.constBegin(); + while (idIter != _validBuffers.constEnd()) { + if (Client::networkModel()->bufferType(*idIter) == BufferInfo::StatusBuffer) + return true; + idIter++; + } + } + + return false; + } -const QString &MessageFilter::bufferName() const { - if(_bufferName.isEmpty()) { - MessageFilter *that = const_cast(this); - that->_bufferName = Client::networkModel()->bufferName(singleBufferId()); - return that->_bufferName; - } - return _bufferName; + if (_validBuffers.contains(bufferId)) { + return true; + } + else { + // show Quit messages in Query buffers: + if (bufferType() != BufferInfo::QueryBuffer) + return false; + if (!(messageType & Message::Quit)) + return false; + + if (myNetworkId != msgNetworkId) + return false; + + uint messageTimestamp = sourceModel()->data(sourceIdx, MessageModel::TimestampRole).value().toTime_t(); + QString quiter = sourceModel()->data(sourceIdx, Qt::DisplayRole).toString().section(' ', 0, 0, QString::SectionSkipEmpty).toLower(); + if (quiter != bufferName().toLower()) + return false; + + if (_filteredQuitMsgs.contains(quiter, messageTimestamp)) + return false; + + MessageFilter *that = const_cast(this); + that->_filteredQuitMsgs.insert(quiter, messageTimestamp); + return true; + } } -BufferInfo::Type MessageFilter::bufferType() const { - if(_bufferType == BufferInfo::InvalidBuffer) { - MessageFilter *that = const_cast(this); - that->_bufferType = Client::networkModel()->bufferType(singleBufferId()); - return that->_bufferType; - } - return _bufferType; + +void MessageFilter::requestBacklog() +{ + QSet::const_iterator bufferIdIter = _validBuffers.constBegin(); + while (bufferIdIter != _validBuffers.constEnd()) { + Client::messageModel()->requestBacklog(*bufferIdIter); + bufferIdIter++; + } }