From d20133340975e073ba5e67f434bf74227d6f0819 Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Mon, 2 Sep 2024 21:15:27 +0200
Subject: [PATCH] Don't consider events that change membership to be renames

Otherwise, the "Show rename events" flag affects the visibility of events where we don't expect it
---
 src/eventhandler.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/eventhandler.cpp b/src/eventhandler.cpp
index 70e610cec..5019ed90e 100644
--- a/src/eventhandler.cpp
+++ b/src/eventhandler.cpp
@@ -154,7 +154,8 @@ bool EventHandler::isHidden(const NeoChatRoom *room, const Quotient::RoomEvent *
     if (auto roomMemberEvent = eventCast<const RoomMemberEvent>(event)) {
         if ((roomMemberEvent->isJoin() || roomMemberEvent->isLeave()) && !NeoChatConfig::self()->showLeaveJoinEvent()) {
             return true;
-        } else if (roomMemberEvent->isRename() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave() && !NeoChatConfig::self()->showRename()) {
+        } else if (roomMemberEvent->isRename() && roomMemberEvent->prevContent() && roomMemberEvent->prevContent()->membership == roomMemberEvent->membership()
+                   && !NeoChatConfig::self()->showRename()) {
             return true;
         } else if (roomMemberEvent->isAvatarUpdate() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave()
                    && !NeoChatConfig::self()->showAvatarUpdate()) {