ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the dependency on NeoChatConfig from EventHandler

Browse Source
This commit is contained in:
James Graham
2025-04-06 11:02:29 +01:00
parent 16daca09e8
commit 0403ecbd70
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/models/messagemodel.cpp
View File

@@ -7,6 +7,7 @@
#include "threadmodel.h"
#include <Quotient/events/encryptedevent.h>
#include <Quotient/events/roommemberevent.h>
#include <Quotient/events/roommessageevent.h>
#include <Quotient/events/stickerevent.h>
#if Quotient_VERSION_MINOR > 9 || (Quotient_VERSION_MINOR == 9 && Quotient_VERSION_PATCH > 1)
@@ -175,7 +176,22 @@ QVariant MessageModel::data(const QModelIndex &idx, int role) const
return pendingIt->deliveryStatus();
}
if (EventHandler::isHidden(m_room, &event.value().get())) {
if (EventHandler::isHidden(m_room, &event.value().get(), [](const RoomEvent *event) -> bool {
if (event->isStateEvent() && !NeoChatConfig::showStateEvent()) {
return true;
}
if (auto roomMemberEvent = eventCast<const RoomMemberEvent>(event)) {
if ((roomMemberEvent->isJoin() || roomMemberEvent->isLeave()) && !NeoChatConfig::showLeaveJoinEvent()) {
return true;
} else if (roomMemberEvent->isRename() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave() && !NeoChatConfig::showRename()) {
return true;
} else if (roomMemberEvent->isAvatarUpdate() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave()
&& !NeoChatConfig::showAvatarUpdate()) {
return true;
}
}
return false;
})) {
return EventStatus::Hidden;
}