diff --git a/src/lib/app/i18n/en.json b/src/lib/app/i18n/en.json
index a89a5b5e..df84c6a6 100644
--- a/src/lib/app/i18n/en.json
+++ b/src/lib/app/i18n/en.json
@@ -316,7 +316,7 @@
},
"postRedirect": {
"title": "Cross-server content",
- "description": "That content does not originate from {{homeInstance}}. You can load it on your instance here.",
+ "description": "That content does not originate from {{homeInstance}}.",
"actions": {
"back": "Go back",
"fetch": "Locate post on {{homeInstance}}",
diff --git a/src/lib/feature/post/actions/PostActions.svelte b/src/lib/feature/post/actions/PostActions.svelte
index 7cb522d6..ff69c9c7 100644
--- a/src/lib/feature/post/actions/PostActions.svelte
+++ b/src/lib/feature/post/actions/PostActions.svelte
@@ -222,28 +222,30 @@
-
- {#snippet target(popover)}
-
- {/snippet}
- {#snippet children(open)}
- {#if open}
- {#await import('./PostActionsMenu.svelte')}
-
-
-
- {:then { default: PostActionsMenu }}
-
- {/await}
- {/if}
- {/snippet}
-
+ {#if profile.current.jwt}
+
+ {#snippet target(popover)}
+
+ {/snippet}
+ {#snippet children(open)}
+ {#if open}
+ {#await import('./PostActionsMenu.svelte')}
+
+
+
+ {:then { default: PostActionsMenu }}
+
+ {/await}
+ {/if}
+ {/snippet}
+
+ {/if}
diff --git a/src/lib/ui/form/Duration.svelte b/src/lib/ui/form/Duration.svelte
index 637715f7..3efd3a9c 100644
--- a/src/lib/ui/form/Duration.svelte
+++ b/src/lib/ui/form/Duration.svelte
@@ -45,7 +45,6 @@
>
{/if}
{
elevation?: Elevation
padding?: Padding
diff --git a/src/routes/inbox/InboxItem.svelte b/src/routes/inbox/InboxItem.svelte
index 422bd502..f5d34b7b 100644
--- a/src/routes/inbox/InboxItem.svelte
+++ b/src/routes/inbox/InboxItem.svelte
@@ -57,6 +57,38 @@
}
+{#snippet actions()}
+ {
+ e.stopPropagation()
+ markAsRead(!item.read)
+ }}
+ size="sm"
+ rounding="pill"
+ class="shrink-0"
+ icon={item.read ? EyeSlash : Eye}
+ >
+ {item.read
+ ? $t('post.actions.more.markUnread')
+ : $t('post.actions.more.markRead')}
+
+ markAsRead(true)}
+ >
+ {$t('common.jump')}
+
+{/snippet}
+
{#snippet title()}
@@ -98,65 +130,13 @@
- {
- e.stopPropagation()
- markAsRead(!item.read)
- }}
- size="sm"
- rounding="pill"
- class="shrink-0"
- icon={item.read ? EyeSlash : Eye}
- >
- {item.read
- ? $t('post.actions.more.markUnread')
- : $t('post.actions.more.markRead')}
-
- markAsRead(true)}
- >
- {$t('common.jump')}
-
+ {@render actions()}
{/snippet}
{#snippet extended()}
- {
- e.stopPropagation()
- markAsRead(!item.read)
- }}
- size="sm"
- rounding="pill"
- icon={item.read ? EyeSlash : Eye}
- >
- {item.read
- ? $t('post.actions.more.markUnread')
- : $t('post.actions.more.markRead')}
-
- markAsRead(true)}
- >
- {$t('common.jump')}
-
+ {@render actions()}
{/snippet}
{#snippet content()}
diff --git a/src/routes/inbox/messages/[user_id=integer]/+page.svelte b/src/routes/inbox/messages/[user_id=integer]/+page.svelte
index baee9308..5bf7184a 100644
--- a/src/routes/inbox/messages/[user_id=integer]/+page.svelte
+++ b/src/routes/inbox/messages/[user_id=integer]/+page.svelte
@@ -2,6 +2,7 @@
import { browser } from '$app/environment'
import { client } from '$lib/api/client.svelte'
import type { PrivateMessageResponse } from '$lib/api/types'
+ import { profile } from '$lib/app/auth.svelte'
import { errorMessage } from '$lib/app/error'
import { t } from '$lib/app/i18n'
import MarkdownEditor from '$lib/app/markdown/MarkdownEditor.svelte'
@@ -88,6 +89,20 @@
let interval: number = -1
onMount(() => {
+ data.message.value.private_messages
+ .filter(
+ (i) =>
+ !i.private_message.read &&
+ i.private_message.creator_id !=
+ profile.current.user?.local_user_view.person.id,
+ )
+ .forEach((i) =>
+ client().markPrivateMessageAsRead({
+ private_message_id: i.private_message.id,
+ read: true,
+ }),
+ )
+
interval = setInterval(async () => {
const res = await client().getPrivateMessages({
creator_id: Number(data.creator.value.person_view.person.id),
@@ -95,7 +110,7 @@
page: 1,
})
data.message.value = res
- }, 5 * 1000) as unknown as number
+ }, 15 * 1000) as unknown as number
return () => clearInterval(interval)
})
@@ -123,10 +138,10 @@
color="transparent"
rounding="2xl"
padding="none"
- class="bg-white dark:bg-zinc-950 dark:border-t-zinc-900 w-full overflow-auto relative flex-1"
+ class="bg-white dark:bg-zinc-950 dark:border-t-zinc-900 w-full overflow-auto relative flex-1 min-h-0 max-h-[66vh] md:max-h-[64vh]"
>
-
-
+
+
{$t('routes.inbox.messages.conversation', {
diff --git a/src/routes/u/[name]/UserActions.svelte b/src/routes/u/[name]/UserActions.svelte
index d2f5c68b..3c15bb05 100644
--- a/src/routes/u/[name]/UserActions.svelte
+++ b/src/routes/u/[name]/UserActions.svelte
@@ -97,9 +97,8 @@
size="square-lg"
rounding="2xl"
icon={ShieldCheck}
- >
- {$t('moderation.label')}
-
+ aria-label={$t('moderation.label')}
+ >
{/snippet}
{/snippet}