#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
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);
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) {