X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagefilter.cpp;h=c9c44d163f1bf5bd6c9cc49772e7b67ae73d35bc;hp=a764a32f23c0f4f78fea3b9e93db125e90bb2f02;hb=46d75f41de7c1aaee605c096da28d4b0d8abf138;hpb=fb011e52bc6613198a65e037f0752f6361339aeb

diff --git a/src/client/messagefilter.cpp b/src/client/messagefilter.cpp
index a764a32f..c9c44d16 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-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,7 +22,9 @@
 
 #include "buffersettings.h"
 #include "client.h"
+#include "buffermodel.h"
 #include "messagemodel.h"
+#include "networkmodel.h"
 
 MessageFilter::MessageFilter(QAbstractItemModel *source, QObject *parent)
   : QSortFilterProxyModel(parent),
@@ -42,7 +44,14 @@ MessageFilter::MessageFilter(MessageModel *source, const QList<BufferId> &buffer
 }
 
 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()));
 
@@ -50,11 +59,12 @@ void MessageFilter::init() {
   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();
+  BufferSettings defaultSettings;
   newFilter = BufferSettings().messageFilter();
 
   BufferSettings mySettings(idString());
@@ -63,17 +73,41 @@ void MessageFilter::messageTypeFilterChanged() {
 
   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(changed)
+    invalidateFilter();
+}
+
 QString MessageFilter::idString() const {
   if(_validBuffers.isEmpty())
     return "*";
 
-  QList<BufferId> bufferIds = _validBuffers.toList();;
+  QList<BufferId> bufferIds = _validBuffers.toList();
   qSort(bufferIds);
-  
+
   QStringList bufferIdStrings;
   foreach(BufferId id, bufferIds)
     bufferIdStrings << QString::number(id.toInt());
@@ -83,18 +117,105 @@ QString MessageFilter::idString() const {
 
 bool MessageFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const {
   Q_UNUSED(sourceParent);
-  QModelIndex sourceIdx = sourceModel()->index(sourceRow, 0);
-  if(_messageTypeFilter & sourceModel()->data(sourceIdx, MessageModel::TypeRole).toInt())
+  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<BufferId>();
-  if(!id.isValid()) {
+  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;
+
+  bool redirect = false;
+  int redirectionTarget = 0;
+  switch(messageType) {
+  case Message::Notice:
+    if(Client::networkModel()->bufferType(bufferId) != BufferInfo::ChannelBuffer) {
+      redirect = true;
+      if(flags & Message::ServerMsg) {
+	// server notice
+	redirectionTarget = _serverNoticesTarget;
+      } else {
+	redirectionTarget = _userNoticesTarget;
+      }
+    }
+    break;
+  case Message::Error:
+    redirect = true;
+    redirectionTarget = _errorMsgsTarget;
+    break;
+  default:
+    break;
+  }
+
+  if(redirect) {
+
+    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;
+  }
+
+
+  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;
   }
-  return _validBuffers.contains(id);
 }
 
 void MessageFilter::requestBacklog() {