From 52d6b59cc18025d33320f1f053a68fa4c4c84594 Mon Sep 17 00:00:00 2001
From: Reza <mohammad.r.moradi@gmail.com>
Date: Wed, 7 Dec 2022 16:48:28 +0100
Subject: [PATCH] fix: leaved direct chat name

---
 lib/src/room.dart                             | 53 +++++++++++++++++--
 .../utils/matrix_default_localizations.dart   |  4 ++
 lib/src/utils/matrix_localizations.dart       |  2 +
 3 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/lib/src/room.dart b/lib/src/room.dart
index 06255c12..ce02e706 100644
--- a/lib/src/room.dart
+++ b/lib/src/room.dart
@@ -59,6 +59,7 @@ const String fileSendingStatusKey =
     'com.famedly.famedlysdk.file_sending_status';
 
 const String sortOrderKey = 'com.famedly.famedlysdk.sort_order';
+const String emptyRoomName = 'Empty chat';
 
 /// Represents a Matrix room.
 class Room {
@@ -240,6 +241,20 @@ class Room {
       return i18n.groupWith(displayname);
     }
     if (displayname.isNotEmpty) {
+      if (directChatMatrixID != null) {
+        final displayName =
+            unsafeGetUserFromMemoryOrFallback(directChatMatrixID!)
+                .calcDisplayname();
+        final dmPartnerMembership =
+            getState(EventTypes.RoomMember, directChatMatrixID!)
+                ?.asUser
+                .membership;
+        if (dmPartnerMembership == null ||
+            dmPartnerMembership == Membership.leave) {
+          return i18n.wasDirectChatDisplayName(displayName);
+        }
+        return displayName;
+      }
       return displayname;
     }
     return i18n.emptyChat;
@@ -406,19 +421,35 @@ class Room {
     if (canonicalAlias != null && canonicalAlias.isNotEmpty) {
       return canonicalAlias;
     }
-
     final heroes = summary.mHeroes;
     if (heroes != null && heroes.isNotEmpty) {
-      return heroes
+      final result = heroes
           .where((hero) => hero.isNotEmpty)
           .map((hero) =>
               unsafeGetUserFromMemoryOrFallback(hero).calcDisplayname())
           .join(', ');
+      if (directChatMatrixID != null) {
+        final dmPartnerMembership = getState(
+          EventTypes.RoomMember,
+          directChatMatrixID!,
+        )?.asUser.membership;
+        if (dmPartnerMembership == null ||
+            dmPartnerMembership == Membership.leave) {
+          return leavedDirectChatName(result);
+        }
+        return result;
+      } else {
+        return result;
+      }
     }
     if (isDirectChat) {
       final user = directChatMatrixID;
       if (user != null) {
-        return unsafeGetUserFromMemoryOrFallback(user).calcDisplayname();
+        final displayName =
+            unsafeGetUserFromMemoryOrFallback(user).calcDisplayname();
+        return membership == Membership.leave
+            ? leavedDirectChatName(displayName)
+            : displayName;
       }
     }
     if (membership == Membership.invite) {
@@ -427,7 +458,20 @@ class Room {
           .calcDisplayname();
       if (sender != null) return sender;
     }
-    return 'Empty chat';
+    if (membership == Membership.leave) {
+      final invitation = getState(EventTypes.RoomMember, client.userID!);
+      if (invitation != null && invitation.unsigned?['prev_sender'] != null) {
+        final name = unsafeGetUserFromMemoryOrFallback(
+                invitation.unsigned?['prev_sender'])
+            .calcDisplayname();
+        return leavedDirectChatName(name);
+      }
+    }
+    return emptyRoomName;
+  }
+
+  String leavedDirectChatName(String prevName) {
+    return '$emptyRoomName (was $prevName)';
   }
 
   /// When the last message received.
@@ -1080,7 +1124,6 @@ class Room {
   /// Call the Matrix API to leave this room. If this room is set as a direct
   /// chat, this will be removed too.
   Future<void> leave() async {
-    if (directChatMatrixID != '') await removeFromDirectChat();
     try {
       await client.leaveRoom(id);
     } on MatrixException catch (exception) {
diff --git a/lib/src/utils/matrix_default_localizations.dart b/lib/src/utils/matrix_default_localizations.dart
index 28736a41..328c3db6 100644
--- a/lib/src/utils/matrix_default_localizations.dart
+++ b/lib/src/utils/matrix_default_localizations.dart
@@ -265,4 +265,8 @@ class MatrixDefaultLocalizations extends MatrixLocalizations {
 
   @override
   String youUnbannedUser(String targetName) => 'You unbanned $targetName';
+
+  @override
+  String wasDirectChatDisplayName(String oldDisplayName) =>
+      'Empty chat (was $oldDisplayName)';
 }
diff --git a/lib/src/utils/matrix_localizations.dart b/lib/src/utils/matrix_localizations.dart
index d952c38a..e0056117 100644
--- a/lib/src/utils/matrix_localizations.dart
+++ b/lib/src/utils/matrix_localizations.dart
@@ -157,6 +157,8 @@ abstract class MatrixLocalizations {
   String answeredTheCall(String senderName);
 
   String sentCallInformations(String senderName);
+
+  String wasDirectChatDisplayName(String oldDisplayName);
 }
 
 extension HistoryVisibilityDisplayString on HistoryVisibility {