X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatmonitorfilter.cpp;h=6bec8c3d21b41f714243e147a4405b6fb9f15f20;hb=eaba93b703ba5bca4edf09f4c076a00b529115cd;hp=d11378d1ff971e29433a77704f9c4dde0b741694;hpb=9d52e49424afb60c2f28073051c1dbf25f47adec;p=quassel.git

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index d11378d1..6bec8c3d 100644
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -26,20 +26,22 @@
 #include "networkmodel.h"
 
 ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent)
-  : MessageFilter(model, QList<BufferId>(), parent),
-    _initTime(QDateTime::currentDateTime())
+  : MessageFilter(model, parent)
 {
 }
 
 bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const {
   Q_UNUSED(sourceParent)
-  Message::Type type = (Message::Type)sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::TypeRole).toInt();
+
   Message::Flags flags = (Message::Flags)sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::FlagsRole).toInt();
-  if(!((type & (Message::Plain | Message::Notice | Message::Action)) || flags & Message::Self))
+  if(flags & Message::Backlog || flags & Message::Self)
+    return false;
+
+  Message::Type type = (Message::Type)sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::TypeRole).toInt();
+  if(!(type & (Message::Plain | Message::Notice | Message::Action)))
     return false;
 
-  QDateTime msgTime = sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::TimestampRole).toDateTime();
-  return msgTime > _initTime;
+  return true;
 }
 
 // override this to inject display of network and channel
@@ -48,13 +50,15 @@ QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const {
     return MessageFilter::data(index, role);
 
   int showFields_ = showFields();
-    
+
   BufferId bufid = data(index, ChatLineModel::BufferIdRole).value<BufferId>();
   if(!bufid.isValid()) {
     qDebug() << "ChatMonitorFilter::data(): chatline belongs to an invalid buffer!";
     return QVariant();
   }
-  
+
+  QModelIndex source_index = mapToSource(index);
+
   QStringList fields;
   if(showFields_ & NetworkField) {
     fields << Client::networkModel()->networkName(bufid);
@@ -62,8 +66,14 @@ QVariant ChatMonitorFilter::data(const QModelIndex &index, int role) const {
   if(showFields_ & BufferField) {
     fields << Client::networkModel()->bufferName(bufid);
   }
-  fields << MessageFilter::data(index, role).toString().mid(1);
-  return QString("<%1").arg(fields.join(":"));
+
+  Message::Type messageType = (Message::Type)sourceModel()->data(source_index, MessageModel::TypeRole).toInt();
+  if(messageType & (Message::Plain | Message::Notice)) {
+    QString sender = MessageFilter::data(index, role).toString();
+    // we have to strip leading and traling < / >
+    fields << sender.mid(1, sender.count() - 2);
+  }
+  return QString("<%1>").arg(fields.join(":"));
 }
 
 void ChatMonitorFilter::addShowField(int field) {