From 857cf0d75cea27237ba277dad240bf200158f591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <zecakeh@tedomum.fr>
Date: Fri, 4 Oct 2024 17:27:32 +0200
Subject: [PATCH] timeline: Ignore room member events where the content has not
 changed

---
 src/session/model/room/timeline/mod.rs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/session/model/room/timeline/mod.rs b/src/session/model/room/timeline/mod.rs
index 6d119844..1307cea0 100644
--- a/src/session/model/room/timeline/mod.rs
+++ b/src/session/model/room/timeline/mod.rs
@@ -20,7 +20,7 @@ use matrix_sdk_ui::{
 use ruma::{
     events::{
         room::message::MessageType, AnySyncMessageLikeEvent, AnySyncStateEvent,
-        AnySyncTimelineEvent, SyncMessageLikeEvent,
+        AnySyncTimelineEvent, SyncMessageLikeEvent, SyncStateEvent,
     },
     OwnedEventId, UserId,
 };
@@ -223,6 +223,22 @@ mod imp {
                                 ) => true,
                                 _ => false,
                             },
+                            AnySyncTimelineEvent::State(AnySyncStateEvent::RoomMember(
+                                SyncStateEvent::Original(member_event),
+                            )) => {
+                                // Do not show member events if the content that we support has not
+                                // changed. This avoids duplicate "user has joined" events in the
+                                // timeline which are confusing and wrong.
+                                !member_event.unsigned.prev_content.as_ref().is_some_and(
+                                    |prev_content| {
+                                        prev_content.membership == member_event.content.membership
+                                            && prev_content.displayname
+                                                == member_event.content.displayname
+                                            && prev_content.avatar_url
+                                                == member_event.content.avatar_url
+                                    },
+                                )
+                            }
                             AnySyncTimelineEvent::State(state) => matches!(
                                 state,
                                 AnySyncStateEvent::RoomMember(_)