Show lock icon for closed channels

This commit is contained in:
Jon Staab
2024-12-10 13:38:34 -08:00
parent a5dfa02771
commit 80d44a097a
8 changed files with 47 additions and 17 deletions
+2 -8
View File
@@ -14,7 +14,6 @@
import SpaceJoin from "@app/components/SpaceJoin.svelte"
import ProfileList from "@app/components/ProfileList.svelte"
import RoomCreate from "@app/components/RoomCreate.svelte"
import ChannelName from "@app/components/ChannelName.svelte"
import MenuSpaceRoomItem from "@app/components/MenuSpaceRoomItem.svelte"
import {
getMembershipUrls,
@@ -121,7 +120,7 @@
<div class="h-2" />
<SecondaryNavHeader>Your Rooms</SecondaryNavHeader>
{#each $userRooms as room, i (room)}
<MenuSpaceRoomItem {url} {room} />
<MenuSpaceRoomItem notify {url} {room} />
{/each}
{#if $otherRooms.length > 0}
<div class="h-2" />
@@ -134,12 +133,7 @@
</SecondaryNavHeader>
{/if}
{#each $otherRooms as room, i (room)}
<SecondaryNavItem href={makeSpacePath(url, room)}>
<Icon icon="hashtag" />
<div class="min-w-0 overflow-hidden text-ellipsis">
<ChannelName {url} {room} />
</div>
</SecondaryNavItem>
<MenuSpaceRoomItem {url} {room} />
{/each}
<SecondaryNavItem on:click={addRoom}>
<Icon icon="add-circle" />
+12 -2
View File
@@ -1,19 +1,29 @@
<script lang="ts">
import {readable} from "svelte/store"
import Icon from "@lib/components/Icon.svelte"
import SecondaryNavItem from "@lib/components/SecondaryNavItem.svelte"
import ChannelName from "@app/components/ChannelName.svelte"
import {makeSpacePath} from "@app/routes"
import {deriveChannel, channelIsLocked} from "@app/state"
import {deriveNotification, getRoomFilters} from "@app/notifications"
export let url
export let room
export let notify = false
const path = makeSpacePath(url, room)
const notification = deriveNotification(path, getRoomFilters(room), url)
const channel = deriveChannel(url, room)
const notification = notify
? deriveNotification(path, getRoomFilters(room), url)
: readable(false)
</script>
<SecondaryNavItem href={path} notification={$notification}>
<Icon icon="hashtag" />
{#if channelIsLocked($channel)}
<Icon icon="lock" size={4} />
{:else}
<Icon icon="hashtag" />
{/if}
<div class="min-w-0 overflow-hidden text-ellipsis">
<ChannelName {url} {room} />
</div>
+2 -2
View File
@@ -50,9 +50,9 @@
component={ThunkStatusDetail}
props={{url, message, status, retry}}
params={{interactive: true}}>
<span class="flex cursor-pointer items-center gap-1">
<span class="flex cursor-pointer items-center gap-1 text-error">
<Icon icon="danger" size={3} />
<span class="opacity-50">Failed to send!</span>
<span>Failed to send!</span>
</span>
</Tippy>
{:else if canCancel || isPending}
+2
View File
@@ -12,6 +12,8 @@ import {LEGACY_THREAD, deriveEventsForUrl, getMembershipUrls, userMembership} fr
export const checked = writable<Record<string, number>>({})
checked.subscribe(v => console.trace("======", v))
export const deriveChecked = (key: string) => derived(checked, prop(key))
export const setChecked = (key: string, ts = now()) =>
+5 -2
View File
@@ -561,8 +561,8 @@ export const channelsById = withGetter(
}
channel.meta = {
access: meta.public ? "public" : "private",
membership: meta.open ? "open" : "closed",
access: meta.private ? "private" : "public",
membership: meta.closed ? "closed" : "open",
picture: meta.picture,
about: meta.about,
}
@@ -604,6 +604,9 @@ export const displayChannel = (url: string, room: string) => {
export const roomComparator = (url: string) => (room: string) =>
displayChannel(url, room).toLowerCase()
export const channelIsLocked = (channel?: Channel) =>
channel?.meta?.access === "private" && channel?.meta?.membership === "closed"
// User stuff
export const userSettings = withGetter(