X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagefilter.cpp;h=5efed2c13f055a167c74da0e266ca4d9f541b2ad;hp=323405e121e70ff7b84ec34afdd923f2bd7580e5;hb=921e54680da16fcf2adb7a90506875aceb6633a4;hpb=7e20c659f88e26ccdfdc65f4894ed6ecf61ca8a9

diff --git a/src/client/messagefilter.cpp b/src/client/messagefilter.cpp
index 323405e1..5efed2c1 100644
--- a/src/client/messagefilter.cpp
+++ b/src/client/messagefilter.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 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,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 "messagefilter.h"
@@ -25,200 +25,222 @@
 #include "buffermodel.h"
 #include "messagemodel.h"
 #include "networkmodel.h"
+#include "clientignorelistmanager.h"
 
 MessageFilter::MessageFilter(QAbstractItemModel *source, QObject *parent)
-  : QSortFilterProxyModel(parent),
+    : QSortFilterProxyModel(parent),
     _messageTypeFilter(0)
 {
-  init();
-  setSourceModel(source);
+    init();
+    setSourceModel(source);
 }
 
+
 MessageFilter::MessageFilter(MessageModel *source, const QList<BufferId> &buffers, QObject *parent)
-  : QSortFilterProxyModel(parent),
+    : QSortFilterProxyModel(parent),
     _validBuffers(buffers.toSet()),
     _messageTypeFilter(0)
 {
-  init();
-  setSourceModel(source);
+    init();
+    setSourceModel(source);
 }
 
-void MessageFilter::init() {
-  setDynamicSortFilter(true);
-
-  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()));
+void MessageFilter::init()
+{
+    setDynamicSortFilter(true);
 
-  BufferSettings mySettings(idString());
-  if(mySettings.hasFilter())
-    _messageTypeFilter = mySettings.messageFilter();
-  mySettings.notify("MessageTypeFilter", this, SLOT(messageTypeFilterChanged()));
-  mySettings.notify("hasMessageTypeFilter", this, SLOT(messageTypeFilterChanged()));
-}
+    _userNoticesTarget = _serverNoticesTarget = _errorMsgsTarget = -1;
 
-void MessageFilter::messageTypeFilterChanged() {
-  int newFilter;
-  BufferSettings defaultSettings;
-  newFilter = BufferSettings().messageFilter();
+    BufferSettings defaultSettings;
+    defaultSettings.notify("UserNoticesTarget", this, SLOT(messageRedirectionChanged()));
+    defaultSettings.notify("ServerNoticesTarget", this, SLOT(messageRedirectionChanged()));
+    defaultSettings.notify("ErrorMsgsTarget", this, SLOT(messageRedirectionChanged()));
+    messageRedirectionChanged();
 
-  BufferSettings mySettings(idString());
-  if(mySettings.hasFilter())
-    newFilter = mySettings.messageFilter();
+    _messageTypeFilter = defaultSettings.messageFilter();
+    defaultSettings.notify("MessageTypeFilter", this, SLOT(messageTypeFilterChanged()));
 
-  if(_messageTypeFilter != newFilter) {
-    _messageTypeFilter = newFilter;
-    _filteredQuitMsgs.clear();
-    invalidateFilter();
-  }
+    BufferSettings mySettings(idString());
+    if (mySettings.hasFilter())
+        _messageTypeFilter = mySettings.messageFilter();
+    mySettings.notify("MessageTypeFilter", this, SLOT(messageTypeFilterChanged()));
+    mySettings.notify("hasMessageTypeFilter", this, SLOT(messageTypeFilterChanged()));
 }
 
-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;
-  }
+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();
+    }
+}
 
-  if(_errorMsgsTarget != bufferSettings.errorMsgsTarget()) {
-    _errorMsgsTarget = bufferSettings.errorMsgsTarget();
-    changed = true;
-  }
 
-  if(changed)
-    invalidateFilter();
-}
+void MessageFilter::messageRedirectionChanged()
+{
+    BufferSettings bufferSettings;
+    bool changed = false;
 
-QString MessageFilter::idString() const {
-  if(_validBuffers.isEmpty())
-    return "*";
+    if (_userNoticesTarget != bufferSettings.userNoticesTarget()) {
+        _userNoticesTarget = bufferSettings.userNoticesTarget();
+        changed = true;
+    }
 
-  QList<BufferId> bufferIds = _validBuffers.toList();
-  qSort(bufferIds);
+    if (_serverNoticesTarget != bufferSettings.serverNoticesTarget()) {
+        _serverNoticesTarget = bufferSettings.serverNoticesTarget();
+        changed = true;
+    }
 
-  QStringList bufferIdStrings;
-  foreach(BufferId id, bufferIds)
-    bufferIdStrings << QString::number(id.toInt());
+    if (_errorMsgsTarget != bufferSettings.errorMsgsTarget()) {
+        _errorMsgsTarget = bufferSettings.errorMsgsTarget();
+        changed = true;
+    }
 
-  return bufferIdStrings.join("|");
+    if (changed)
+        invalidateFilter();
 }
 
-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 bufferId = sourceModel()->data(sourceIdx, MessageModel::BufferIdRole).value<BufferId>();
-  if(!bufferId.isValid()) {
-    return true;
-  }
-
-  MsgId msgId = sourceModel()->data(sourceIdx, MessageModel::MsgIdRole).value<MsgId>();
-  Message::Flags flags = (Message::Flags)sourceModel()->data(sourceIdx, MessageModel::FlagsRole).toInt();
-
-  NetworkId myNetworkId = networkId();
-  NetworkId msgNetworkId = Client::networkModel()->networkId(bufferId);
-  if(myNetworkId != msgNetworkId)
-    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;
+QString MessageFilter::idString() const
+{
+    if (_validBuffers.isEmpty())
+        return "*";
 
-    if(redirectionTarget & BufferSettings::CurrentBuffer && !(flags & Message::Backlog)) {
-      BufferId redirectedTo = sourceModel()->data(sourceIdx, MessageModel::RedirectedToRole).value<BufferId>();
-      if(!redirectedTo.isValid()) {
-	BufferId redirectedTo = Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>();
-	if(redirectedTo.isValid())
-	  sourceModel()->setData(sourceIdx, QVariant::fromValue<BufferId>(redirectedTo), MessageModel::RedirectedToRole);
-      }
+    QList<BufferId> bufferIds = _validBuffers.toList();
+    qSort(bufferIds);
 
-      if(_validBuffers.contains(redirectedTo))
-	return true;
-    }
+    QStringList bufferIdStrings;
+    foreach(BufferId id, bufferIds)
+    bufferIdStrings << QString::number(id.toInt());
 
-    if(redirectionTarget & BufferSettings::StatusBuffer) {
-      QSet<BufferId>::const_iterator idIter = _validBuffers.constBegin();
-      while(idIter != _validBuffers.constEnd()) {
-	if(Client::networkModel()->bufferType(*idIter) == BufferInfo::StatusBuffer)
-	  return true;
-	idIter++;
-      }
-    }
+    return bufferIdStrings.join("|");
+}
 
-    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();
 
-  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;
+    // apply message type filter
+    if (_messageTypeFilter & messageType)
+        return false;
 
-    if(myNetworkId != msgNetworkId)
-      return false;
+    if (_validBuffers.isEmpty())
+        return true;
 
-    uint messageTimestamp = sourceModel()->data(sourceIdx, MessageModel::TimestampRole).value<QDateTime>().toTime_t();
-    QString quiter = sourceModel()->data(sourceIdx, Qt::DisplayRole).toString().section(' ', 0, 0, QString::SectionSkipEmpty).toLower();
-    if(quiter != bufferName().toLower())
-      return false;
+    BufferId bufferId = sourceIdx.data(MessageModel::BufferIdRole).value<BufferId>();
+    if (!bufferId.isValid()) {
+        return true;
+    }
 
-    if(_filteredQuitMsgs.contains(quiter, messageTimestamp))
-      return false;
+    // MsgId msgId = sourceIdx.data(MessageModel::MsgIdRole).value<MsgId>();
+    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<Message>(), 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<BufferId>();
+            if (!redirectedTo.isValid()) {
+                BufferId redirectedTo = Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>();
+                if (redirectedTo.isValid())
+                    sourceModel()->setData(sourceIdx, QVariant::fromValue<BufferId>(redirectedTo), MessageModel::RedirectedToRole);
+            }
+
+            if (_validBuffers.contains(redirectedTo))
+                return true;
+        }
+
+        if (redirectionTarget & BufferSettings::StatusBuffer) {
+            QSet<BufferId>::const_iterator idIter = _validBuffers.constBegin();
+            while (idIter != _validBuffers.constEnd()) {
+                if (Client::networkModel()->bufferType(*idIter) == BufferInfo::StatusBuffer)
+                    return true;
+                idIter++;
+            }
+        }
+
+        return false;
+    }
 
-    MessageFilter *that = const_cast<MessageFilter *>(this);
-    that->_filteredQuitMsgs.insert(quiter,  messageTimestamp);
-    return true;
-  }
+    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<QDateTime>().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<MessageFilter *>(this);
+        that->_filteredQuitMsgs.insert(quiter,  messageTimestamp);
+        return true;
+    }
 }
 
-void MessageFilter::requestBacklog() {
-  QSet<BufferId>::const_iterator bufferIdIter = _validBuffers.constBegin();
-  while(bufferIdIter != _validBuffers.constEnd()) {
-    Client::messageModel()->requestBacklog(*bufferIdIter);
-    bufferIdIter++;
-  }
+
+void MessageFilter::requestBacklog()
+{
+    QSet<BufferId>::const_iterator bufferIdIter = _validBuffers.constBegin();
+    while (bufferIdIter != _validBuffers.constEnd()) {
+        Client::messageModel()->requestBacklog(*bufferIdIter);
+        bufferIdIter++;
+    }
 }