From 2d3fad4b8c5812f024f7850f7a22b11ce28fb5a5 Mon Sep 17 00:00:00 2001 From: Stephen Niedzielski Date: Wed, 11 Nov 2026 20:30:00 -0700 Subject: [PATCH 1/2] Limit Mop to the installation subreddit The Target ID field could be edited before submitting, so a moderator could mop a comment or post in another subreddit they moderate. Make the field read-only and reject targets outside the installation subreddit. --- src/features/mop/menu.test.ts | 2 ++ src/features/mop/menu.ts | 1 + src/features/mop/nuke.test.ts | 17 +++++++++++++++++ src/features/mop/nuke.ts | 20 ++++++++++++++++++++ 4 files changed, 40 insertions(+) create mode 100644 src/features/mop/nuke.test.ts diff --git a/src/features/mop/menu.test.ts b/src/features/mop/menu.test.ts index f78862f..4edaeaf 100644 --- a/src/features/mop/menu.test.ts +++ b/src/features/mop/menu.test.ts @@ -15,6 +15,7 @@ void test('builds a Mop form with the selected target id', () => { type: 'string', helpText: 'Auto-filled from the selected item.', required: true, + disabled: true, defaultValue: 't1_comment', }); }); @@ -29,6 +30,7 @@ void test('defaults Mop moderation actions to remove only', () => { type: 'string', helpText: 'Auto-filled from the selected item.', required: true, + disabled: true, defaultValue: 't3_post', }, { diff --git a/src/features/mop/menu.ts b/src/features/mop/menu.ts index 11ac99e..985c56d 100644 --- a/src/features/mop/menu.ts +++ b/src/features/mop/menu.ts @@ -11,6 +11,7 @@ export function buildNukeForm(title: string, targetId: string): Form { type: 'string', helpText: 'Auto-filled from the selected item.', required: true, + disabled: true, defaultValue: targetId, }, { diff --git a/src/features/mop/nuke.test.ts b/src/features/mop/nuke.test.ts new file mode 100644 index 0000000..43d49b1 --- /dev/null +++ b/src/features/mop/nuke.test.ts @@ -0,0 +1,17 @@ +import assert from 'node:assert/strict'; +import { test } from 'node:test'; +import { verifyInstallationSubreddit } from './nuke.js'; + +void test('allows Mop targets in the installation subreddit', () => { + assert.equal( + verifyInstallationSubreddit('t5_install', 't5_install'), + undefined + ); +}); + +void test('rejects Mop targets outside the installation subreddit', () => { + assert.deepEqual(verifyInstallationSubreddit('t5_other', 't5_install'), { + success: false, + message: 'You can only mop this subreddit.', + }); +}); diff --git a/src/features/mop/nuke.ts b/src/features/mop/nuke.ts index 458c1ac..2161c68 100644 --- a/src/features/mop/nuke.ts +++ b/src/features/mop/nuke.ts @@ -42,6 +42,14 @@ function canManagePosts(permissions: readonly ModeratorPermission[]): boolean { return permissions.includes('all') || permissions.includes('posts'); } +export function verifyInstallationSubreddit( + targetSubredditId: T5, + installationSubredditId: T5 +): NukeResult | undefined { + if (targetSubredditId === installationSubredditId) return undefined; + return { success: false, message: 'You can only mop this subreddit.' }; +} + function shouldIncludeComment( comment: Comment, skipDistinguished: boolean @@ -212,6 +220,12 @@ export async function handleNukePost( const resolved = await getCurrentUserAndPost(props.postId); if ('success' in resolved) return resolved; + const subredditFailure = verifyInstallationSubreddit( + resolved.post.subredditId, + props.subredditId + ); + if (subredditFailure) return subredditFailure; + const permissionFailure = await verifyPostModerationPermissions( resolved.user, resolved.post.subredditName, @@ -240,6 +254,12 @@ export async function handleNuke(props: NukeProps): Promise { const resolved = await getCurrentUserAndComment(props.commentId); if ('success' in resolved) return resolved; + const subredditFailure = verifyInstallationSubreddit( + resolved.comment.subredditId, + props.subredditId + ); + if (subredditFailure) return subredditFailure; + const permissionFailure = await verifyPostModerationPermissions( resolved.user, resolved.comment.subredditName, From abca99413e8d2b187f3620b037bc16523b57f9be Mon Sep 17 00:00:00 2001 From: Stephen Niedzielski Date: Wed, 11 Nov 2026 20:42:23 -0700 Subject: [PATCH 2/2] Inline the Mop installation-subreddit check --- src/features/mop/nuke.test.ts | 17 ----------------- src/features/mop/nuke.ts | 24 ++++++------------------ 2 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 src/features/mop/nuke.test.ts diff --git a/src/features/mop/nuke.test.ts b/src/features/mop/nuke.test.ts deleted file mode 100644 index 43d49b1..0000000 --- a/src/features/mop/nuke.test.ts +++ /dev/null @@ -1,17 +0,0 @@ -import assert from 'node:assert/strict'; -import { test } from 'node:test'; -import { verifyInstallationSubreddit } from './nuke.js'; - -void test('allows Mop targets in the installation subreddit', () => { - assert.equal( - verifyInstallationSubreddit('t5_install', 't5_install'), - undefined - ); -}); - -void test('rejects Mop targets outside the installation subreddit', () => { - assert.deepEqual(verifyInstallationSubreddit('t5_other', 't5_install'), { - success: false, - message: 'You can only mop this subreddit.', - }); -}); diff --git a/src/features/mop/nuke.ts b/src/features/mop/nuke.ts index 2161c68..470e88b 100644 --- a/src/features/mop/nuke.ts +++ b/src/features/mop/nuke.ts @@ -42,14 +42,6 @@ function canManagePosts(permissions: readonly ModeratorPermission[]): boolean { return permissions.includes('all') || permissions.includes('posts'); } -export function verifyInstallationSubreddit( - targetSubredditId: T5, - installationSubredditId: T5 -): NukeResult | undefined { - if (targetSubredditId === installationSubredditId) return undefined; - return { success: false, message: 'You can only mop this subreddit.' }; -} - function shouldIncludeComment( comment: Comment, skipDistinguished: boolean @@ -220,11 +212,9 @@ export async function handleNukePost( const resolved = await getCurrentUserAndPost(props.postId); if ('success' in resolved) return resolved; - const subredditFailure = verifyInstallationSubreddit( - resolved.post.subredditId, - props.subredditId - ); - if (subredditFailure) return subredditFailure; + if (resolved.post.subredditId !== props.subredditId) { + return { success: false, message: 'You can only mop this subreddit.' }; + } const permissionFailure = await verifyPostModerationPermissions( resolved.user, @@ -254,11 +244,9 @@ export async function handleNuke(props: NukeProps): Promise { const resolved = await getCurrentUserAndComment(props.commentId); if ('success' in resolved) return resolved; - const subredditFailure = verifyInstallationSubreddit( - resolved.comment.subredditId, - props.subredditId - ); - if (subredditFailure) return subredditFailure; + if (resolved.comment.subredditId !== props.subredditId) { + return { success: false, message: 'You can only mop this subreddit.' }; + } const permissionFailure = await verifyPostModerationPermissions( resolved.user,