From 14aee4e74f9b209fbedbd7aafa31f400b4ad44b9 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Wed, 28 Aug 2024 17:15:05 +0500
Subject: [PATCH] Fix office popup join button (#6421)

---
 plugins/love-resources/src/components/RoomPopup.svelte | 7 +++----
 plugins/love-resources/src/utils.ts                    | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/plugins/love-resources/src/components/RoomPopup.svelte b/plugins/love-resources/src/components/RoomPopup.svelte
index a226ea6dca..5741408c58 100644
--- a/plugins/love-resources/src/components/RoomPopup.svelte
+++ b/plugins/love-resources/src/components/RoomPopup.svelte
@@ -129,7 +129,6 @@
   }
 
   const me = (getCurrentAccount() as PersonAccount).person
-  $: myRoom = isOffice(room) && room.person === me
 </script>
 
 <div class="antiPopup room-popup">
@@ -196,9 +195,9 @@
       />
     </div>
   {/if}
-  {#if (joined && !myRoom) || (!allowLeave && $myRequests.length === 0 && !myRoom)}
+  {#if $location.path[2] !== loveId || (joined && allowLeave) || !joined}
     <div class="btns flex-row-center flex-reverse flex-no-shrink w-full flex-gap-2">
-      {#if allowLeave}
+      {#if joined && allowLeave}
         <ModernButton
           label={love.string.LeaveRoom}
           icon={love.icon.LeaveRoom}
@@ -206,7 +205,7 @@
           kind={'negative'}
           on:click={leave}
         />
-      {:else if $myRequests.length === 0 && !myRoom}
+      {:else if !joined}
         <ModernButton
           icon={love.icon.EnterRoom}
           label={love.string.EnterRoom}
diff --git a/plugins/love-resources/src/utils.ts b/plugins/love-resources/src/utils.ts
index ec5a4123a2..aea663d6f6 100644
--- a/plugins/love-resources/src/utils.ts
+++ b/plugins/love-resources/src/utils.ts
@@ -624,8 +624,6 @@ export async function tryConnect (
 
   if (room._id === currentInfo?.room) return
   if (room.access === RoomAccess.DND) return
-  const thisRoomRequest = currentRequests.find((p) => p.room === room._id)
-  if (thisRoomRequest !== undefined) return
   for (const req of currentRequests) {
     await client.remove(req)
   }