/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 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 "awaylogfilter.h"
+#include "clientignorelistmanager.h"
AwayLogFilter::AwayLogFilter(MessageModel *model, QObject *parent)
: ChatMonitorFilter(model, parent)
QModelIndex source_index = sourceModel()->index(sourceRow, 0);
Message::Flags flags = (Message::Flags)sourceModel()->data(source_index, MessageModel::FlagsRole).toInt();
- if (!(flags & Message::Backlog && flags & Message::Highlight))
+ // Only show highlights from the backlog
+ if (!(flags & Message::Backlog && flags & Message::Highlight)) {
return false;
+ }
+ // do not use invalid buffers
BufferId bufferId = sourceModel()->data(source_index, MessageModel::BufferIdRole).value<BufferId>();
if (!bufferId.isValid()) {
return false;
}
- if (Client::networkModel()->lastSeenMsgId(bufferId) >= sourceModel()->data(source_index, MessageModel::MsgIdRole).value<MsgId>())
+ // only show messages that were sent after the user detached
+ if (Client::networkModel()->lastSeenMsgId(bufferId) >= sourceModel()->data(source_index, MessageModel::MsgIdRole).value<MsgId>()) {
return false;
+ }
+
+ // ignorelist handling
+ // only match if message is not flagged as server msg
+ if (!(flags & Message::ServerMsg) && Client::ignoreListManager()
+ && Client::ignoreListManager()->match(source_index.data(MessageModel::MessageRole).value<Message>(), Client::networkModel()->networkName(bufferId))) {
+ return false;
+ }
return true;
}