diff --git a/src/lib/components/lemmy/post/PostBody.svelte b/src/lib/components/lemmy/post/PostBody.svelte index d58b9921..ef012c1d 100644 --- a/src/lib/components/lemmy/post/PostBody.svelte +++ b/src/lib/components/lemmy/post/PostBody.svelte @@ -6,6 +6,7 @@ export let body: string export let view: View = 'cozy' + export let clickThrough = false let expanded = false let element: Element @@ -31,8 +32,8 @@ bg-gradient-to-b text-transparent from-slate-600 via-slate-600 dark:from-zinc-400 dark:via-zinc-400 bg-clip-text z-0 ${view == 'list' ? `max-h-24` : 'max-h-48'}` - : 'text-slate-600 dark:text-zinc-400 max-h-full'} pointer-events-none {$$props.class ?? - ''}" + : 'text-slate-600 dark:text-zinc-400 max-h-full'} {$$props.class ?? ''}" + class:pointer-events-none={!clickThrough} bind:this={element} > diff --git a/src/lib/components/lemmy/user/UserLink.svelte b/src/lib/components/lemmy/user/UserLink.svelte index 614b4e78..b9fa1888 100644 --- a/src/lib/components/lemmy/user/UserLink.svelte +++ b/src/lib/components/lemmy/user/UserLink.svelte @@ -13,6 +13,7 @@ export let showInstance: boolean = $userSettings.showInstances.user || ($userSettings.showInstances.comments && inComment) + export let displayName = $userSettings.displayNames - {$userSettings.displayNames ? user.display_name || user.name : user.name} + {displayName ? user.display_name || user.name : user.name} {#if showInstance} {/if} -{#if data.person_view.person.banner} - -{/if}
-
- - -
- {#if data.person_view.person.bio} - + {#if data.person_view.person.banner} +
+ User banner - {/if} -
-
- - -
- {#if (data.moderates ?? []).length > 0} - - - - {$t('routes.profile.moderates')} - - ({ - id: m.community.id, - name: m.community.title, - url: communityLink(m.community), - avatar: m.community.icon, - instance: new URL(m.community.actor_id).hostname, - }))} - /> - +
{/if} - {#if $profile?.user && $profile.jwt && data.person_view.person.id != $profile.user.local_user_view.person.id} -
- - {#if data.person_view.person.matrix_user_id} + @ + + +
+
+ {#if data.person_view.person.bio} + + {/if} +
+
+ + +
+ {#if (data.moderates ?? []).length > 0} + + + + {$t('routes.profile.moderates')} + + ({ + id: m.community.id, + name: m.community.title, + url: communityLink(m.community), + avatar: m.community.icon, + instance: new URL(m.community.actor_id).hostname, + }))} + /> + + {/if} + {#if $profile?.user && $profile.jwt && data.person_view.person.id != $profile.user.local_user_view.person.id} +
- {/if} - {#if isAdmin($profile?.user)} - + {#if data.person_view.person.matrix_user_id} + + {/if} + {#if isAdmin($profile?.user)} + + + + ban(data.person_view.person.banned, data.person_view.person)} + > + + {data.person_view.person.banned ? 'Unban' : 'Ban'} + + (purgingUser = !purgingUser)} + > + + Purge + + + {/if} + - ban(data.person_view.person.banned, data.person_view.person)} + on:click={() => blockUser(data.person_view.person.id)} > - - {data.person_view.person.banned ? 'Unban' : 'Ban'} - - (purgingUser = !purgingUser)} - > - - Purge + + {isBlocked($profile.user, data.person_view.person.id) + ? 'Unblock' + : 'Block'} - {/if} - - - blockUser(data.person_view.person.id)} - > - - {isBlocked($profile.user, data.person_view.person.id) - ? 'Unblock' - : 'Block'} - - -
- {/if} -
+
+ {/if} + +
-
- +
+
{#if data.items.length == 0}