X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagefilter.cpp;h=f7a1d810ca108c9af0e4d9e3f060d87bb98b0d7e;hp=238c7d57f1c5fdb5106b6f1d48b350e9ea595a5b;hb=1d87ccad2d5ed6c93523f5a65756aed639c233c5;hpb=402f690fb8ca07adc2c063ba550d7e8fc0159ada

diff --git a/src/client/messagefilter.cpp b/src/client/messagefilter.cpp
index 238c7d57..f7a1d810 100644
--- a/src/client/messagefilter.cpp
+++ b/src/client/messagefilter.cpp
@@ -22,13 +22,13 @@
 
 #include "buffersettings.h"
 #include "client.h"
+#include "buffermodel.h"
 #include "messagemodel.h"
 #include "networkmodel.h"
 
 MessageFilter::MessageFilter(QAbstractItemModel *source, QObject *parent)
   : QSortFilterProxyModel(parent),
-    _messageTypeFilter(0),
-    _bufferType(BufferInfo::InvalidBuffer)
+    _messageTypeFilter(0)
 {
   init();
   setSourceModel(source);
@@ -37,8 +37,7 @@ MessageFilter::MessageFilter(QAbstractItemModel *source, QObject *parent)
 MessageFilter::MessageFilter(MessageModel *source, const QList<BufferId> &buffers, QObject *parent)
   : QSortFilterProxyModel(parent),
     _validBuffers(buffers.toSet()),
-    _messageTypeFilter(0),
-    _bufferType(BufferInfo::InvalidBuffer)
+    _messageTypeFilter(0)
 {
   init();
   setSourceModel(source);
@@ -48,6 +47,18 @@ void MessageFilter::init() {
   BufferSettings defaultSettings;
   _messageTypeFilter = defaultSettings.messageFilter();
   defaultSettings.notify("MessageTypeFilter", this, SLOT(messageTypeFilterChanged()));
+  defaultSettings.notify("UserNoticesInDefaultBuffer", this, SLOT(messageRedirectionChanged()));
+  defaultSettings.notify("UserNoticesInStatusBuffer", this, SLOT(messageRedirectionChanged()));
+  defaultSettings.notify("UserNoticesInCurrentBuffer", this, SLOT(messageRedirectionChanged()));
+
+  defaultSettings.notify("serverNoticesInDefaultBuffer", this, SLOT(messageRedirectionChanged()));
+  defaultSettings.notify("serverNoticesInStatusBuffer", this, SLOT(messageRedirectionChanged()));
+  defaultSettings.notify("serverNoticesInCurrentBuffer", this, SLOT(messageRedirectionChanged()));
+
+  defaultSettings.notify("ErrorMsgsInDefaultBuffer", this, SLOT(messageRedirectionChanged()));
+  defaultSettings.notify("ErrorMsgsInStatusBuffer", this, SLOT(messageRedirectionChanged()));
+  defaultSettings.notify("ErrorMsgsInCurrentBuffer", this, SLOT(messageRedirectionChanged()));
+  messageRedirectionChanged();
 
   BufferSettings mySettings(idString());
   if(mySettings.hasFilter())
@@ -71,13 +82,30 @@ void MessageFilter::messageTypeFilterChanged() {
   }
 }
 
+void MessageFilter::messageRedirectionChanged() {
+  BufferSettings bufferSettings;
+  _userNoticesInDefaultBuffer = bufferSettings.value("UserNoticesInDefaultBuffer", QVariant(true)).toBool();
+  _userNoticesInStatusBuffer = bufferSettings.value("UserNoticesInStatusBuffer", QVariant(false)).toBool();
+  _userNoticesInCurrentBuffer = bufferSettings.value("UserNoticesInCurrentBuffer", QVariant(false)).toBool();
+
+  _serverNoticesInDefaultBuffer = bufferSettings.value("ServerNoticesInDefaultBuffer", QVariant(false)).toBool();
+  _serverNoticesInStatusBuffer = bufferSettings.value("ServerNoticesInStatusBuffer", QVariant(true)).toBool();
+  _serverNoticesInCurrentBuffer = bufferSettings.value("ServerNoticesInCurrentBuffer", QVariant(false)).toBool();
+
+  _errorMsgsInDefaultBuffer = bufferSettings.value("ErrorMsgsInDefaultBuffer", QVariant(true)).toBool();
+  _errorMsgsInStatusBuffer = bufferSettings.value("ErrorMsgsInStatusBuffer", QVariant(false)).toBool();
+  _errorMsgsInCurrentBuffer = bufferSettings.value("ErrorMsgsInCurrentBuffer", QVariant(false)).toBool();
+
+  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());
@@ -97,12 +125,80 @@ bool MessageFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourcePar
   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;
   }
 
-  if(_validBuffers.contains(id)) {
+  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;
+  bool inDefaultBuffer;
+  bool inStatusBuffer;
+  bool inCurrentBuffer;
+
+  switch(messageType) {
+  case Message::Notice:
+    if(Client::networkModel()->bufferType(bufferId) != BufferInfo::ChannelBuffer) {
+      redirect = true;
+      if(flags & Message::ServerMsg) {
+	// server notice
+	inDefaultBuffer = _serverNoticesInDefaultBuffer;
+	inStatusBuffer = _serverNoticesInStatusBuffer;
+	inCurrentBuffer = _serverNoticesInCurrentBuffer;
+      } else {
+	inDefaultBuffer = _userNoticesInDefaultBuffer;
+	inStatusBuffer = _userNoticesInStatusBuffer;
+	inCurrentBuffer = _userNoticesInCurrentBuffer;
+      }
+    }
+    break;
+  case Message::Error:
+    redirect = true;
+    inDefaultBuffer = _errorMsgsInDefaultBuffer;
+    inStatusBuffer = _errorMsgsInStatusBuffer;
+    inCurrentBuffer = _errorMsgsInCurrentBuffer;
+    break;
+  default:
+    break;
+  }
+
+  if(redirect) {
+    if(_redirectedMsgs.contains(msgId))
+      return true;
+
+    if(inDefaultBuffer && _validBuffers.contains(bufferId))
+      return true;
+
+    if(inCurrentBuffer && !(flags & Message::Backlog) && _validBuffers.contains(Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>())) {
+      BufferId redirectedTo = sourceModel()->data(sourceIdx, MessageModel::RedirectedToRole).value<BufferId>();
+      if(!redirectedTo.isValid()) {
+	sourceModel()->setData(sourceIdx, QVariant::fromValue<BufferId>(singleBufferId()), MessageModel::RedirectedToRole);
+	_redirectedMsgs << msgId;
+	return true;
+      } else if(_validBuffers.contains(redirectedTo)) {
+	return true;
+      }
+    }
+
+    QSet<BufferId>::const_iterator idIter = _validBuffers.constBegin();
+    while(idIter != _validBuffers.constEnd()) {
+      if(inStatusBuffer && Client::networkModel()->bufferType(*idIter) == BufferInfo::StatusBuffer)
+	return true;
+      idIter++;
+    }
+
+    return false;
+  }
+
+
+  if(_validBuffers.contains(bufferId)) {
     return true;
   } else {
     // show Quit messages in Query buffers:
@@ -111,18 +207,20 @@ bool MessageFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourcePar
     if(!(messageType & Message::Quit))
       return false;
 
+    if(myNetworkId != msgNetworkId)
+      return false;
+
     uint messageTimestamp = sourceModel()->data(sourceIdx, MessageModel::TimestampRole).value<QDateTime>().toTime_t();
-    if(_filteredQuitMsgs.contains(messageTimestamp))
+    QString quiter = sourceModel()->data(sourceIdx, Qt::DisplayRole).toString().section(' ', 0, 0, QString::SectionSkipEmpty).toLower();
+    if(quiter != bufferName().toLower())
       return false;
 
-    QString quiter = sourceModel()->data(sourceIdx, Qt::DisplayRole).toString().section(' ', 0, 0, QString::SectionSkipEmpty);
-    if(quiter.toLower() == bufferName().toLower()) {
-      MessageFilter *that = const_cast<MessageFilter *>(this);
-      that->_filteredQuitMsgs << messageTimestamp;
-      return true;
-    } else {
+    if(_filteredQuitMsgs.contains(quiter, messageTimestamp))
       return false;
-    }
+
+    MessageFilter *that = const_cast<MessageFilter *>(this);
+    that->_filteredQuitMsgs.insert(quiter,  messageTimestamp);
+    return true;
   }
 }
 
@@ -133,21 +231,3 @@ void MessageFilter::requestBacklog() {
     bufferIdIter++;
   }
 }
-
-const QString &MessageFilter::bufferName() const {
-  if(_bufferName.isEmpty()) {
-    MessageFilter *that = const_cast<MessageFilter *>(this);
-    that->_bufferName = Client::networkModel()->bufferName(singleBufferId());
-    return that->_bufferName;
-  }
-  return _bufferName;
-}
-
-BufferInfo::Type MessageFilter::bufferType() const {
-  if(_bufferType == BufferInfo::InvalidBuffer) {
-    MessageFilter *that = const_cast<MessageFilter *>(this);
-    that->_bufferType = Client::networkModel()->bufferType(singleBufferId());
-    return that->_bufferType;
-  }
-  return _bufferType;
-}