control joining based on lock gate

open-chat-labs · Jul 24, 2024 · 119b0ea · 119b0ea
1 parent 47fc66f
commit 119b0ea
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/frontend/app/src/components/home/ChatSummary.svelte b/frontend/app/src/components/home/ChatSummary.svelte
@@ -514,6 +514,17 @@
                                         </MenuItem>
                                     {/if}
                                 {/if}
+                                <MenuItem
+                                    disabled={unreadMessages === 0}
+                                    on:click={() => client.markAllRead(chatSummary)}>
+                                    <CheckboxMultipleMarked
+                                        size={$iconSize}
+                                        color={"var(--icon-inverted-txt)"}
+                                        slot="icon" />
+                                    <div slot="text">
+                                        <Translatable resourceKey={i18nKey("markAllRead")} />
+                                    </div>
+                                </MenuItem>
                                 {#if chatSummary.membership.archived}
                                     <MenuItem on:click={selectChat}>
                                         <ArchiveOffIcon
@@ -554,17 +565,6 @@
                                         </div>
                                     </MenuItem>
                                 {/if}
-                                <MenuItem
-                                    disabled={unreadMessages === 0}
-                                    on:click={() => client.markAllRead(chatSummary)}>
-                                    <CheckboxMultipleMarked
-                                        size={$iconSize}
-                                        color={"var(--icon-inverted-txt)"}
-                                        slot="icon" />
-                                    <div slot="text">
-                                        <Translatable resourceKey={i18nKey("markAllRead")} />
-                                    </div>
-                                </MenuItem>
                             </Menu>
                         </div>
                     </MenuIcon>

diff --git a/frontend/app/src/components/home/NoChatSelected.svelte b/frontend/app/src/components/home/NoChatSelected.svelte
@@ -14,6 +14,7 @@
     $: chatListScope = client.chatListScope;
     $: selectedCommunity = client.selectedCommunity;
     $: previewingCommunity = $selectedCommunity?.membership.role === "none";
+    $: locked = $selectedCommunity?.gate?.kind === "locked_gate";
 
     $: [title, message] = getMessageForScope($chatListScope.kind);
 
@@ -58,9 +59,12 @@
             <div class="join">
                 <Button
                     loading={joiningCommunity}
-                    disabled={joiningCommunity}
+                    disabled={locked || joiningCommunity}
                     on:click={joinCommunity}
-                    ><Translatable resourceKey={i18nKey("communities.joinCommunity")} /></Button>
+                    ><Translatable
+                        resourceKey={locked
+                            ? i18nKey("access.lockedGate", undefined, "community", true)
+                            : i18nKey("communities.joinCommunity")} /></Button>
                 <Button secondary small on:click={cancelPreview}>
                     <Translatable resourceKey={i18nKey("leave")} />
                 </Button>

diff --git a/frontend/app/src/components/home/RecommendedGroup.svelte b/frontend/app/src/components/home/RecommendedGroup.svelte
@@ -31,6 +31,7 @@
     $: chatListScope = client.chatListScope;
     $: chatSummariesStore = client.chatSummariesStore;
     $: member = $chatSummariesStore.has(group.id);
+    $: locked = group.gate.kind === "locked_gate";
 
     function dismiss({ id }: GroupChatSummary) {
         dispatch("dismissRecommendation", id);
@@ -90,12 +91,15 @@
         {:else}
             {#if !$suspendedUser}
                 <Button
-                    disabled={joining === group}
+                    disabled={locked || joining === group}
                     loading={joining === group}
                     tiny
                     hollow
                     on:click={() => joinGroup(group)}
-                    ><Translatable resourceKey={i18nKey("join")} /></Button>
+                    ><Translatable
+                        resourceKey={locked
+                            ? i18nKey("access.lockedGate", undefined, group.level, true)
+                            : i18nKey("join")} /></Button>
             {/if}
             <Button disabled={joining === group} tiny on:click={() => gotoGroup(group)}
                 ><Translatable resourceKey={i18nKey("preview")} /></Button>