From 4f8609421c71262e2ca1238860d8323f1a43dd4c Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Fri, 31 Oct 2025 12:10:16 -0700
Subject: [PATCH] Fix membership status

---
 src/app/components/RoomNameWithImage.svelte | 3 ---
 src/app/core/state.ts                       | 4 ++--
 src/routes/spaces/[relay]/[h]/+page.svelte  | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/app/components/RoomNameWithImage.svelte b/src/app/components/RoomNameWithImage.svelte
index a8676285..5753d95f 100644
--- a/src/app/components/RoomNameWithImage.svelte
+++ b/src/app/components/RoomNameWithImage.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import Lock from "@assets/icons/lock-keyhole.svg?dataurl"
   import Hashtag from "@assets/icons/hashtag.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import RoomName from "@app/components/RoomName.svelte"
@@ -22,8 +21,6 @@
   {:else}
     <img alt="Room icon" {src} class="h-6 w-6 rounded-lg" />
   {/if}
-{:else if $room?.isClosed || $room?.isPrivate}
-  <Icon icon={Lock} />
 {:else}
   <Icon icon={Hashtag} />
 {/if}
diff --git a/src/app/core/state.ts b/src/app/core/state.ts
index e1abff83..c15a82aa 100644
--- a/src/app/core/state.ts
+++ b/src/app/core/state.ts
@@ -826,7 +826,7 @@ export const deriveUserSpaceMembershipStatus = (url: string) =>
       const isMember = $members.includes($pubkey)
 
       for (const event of $events) {
-        if (event.pubkey !== $pubkey) {
+        if (!getPubkeyTagValues(event.tags).includes($pubkey!)) {
           continue
         }
 
@@ -854,7 +854,7 @@ export const deriveUserRoomMembershipStatus = (url: string, h: string) =>
       const isMember = $members.includes($pubkey)
 
       for (const event of $events) {
-        if (event.pubkey !== $pubkey) {
+        if (!getPubkeyTagValues(event.tags).includes($pubkey!)) {
           continue
         }
 
diff --git a/src/routes/spaces/[relay]/[h]/+page.svelte b/src/routes/spaces/[relay]/[h]/+page.svelte
index a7483d11..87373120 100644
--- a/src/routes/spaces/[relay]/[h]/+page.svelte
+++ b/src/routes/spaces/[relay]/[h]/+page.svelte
@@ -389,7 +389,7 @@
   {#if $room?.isPrivate && $membershipStatus !== MembershipStatus.Granted}
     <div class="py-20">
       <div class="card2 col-8 m-auto max-w-md items-center text-center">
-        <p class="row-2">You aren't currently a member of this room.</p>
+        <p class="opacity-75">You aren't currently a member of this room.</p>
         {#if $membershipStatus === MembershipStatus.Pending}
           <Button class="btn btn-neutral btn-sm" disabled={leaving} onclick={leave}>
             <Icon icon={ClockCircle} />