diff --git a/src/lib/components/lemmy/comment/CommentActions.svelte b/src/lib/components/lemmy/comment/CommentActions.svelte index d602e639..8b9f8120 100644 --- a/src/lib/components/lemmy/comment/CommentActions.svelte +++ b/src/lib/components/lemmy/comment/CommentActions.svelte @@ -22,7 +22,7 @@ import Button from '$lib/components/input/Button.svelte' import { createEventDispatcher } from 'svelte' import { isCommentMutable } from '$lib/components/lemmy/post/helpers.js' - import { isMod, report } from '$lib/components/lemmy/moderation/moderation.js' + import { amMod, report } from '$lib/components/lemmy/moderation/moderation.js' import ModerationMenu from '$lib/components/lemmy/moderation/ModerationMenu.svelte' import CommentModerationMenu from '$lib/components/lemmy/moderation/CommentModerationMenu.svelte' @@ -70,7 +70,7 @@ Reply - {#if $user && isMod($user, comment.community)} + {#if $user && amMod($user, comment.community)} {/if} +export const amMod = (me: MyUserInfo, community: Community) => me.moderates.map((c) => c.community.id).includes(community.id) || (community.local && isAdmin(me)) -export const isModOfAny = (me?: MyUserInfo) => +export const amModOfAny = (me?: MyUserInfo) => me && (me.moderates.length > 0 || isAdmin(me)) export const isAdmin = (me: MyUserInfo) => me.local_user_view.person.admin diff --git a/src/lib/components/lemmy/post/PostActions.svelte b/src/lib/components/lemmy/post/PostActions.svelte index ee5fbb22..1d4ead8a 100644 --- a/src/lib/components/lemmy/post/PostActions.svelte +++ b/src/lib/components/lemmy/post/PostActions.svelte @@ -28,7 +28,7 @@ import { createEventDispatcher } from 'svelte' import Modal from '$lib/components/ui/modal/Modal.svelte' import PostForm from '$lib/components/lemmy/post/PostForm.svelte' - import { isMod, report } from '$lib/components/lemmy/moderation/moderation.js' + import { amMod, report } from '$lib/components/lemmy/moderation/moderation.js' import ModerationMenu from '$lib/components/lemmy/moderation/ModerationMenu.svelte' export let post: PostView @@ -100,7 +100,7 @@
- {#if $user && isMod($user, post.community)} + {#if $user && amMod($user, post.community)} {/if} diff --git a/src/lib/components/lemmy/user/UserLink.svelte b/src/lib/components/lemmy/user/UserLink.svelte index 3bf919c5..8405fbc1 100644 --- a/src/lib/components/lemmy/user/UserLink.svelte +++ b/src/lib/components/lemmy/user/UserLink.svelte @@ -21,8 +21,8 @@ {#if avatar} {/if} - - {#if !user.local && $userSettings.showInstance} + + {#if $userSettings.showInstance} {user.name} @{new URL(user.actor_id).hostname} diff --git a/src/lib/components/ui/Navbar.svelte b/src/lib/components/ui/Navbar.svelte index 95ab6f22..41ecef74 100644 --- a/src/lib/components/ui/Navbar.svelte +++ b/src/lib/components/ui/Navbar.svelte @@ -3,7 +3,7 @@ import Button from '$lib/components/input/Button.svelte' import Link from '$lib/components/input/Link.svelte' import ShieldIcon from '$lib/components/lemmy/moderation/ShieldIcon.svelte' - import { isModOfAny } from '$lib/components/lemmy/moderation/moderation.js' + import { amModOfAny } from '$lib/components/lemmy/moderation/moderation.js' import Logo from '$lib/components/ui/Logo.svelte' import Spinner from '$lib/components/ui/loader/Spinner.svelte' import Menu from '$lib/components/ui/menu/Menu.svelte' @@ -51,7 +51,7 @@
- {#if $user && isModOfAny($user)} + {#if $user && amModOfAny($user)}