diff --git a/src/lib/components/lemmy/ObjectAutocomplete.svelte b/src/lib/components/lemmy/ObjectAutocomplete.svelte
index 2b28158e..fe91e774 100644
--- a/src/lib/components/lemmy/ObjectAutocomplete.svelte
+++ b/src/lib/components/lemmy/ObjectAutocomplete.svelte
@@ -13,6 +13,7 @@
instance?: string | undefined
listing_type?: ListingType
showWhenEmpty?: boolean
+ placeholder?: string
// eslint-disable-next-line
onselect?: (item: any) => void
}
diff --git a/src/lib/components/lemmy/SiteCard.svelte b/src/lib/components/lemmy/SiteCard.svelte
index 0e6d6c00..c0891c4a 100644
--- a/src/lib/components/lemmy/SiteCard.svelte
+++ b/src/lib/components/lemmy/SiteCard.svelte
@@ -134,7 +134,7 @@
- {$t('routes.modlog')}
+ {$t('routes.modlog.title')}
•
diff --git a/src/lib/components/lemmy/moderation/CommentModerationMenu.svelte b/src/lib/components/lemmy/moderation/CommentModerationMenu.svelte
index 7813af91..f1a2df27 100644
--- a/src/lib/components/lemmy/moderation/CommentModerationMenu.svelte
+++ b/src/lib/components/lemmy/moderation/CommentModerationMenu.svelte
@@ -5,6 +5,7 @@
Fire,
Icon,
Megaphone,
+ Newspaper,
ShieldExclamation,
Trash,
} from 'svelte-hero-icons'
@@ -88,6 +89,18 @@
? $t('moderation.unfeature')
: $t('moderation.feature')}
+
+
+
+ {$t('moderation.modlog.user')}
+
+
+
+ {$t('moderation.modlog.comment')}
+
{/if}
{/if}
diff --git a/src/lib/components/lemmy/moderation/ModerationMenu.svelte b/src/lib/components/lemmy/moderation/ModerationMenu.svelte
index 0d173913..a01eddb0 100644
--- a/src/lib/components/lemmy/moderation/ModerationMenu.svelte
+++ b/src/lib/components/lemmy/moderation/ModerationMenu.svelte
@@ -11,6 +11,7 @@
LockClosed,
LockOpen,
Megaphone,
+ Newspaper,
ShieldExclamation,
Trash,
} from 'svelte-hero-icons'
@@ -148,6 +149,14 @@
? $t('moderation.ban.unbanFromCommunity')
: $t('moderation.ban.banFromCommunity')}
+
+
+ {$t('moderation.modlog.user')}
+
+
+
+ {$t('moderation.modlog.post')}
+
{/if}
{/if}
{#if profile.data?.user && isAdmin(profile.data.user)}
diff --git a/src/lib/components/lemmy/moderation/RemoveModal.svelte b/src/lib/components/lemmy/moderation/RemoveModal.svelte
index 96fe2ded..758cdeff 100644
--- a/src/lib/components/lemmy/moderation/RemoveModal.svelte
+++ b/src/lib/components/lemmy/moderation/RemoveModal.svelte
@@ -32,11 +32,21 @@
}: Props = $props()
let reason = $state('')
- let commentReason: boolean = $state(false)
- let privateMessage: boolean = $state(false)
+ let commentReason: boolean = $state(
+ settings.moderation.defaultRemoveAction != null,
+ )
+ let privateMessage: boolean = $state(
+ settings.moderation.defaultRemoveAction == 'message',
+ )
let loading = $state(false)
let preset = $state(settings.moderation.presets[0]?.content ?? '')
+ $effect(() => {
+ if (!commentReason) settings.moderation.defaultRemoveAction = null
+ else if (privateMessage) settings.moderation.defaultRemoveAction = 'message'
+ else settings.moderation.defaultRemoveAction = 'comment'
+ })
+
let removed = $derived(
item
? isCommentView(item)
@@ -163,7 +173,6 @@
const resetText = () => {
reason = ''
- commentReason = false
}
run(() => {
diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json
index 08af8354..d60dc5ff 100644
--- a/src/lib/i18n/en.json
+++ b/src/lib/i18n/en.json
@@ -207,7 +207,10 @@
"footer": "{{users:number}} active {{users; 1:user; default:users;}}",
"endFeed": "You have reached the end of {{community_name; undefined:the feed.; default:{{community_name}}.}}"
},
- "modlog": "Modlog",
+ "modlog": {
+ "title": "Modlog",
+ "filters": "Filters"
+ },
"instances": "Instances",
"legal": {
"title": "Legal",
@@ -603,7 +606,12 @@
"labelInstanceOnly": "Moderation (Instance Only)",
"feature": "Feature",
"unfeature": "Unfeature",
- "votes": "Votes"
+ "votes": "Votes",
+ "modlog": {
+ "user": "User moderation log",
+ "post": "Post moderation log",
+ "comment": "Comment moderation log"
+ }
},
"common": {
"back": "Back",
diff --git a/src/lib/settings.svelte.ts b/src/lib/settings.svelte.ts
index d4983d85..81ca372a 100644
--- a/src/lib/settings.svelte.ts
+++ b/src/lib/settings.svelte.ts
@@ -59,6 +59,7 @@ interface Settings {
nsfwBlur: boolean
moderation: {
presets: Preset[]
+ defaultRemoveAction: 'comment' | 'message' | null
}
randomPlaceholders: boolean
modlogCardView: boolean | undefined
@@ -102,7 +103,7 @@ interface Settings {
}
export const defaultSettings: Settings = {
- settingsVer: 4,
+ settingsVer: 5,
expandableImages: toBool(env.PUBLIC_EXPANDABLE_IMAGES) ?? true,
markReadPosts: toBool(env.PUBLIC_MARK_READ_POSTS) ?? true,
showInstances: {
@@ -138,6 +139,7 @@ export const defaultSettings: Settings = {
content: `Your submission in *"{{post}}"* was removed for {{reason}}.`,
},
],
+ defaultRemoveAction: null,
},
randomPlaceholders: toBool(env.PUBLIC_RANDOM_PLACEHOLDERS) ?? false,
modlogCardView: toBool(env.PUBLIC_MODLOG_CARD_VIEW) ?? undefined,
diff --git a/src/routes/moderation/+page.svelte b/src/routes/moderation/+page.svelte
index 81af2e37..c07feadc 100644
--- a/src/routes/moderation/+page.svelte
+++ b/src/routes/moderation/+page.svelte
@@ -13,6 +13,7 @@
import { Check, Funnel, Icon, Inbox } from 'svelte-hero-icons'
import { fly } from 'svelte/transition'
import Report from './Report.svelte'
+ import Pageination from '$lib/components/ui/Pageination.svelte'
let { data = $bindable() } = $props()
@@ -118,6 +119,11 @@
{/each}
+ `?page=${current}`}
+ hasMore={data.items.value.length >= 20}
+ />
{:else}
{/if}
+
diff --git a/src/routes/modlog/+page.svelte b/src/routes/modlog/+page.svelte
index 28053f41..16ee8527 100644
--- a/src/routes/modlog/+page.svelte
+++ b/src/routes/modlog/+page.svelte
@@ -23,6 +23,12 @@
import ModlogItemCard from './item/ModlogItemCard.svelte'
import ModlogItemTable from './item/ModlogItemTable.svelte'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
+ import { t } from '$lib/i18n/translations'
+ import { client } from '$lib/lemmy.svelte'
+ import Spinner from 'mono-svelte/loader/Spinner.svelte'
+ import CommunityLink from '$lib/components/lemmy/community/CommunityLink.svelte'
+ import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
+ import { postLink } from '$lib/components/lemmy/post/helpers'
let { data = $bindable() } = $props()
@@ -41,11 +47,91 @@
- Modlog
+ {$t('routes.modlog.title')}
-
+
+ {$t('routes.modlog.title')}
+ {#snippet extended()}
+ {$t('routes.modlog.filters')}
+
+ {#if data.params.community}
+ -
+
+ {$t('form.post.community')}
+
+ {#await client().getCommunity({ id: data.params.community })}
+
+ {:then community}
+
+ {/await}
+
+ {/if}
+ {#if data.params.user}
+ -
+
+ {$t('routes.admin.applications.user')}
+
+ {#await client().getPersonDetails( { person_id: data.params.user, limit: 1 }, )}
+
+ {:then person}
+
+ {/await}
+
+ {/if}
+ {#if data.params.moderator}
+ -
+
+
+ Moderator
+
+ {#await client().getPersonDetails( { person_id: data.params.moderator, limit: 1 }, )}
+
+ {:then person}
+
+ {/await}
+
+ {/if}
+ {#if data.params.post}
+ -
+
+
+ {$t('nav.create.post')}
+
+ {#await client().getPost({ id: data.params.post })}
+
+ {:then post}
+
+ {post.post_view.post.name}
+
+ {/await}
+
+ {/if}
+ {#if data.params.comment}
+ -
+
+
+ {$t('moderation.removeSubmission.comment')}
+
+ {#await client().getComment({ id: data.params.comment })}
+
+ {:then comment}
+
+ {comment.comment_view.comment.content.slice(1, 200)}...
+
+ {/await}
+
+ {/if}
+
+ {/snippet}
+
{#if data.modlog && data.modlog.length > 0}
{#if settings.modlogCardView ?? !window.matchMedia('(min-width: 1600px)').matches}
-
+
{#each data.modlog as modlog (modlog)}
{/each}
@@ -181,14 +265,14 @@
style="min-width: 800px;"
>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/routes/modlog/+page.ts b/src/routes/modlog/+page.ts
index 7c688534..0a639f04 100644
--- a/src/routes/modlog/+page.ts
+++ b/src/routes/modlog/+page.ts
@@ -208,9 +208,13 @@ export const _toModLog = (item: ModAction): ModLog => {
export async function load({ url }) {
const instance = url.searchParams.get('instance') || undefined
+
const community = Number(url.searchParams.get('community')) || undefined
const user = Number(url.searchParams.get('user')) || undefined
const modId = Number(url.searchParams.get('mod_id')) || undefined
+ const postId = Number(url.searchParams.get('post')) || undefined
+ const commentId = Number(url.searchParams.get('comment')) || undefined
+
const page = Number(url.searchParams.get('page')) || 1
const type: ModlogActionType =
(url.searchParams.get('type') as ModlogActionType) || 'All'
@@ -222,6 +226,8 @@ export async function load({ url }) {
page: page,
mod_person_id: modId,
other_person_id: user,
+ post_id: postId,
+ comment_id: commentId,
})
const moderation = [
@@ -258,5 +264,12 @@ export async function load({ url }) {
community: community ? moderationActions[0]?.community?.title : undefined,
moderator: modId ? moderationActions[0]?.moderator?.name : undefined,
},
+ params: {
+ user: user,
+ community: community,
+ moderator: modId,
+ post: postId,
+ comment: commentId,
+ },
}
}
diff --git a/src/routes/modlog/item/ModlogItemTable.svelte b/src/routes/modlog/item/ModlogItemTable.svelte
index 338cf565..c7e22819 100644
--- a/src/routes/modlog/item/ModlogItemTable.svelte
+++ b/src/routes/modlog/item/ModlogItemTable.svelte
@@ -14,7 +14,7 @@
- |
+ |
diff --git a/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte b/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte
index 0c150d9a..0ccc8c3c 100644
--- a/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte
+++ b/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte
@@ -41,7 +41,9 @@
|