fix: show community in reports page

Xyphyn · Oct 3, 2023 · facb108 · facb108
1 parent 0dd1d14
commit facb108
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 13 deletions.
diff --git a/src/lib/components/lemmy/comment/CommentItem.svelte b/src/lib/components/lemmy/comment/CommentItem.svelte
@@ -8,6 +8,7 @@
 
   export let comment: CommentView
   export let view = $userSettings.view
+  export let community = false
 </script>
 
 <Material
@@ -24,6 +25,7 @@
       nsfw={comment.post.nsfw}
       published={new Date(comment.post.published + 'Z')}
       saved={false}
+      community={community ? comment.community : undefined}
     />
     <Button
       color="secondary"

diff --git a/src/lib/components/lemmy/moderation/CommentModerationMenu.svelte b/src/lib/components/lemmy/moderation/CommentModerationMenu.svelte
@@ -35,11 +35,6 @@
       {/if}
     </MenuButton>
     {#if $profile?.user && $profile.user?.local_user_view.person.id != item.creator.id}
-      <MenuDivider>
-        User {#if !item.community.local && !amMod($profile.user, item.community)}
-          (Instance Only)
-        {/if}
-      </MenuDivider>
       <MenuButton
         color="danger-subtle"
         on:click={() =>

diff --git a/src/lib/components/lemmy/moderation/ModerationMenu.svelte b/src/lib/components/lemmy/moderation/ModerationMenu.svelte
@@ -154,11 +154,6 @@
       {/if}
     </MenuButton>
     {#if $profile?.user && $profile.user.local_user_view.person.id != item.creator.id}
-      <MenuDivider>
-        User {#if !item.community.local && !amMod($profile.user, item.community)}
-          (Instance Only)
-        {/if}
-      </MenuDivider>
       <MenuButton
         color="danger-subtle"
         on:click={() =>

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -14,7 +14,6 @@
   import { onMount } from 'svelte'
   import { browser } from '$app/environment'
   import { Forward, Icon } from 'svelte-hero-icons'
-  import { DEFAULT_INSTANCE_URL, instance } from '$lib/instance.js'
   import { routes } from '$lib/util.js'
 
   nProgress.configure({
@@ -57,7 +56,6 @@
         })
     }
   })
-
   $: title = routes[($page.route.id as keyof typeof routes) ?? '']
 </script>
 

diff --git a/src/routes/moderation/Report.svelte b/src/routes/moderation/Report.svelte
@@ -94,7 +94,7 @@
 </script>
 
 {#if item.type == 'comment'}
-  <CommentItem comment={item.item} />
+  <CommentItem community={true} comment={item.item} />
 {:else if item.type == 'post'}
   <Post post={item.item} />
 {:else if item.type == 'message'}