From 85a21a6781b2d4c278cfdc1c21cf6aa59d0d123e Mon Sep 17 00:00:00 2001
From: Krille <christian-pauly@posteo.de>
Date: Wed, 31 May 2023 14:59:49 +0200
Subject: [PATCH] fix: Do not store global profiles in room states as members

---
 lib/src/room.dart | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/src/room.dart b/lib/src/room.dart
index e1acbb5d..16977858 100644
--- a/lib/src/room.dart
+++ b/lib/src/room.dart
@@ -1598,7 +1598,13 @@ class Room {
     if (user != null) {
       return user.asUser;
     } else {
-      if (mxID.isValidMatrixId) requestUser(mxID, ignoreErrors: true);
+      if (mxID.isValidMatrixId) {
+        requestUser(
+          mxID,
+          ignoreErrors: true,
+          requestProfile: false,
+        );
+      }
       return User(mxID, room: this);
     }
   }
@@ -1652,10 +1658,14 @@ class Room {
     if (resp == null && requestProfile) {
       try {
         final profile = await client.getUserProfile(mxID);
-        resp = {
-          'displayname': profile.displayname,
-          'avatar_url': profile.avatarUrl.toString(),
-        };
+        _requestingMatrixIds.remove(mxID);
+        return User(
+          mxID,
+          displayName: profile.displayname,
+          avatarUrl: profile.avatarUrl?.toString(),
+          membership: Membership.leave.name,
+          room: this,
+        );
       } catch (e, s) {
         _requestingMatrixIds.remove(mxID);
         if (!ignoreErrors) {