From 9becc392ddadd1418207dc9edda3ab6fe5cff815 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 19 Oct 2021 16:17:09 +0100
Subject: [PATCH] For space invite previews, use room summary API to get the
 right member count (#6982)

---
 res/css/structures/_SpaceRoomView.scss      |  5 ++--
 src/components/structures/SpaceRoomView.tsx | 30 +++++++++++++++++----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
index e116885047..e6394525c5 100644
--- a/res/css/structures/_SpaceRoomView.scss
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -511,10 +511,11 @@ $SpaceRoomViewInnerWidth: 428px;
         mask-image: url("$(res)/img/element-icons/lock.svg");
     }
 
-    .mx_AccessibleButton_kind_link {
+    .mx_SpaceRoomView_info_memberCount {
         color: inherit;
         position: relative;
-        padding-left: 16px;
+        padding: 0 0 0 16px;
+        font-size: $font-15px;
 
         &::before {
             content: "·"; // visual separator
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index dd12f76aac..db8f542b17 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -127,8 +127,17 @@ const useMyRoomMembership = (room: Room) => {
     return membership;
 };
 
-const SpaceInfo = ({ space }) => {
+const SpaceInfo = ({ space }: { space: Room }) => {
+    const summary = useAsyncMemo(() => {
+        if (space.getMyMembership() !== "invite") return;
+        try {
+            return space.client.getRoomSummary(space.roomId);
+        } catch (e) {
+            return null;
+        }
+    }, [space]);
     const joinRule = useRoomState(space, state => state.getJoinRule());
+    const membership = useMyRoomMembership(space);
 
     let visibilitySection;
     if (joinRule === "public") {
@@ -141,12 +150,18 @@ const SpaceInfo = ({ space }) => {
         </span>;
     }
 
-    return <div className="mx_SpaceRoomView_info">
-        { visibilitySection }
-        { joinRule === "public" && <RoomMemberCount room={space}>
+    let memberSection;
+    if (membership === "invite" && summary) {
+        // Don't trust local state and instead use the summary API
+        memberSection = <span className="mx_SpaceRoomView_info_memberCount">
+            { _t("%(count)s members", { count: summary.num_joined_members }) }
+        </span>;
+    } else if (summary === null) {
+        memberSection = <RoomMemberCount room={space}>
             { (count) => count > 0 ? (
                 <AccessibleButton
                     kind="link"
+                    className="mx_SpaceRoomView_info_memberCount"
                     onClick={() => {
                         defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
                             action: Action.SetRightPanelPhase,
@@ -158,7 +173,12 @@ const SpaceInfo = ({ space }) => {
                     { _t("%(count)s members", { count }) }
                 </AccessibleButton>
             ) : null }
-        </RoomMemberCount> }
+        </RoomMemberCount>;
+    }
+
+    return <div className="mx_SpaceRoomView_info">
+        { visibilitySection }
+        { memberSection }
     </div>;
 };