From 12eaf6654b0913bfbc5e4f5c34d10effc655b6b7 Mon Sep 17 00:00:00 2001
From: "Thomas F. K. Jorna" <hello@tefkah.com>
Date: Wed, 4 Mar 2026 18:49:35 +0100
Subject: [PATCH 01/10] feat: allow community admins to flag users

---
 .../FlagUserDialog/FlagUserDialog.tsx         | 110 ++++++++++++++++
 client/components/index.ts                    |   1 +
 .../Discussion/ThreadComment.tsx              |  29 ++++-
 server/apiRoutes.ts                           |   2 +
 server/discussion/api.ts                      |  14 +++
 server/models.ts                              |   3 +
 server/pub/api.ts                             |   2 +-
 server/pub/permissions.ts                     |   6 +-
 server/spamTag/notifications.ts               |  75 ++++++++++-
 server/threadComment/api.ts                   |  14 +++
 server/userCommunityFlag/api.ts               |  99 +++++++++++++++
 server/userCommunityFlag/model.ts             |  86 +++++++++++++
 server/userCommunityFlag/queries.ts           | 119 ++++++++++++++++++
 .../utils/queryHelpers/discussionsSanitize.ts |  33 +++--
 server/utils/queryHelpers/pubGet.ts           |   8 +-
 server/utils/queryHelpers/pubSanitize.ts      |   6 +
 server/utils/slack.ts                         |  79 +++++++++++-
 .../2026_03_04_createUserCommunityFlags.js    |  62 +++++++++
 types/spam.ts                                 |  25 ++++
 19 files changed, 752 insertions(+), 21 deletions(-)
 create mode 100644 client/components/FlagUserDialog/FlagUserDialog.tsx
 create mode 100644 server/userCommunityFlag/api.ts
 create mode 100644 server/userCommunityFlag/model.ts
 create mode 100644 server/userCommunityFlag/queries.ts
 create mode 100644 tools/migrations/2026_03_04_createUserCommunityFlags.js

diff --git a/client/components/FlagUserDialog/FlagUserDialog.tsx b/client/components/FlagUserDialog/FlagUserDialog.tsx
new file mode 100644
index 0000000000..113e02674a
--- /dev/null
+++ b/client/components/FlagUserDialog/FlagUserDialog.tsx
@@ -0,0 +1,110 @@
+import type { UserCommunityFlagReason } from 'types';
+
+import React, { useCallback, useState } from 'react';
+
+import { Button, Classes, Dialog, HTMLSelect, Intent, TextArea } from '@blueprintjs/core';
+
+import { apiFetch } from 'client/utils/apiFetch';
+
+const reasons: { value: UserCommunityFlagReason; label: string }[] = [
+	{ value: 'spam-content', label: 'Spam content' },
+	{ value: 'hateful-language', label: 'Hateful language' },
+	{ value: 'harassment', label: 'Harassment' },
+	{ value: 'impersonation', label: 'Impersonation' },
+	{ value: 'other', label: 'Other' },
+];
+
+type Props = {
+	isOpen: boolean;
+	onClose: () => void;
+	userId: string;
+	communityId: string;
+	discussionId?: string | null;
+	userName?: string;
+	onFlagged?: () => void;
+};
+
+const FlagUserDialog = (props: Props) => {
+	const { isOpen, onClose, userId, communityId, discussionId, userName, onFlagged } = props;
+	const [reason, setReason] = useState<UserCommunityFlagReason>('spam-content');
+	const [reasonText, setReasonText] = useState('');
+	const [isLoading, setIsLoading] = useState(false);
+	const [error, setError] = useState<string | null>(null);
+
+	const handleSubmit = useCallback(async () => {
+		setIsLoading(true);
+		setError(null);
+		try {
+			await apiFetch.post('/api/userCommunityFlags', {
+				userId,
+				communityId,
+				reason,
+				reasonText: reasonText.trim() || null,
+				sourceDiscussionId: discussionId ?? null,
+			});
+			onFlagged?.();
+			onClose();
+		} catch (err: any) {
+			setError(err?.message ?? 'Failed to flag user');
+		} finally {
+			setIsLoading(false);
+		}
+	}, [userId, communityId, reason, reasonText, discussionId, onFlagged, onClose]);
+
+	return (
+		<Dialog
+			isOpen={isOpen}
+			onClose={onClose}
+			title={`Flag user${userName ? `: ${userName}` : ''}`}
+		>
+			<div className={Classes.DIALOG_BODY}>
+				<label htmlFor="flag-reason">
+					Reason
+					<HTMLSelect
+						id="flag-reason"
+						value={reason}
+						onChange={(e) => setReason(e.target.value as UserCommunityFlagReason)}
+						fill
+					>
+						{reasons.map((r) => (
+							<option key={r.value} value={r.value}>
+								{r.label}
+							</option>
+						))}
+					</HTMLSelect>
+				</label>
+				<div style={{ marginTop: 10 }}>
+					<label htmlFor="flag-reason-text">
+						Details (optional)
+						<TextArea
+							id="flag-reason-text"
+							value={reasonText}
+							onChange={(e) => setReasonText(e.target.value)}
+							fill
+							rows={3}
+							placeholder="Provide additional context..."
+						/>
+					</label>
+				</div>
+				{error && (
+					<div style={{ color: 'var(--pt-intent-danger)', marginTop: 8, fontSize: 13 }}>
+						{error}
+					</div>
+				)}
+			</div>
+			<div className={Classes.DIALOG_FOOTER}>
+				<div className={Classes.DIALOG_FOOTER_ACTIONS}>
+					<Button text="Cancel" onClick={onClose} disabled={isLoading} />
+					<Button
+						text="Flag user"
+						intent={Intent.DANGER}
+						onClick={handleSubmit}
+						loading={isLoading}
+					/>
+				</div>
+			</div>
+		</Dialog>
+	);
+};
+
+export default FlagUserDialog;
diff --git a/client/components/index.ts b/client/components/index.ts
index 5a79c48567..2373ea95e3 100644
--- a/client/components/index.ts
+++ b/client/components/index.ts
@@ -39,6 +39,7 @@ export {
 	type FacetsState,
 } from './FacetsStateProvider';
 export { default as FileUploadButton } from './FileUploadButton/FileUploadButton';
+export { default as FlagUserDialog } from './FlagUserDialog/FlagUserDialog';
 export { default as Footer } from './Footer/Footer';
 export { default as FormattingBar } from './FormattingBar/FormattingBar';
 export { default as GlobalControls } from './GlobalControls';
diff --git a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
index cd21b75076..d7c3694e73 100644
--- a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
+++ b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
@@ -7,7 +7,7 @@ import classNames from 'classnames';
 import TimeAgo from 'react-timeago';
 
 import { apiFetch } from 'client/utils/apiFetch';
-import { Avatar, Icon, SpamStatusMenu } from 'components';
+import { Avatar, FlagUserDialog, Icon, SpamStatusMenu } from 'components';
 import Editor, { type EditorChangeObject, getJSON, getText, viewIsEmpty } from 'components/Editor';
 import { buttons, FormattingBar } from 'components/FormattingBar';
 import { usePageContext } from 'utils/hooks';
@@ -32,8 +32,9 @@ const ThreadComment = (props: Props) => {
 		isPreview = false,
 	} = props;
 	const { loginData, communityData, locationData, scopeData } = usePageContext();
-	const { isSuperAdmin } = scopeData.activePermissions;
+	const { isSuperAdmin, canAdminCommunity } = scopeData.activePermissions;
 	const [isEditing, setIsEditing] = useState(false);
+	const [isFlagDialogOpen, setIsFlagDialogOpen] = useState(false);
 	const [changeObject, setChangeObject] = useState<null | EditorChangeObject>(null);
 	const [isLoadingEdit, setIsLoadingEdit] = useState(false);
 	const handlePutThreadComment = (threadCommentUpdates) => {
@@ -182,6 +183,17 @@ const ThreadComment = (props: Props) => {
 								}}
 							/>
 						)}
+						{!isPreview &&
+							canAdminCommunity &&
+							threadCommentData.userId &&
+							threadCommentData.userId !== loginData.id && (
+								<Button
+									icon={<Icon icon="flag" iconSize={12} />}
+									minimal
+									small
+									onClick={() => setIsFlagDialogOpen(true)}
+								/>
+							)}
 						{!isPreview && isSuperAdmin && threadCommentData.userId && (
 							<SpamStatusMenu
 								userId={threadCommentData.userId}
@@ -245,6 +257,19 @@ const ThreadComment = (props: Props) => {
 					/>
 				)}
 			</div>
+			{canAdminCommunity && threadCommentData.userId && (
+				<FlagUserDialog
+					isOpen={isFlagDialogOpen}
+					onClose={() => setIsFlagDialogOpen(false)}
+					userId={threadCommentData.userId}
+					communityId={communityData.id}
+					discussionId={discussionData.id}
+					userName={threadCommentData.author?.fullName}
+					onFlagged={() => {
+						handleSpamStatusChanged('confirmed-spam');
+					}}
+				/>
+			)}
 		</div>
 	);
 };
diff --git a/server/apiRoutes.ts b/server/apiRoutes.ts
index ce67080f9e..8af21bb450 100644
--- a/server/apiRoutes.ts
+++ b/server/apiRoutes.ts
@@ -30,6 +30,7 @@ import { router as submissionWorkflowRouter } from './submissionWorkflow/api';
 import { router as subscribeRouter } from './subscribe/api';
 import { router as threadCommentRouter } from './threadComment/api';
 import { router as userRouter } from './user/api';
+import { router as userCommunityFlagRouter } from './userCommunityFlag/api';
 import { router as userDismissableRouter } from './userDismissable/api';
 import { router as userNotificationRouter } from './userNotification/api';
 import { router as userNotificationPreferencesRouter } from './userNotificationPreferences/api';
@@ -63,6 +64,7 @@ const apiRouter = Router()
 	.use(submissionRouter)
 	.use(threadCommentRouter)
 	.use(userRouter)
+	.use(userCommunityFlagRouter)
 	.use(userDismissableRouter)
 	.use(userNotificationRouter)
 	.use(userNotificationPreferencesRouter)
diff --git a/server/discussion/api.ts b/server/discussion/api.ts
index 7ec03c6d1d..4cbec050b7 100644
--- a/server/discussion/api.ts
+++ b/server/discussion/api.ts
@@ -1,5 +1,6 @@
 import { Router } from 'express';
 
+import { isUserFlaggedInCommunity } from 'server/userCommunityFlag/queries';
 import { verifyCaptchaPayload } from 'server/utils/captcha';
 import { BadRequestError, ForbiddenError } from 'server/utils/errors';
 import { handleHoneypotTriggered, isHoneypotFilled } from 'server/utils/honeypot';
@@ -33,6 +34,12 @@ router.post(
 			throw new ForbiddenError();
 		}
 		const userId = (req.user?.id as string) || null;
+		if (userId && req.body.communityId) {
+			const flagged = await isUserFlaggedInCommunity(userId, req.body.communityId);
+			if (flagged) {
+				throw new ForbiddenError();
+			}
+		}
 		const options = { ...req.body, userId };
 		const newDiscussion = await createDiscussion(options);
 		return res.status(201).json(newDiscussion);
@@ -47,6 +54,13 @@ router.post(
 		if (!canCreate) {
 			throw new ForbiddenError();
 		}
+		const formUserId = (req.user?.id as string) || null;
+		if (formUserId && req.body.communityId) {
+			const flagged = await isUserFlaggedInCommunity(formUserId, req.body.communityId);
+			if (flagged) {
+				throw new ForbiddenError();
+			}
+		}
 		if (isHoneypotFilled(req.body)) {
 			if (req.user?.id)
 				await handleHoneypotTriggered(
diff --git a/server/models.ts b/server/models.ts
index f684aede36..95c4d04c2e 100644
--- a/server/models.ts
+++ b/server/models.ts
@@ -56,6 +56,7 @@ import { Thread } from './thread/model';
 import { ThreadComment } from './threadComment/model';
 import { ThreadEvent } from './threadEvent/model';
 import { User } from './user/model';
+import { UserCommunityFlag } from './userCommunityFlag/model';
 import { UserDismissable } from './userDismissable/model';
 import { UserNotification } from './userNotification/model';
 import { UserNotificationPreferences } from './userNotificationPreferences/model';
@@ -115,6 +116,7 @@ sequelize.addModels([
 	ThreadComment,
 	ThreadEvent,
 	User,
+	UserCommunityFlag,
 	UserDismissable,
 	UserNotification,
 	UserNotificationPreferences,
@@ -207,6 +209,7 @@ export {
 	ThreadComment,
 	ThreadEvent,
 	User,
+	UserCommunityFlag,
 	UserDismissable,
 	UserNotification,
 	UserNotificationPreferences,
diff --git a/server/pub/api.ts b/server/pub/api.ts
index 2ce59f0504..09d16ba826 100644
--- a/server/pub/api.ts
+++ b/server/pub/api.ts
@@ -1,4 +1,4 @@
-import type { Express, Request } from 'express';
+import type { Request } from 'express';
 
 import type * as types from 'types';
 
diff --git a/server/pub/permissions.ts b/server/pub/permissions.ts
index 1a60c096d3..62aed904e2 100644
--- a/server/pub/permissions.ts
+++ b/server/pub/permissions.ts
@@ -1,6 +1,7 @@
 import type { CanCreatePub } from 'types';
 
 import { Community } from 'server/models';
+import { isUserFlaggedInCommunity } from 'server/userCommunityFlag/queries';
 import { getScope } from 'server/utils/queryHelpers';
 import { expect } from 'utils/assert';
 
@@ -38,9 +39,10 @@ export const canCreatePub = async ({
 			return { create: false };
 		}
 
-		const [scopeData, communityData] = await Promise.all([
+		const [scopeData, communityData, isFlagged] = await Promise.all([
 			getScope({ communityId, collectionId, loginId: userId }),
 			Community.findOne({ where: { id: communityId }, attributes: ['hideCreatePubButton'] }),
+			isUserFlaggedInCommunity(userId, communityId),
 		]);
 
 		const {
@@ -49,7 +51,7 @@ export const canCreatePub = async ({
 		const { hideCreatePubButton } = expect(communityData);
 
 		return {
-			create: canManage || !hideCreatePubButton,
+			create: !isFlagged && (canManage || !hideCreatePubButton),
 			collectionIds: [collectionId],
 		};
 	}
diff --git a/server/spamTag/notifications.ts b/server/spamTag/notifications.ts
index a90b1105d2..db428cfd69 100644
--- a/server/spamTag/notifications.ts
+++ b/server/spamTag/notifications.ts
@@ -1,4 +1,4 @@
-import type { SpamStatus, UserSpamTagFields } from 'types';
+import type { SpamStatus, UserCommunityFlagReason, UserSpamTagFields } from 'types';
 
 import {
 	sendBanDevEmail,
@@ -8,6 +8,7 @@ import {
 	sendSpamLiftedEmail,
 } from 'server/utils/email';
 import {
+	postToSlackAboutCommunityFlag,
 	postToSlackAboutNewUserSpamTag,
 	postToSlackAboutSuspiciousUpload,
 	postToSlackAboutUserBan,
@@ -19,7 +20,46 @@ export type SpamEvent =
 	| 'suspicious-upload'
 	| 'honeypot-ban'
 	| 'manual-ban'
-	| 'spam-lifted';
+	| 'spam-lifted'
+	| 'community-flag';
+
+type SharedContext = {
+	userId: string;
+	userEmail: string;
+	userName: string;
+	userSlug: string;
+	userAvatar?: string | null;
+};
+
+type NewSpamTagContext = SharedContext & {
+	spamScore?: number | null;
+	spamFields?: UserSpamTagFields;
+};
+
+type SuspiciousUploadContext = SharedContext & {
+	uploadKey: string;
+};
+
+type HoneypotBanContext = SharedContext & {};
+
+type ManualBanContext = SharedContext & {
+	spamFields?: UserSpamTagFields;
+	previousStatus?: SpamStatus | null;
+	actorName?: string;
+};
+
+type SpamLiftedContext = SharedContext & {
+	previousStatus?: SpamStatus | null;
+	actorName?: string;
+};
+
+type CommunityFlagContext = SharedContext & {
+	communityId: string;
+	sourceDiscussionId?: string | null;
+	flaggedById: string;
+	flagReason: UserCommunityFlagReason;
+	flagReasonText?: string | null;
+};
 
 export type SpamNotificationContext = {
 	userId: string;
@@ -34,11 +74,23 @@ export type SpamNotificationContext = {
 	uploadKey?: string;
 	communityId?: string;
 	sourceDiscussionId?: string | null;
+	flaggedById?: string;
+	flagReason?: UserCommunityFlagReason;
+	flagReasonText?: string | null;
 };
 
-type Handler = (ctx: SpamNotificationContext) => Promise<void>;
+type Handler<T extends SharedContext> = (ctx: T) => Promise<void>;
+
+type Contexts = {
+	'new-spam-tag': NewSpamTagContext;
+	'suspicious-upload': SuspiciousUploadContext;
+	'honeypot-ban': HoneypotBanContext;
+	'manual-ban': ManualBanContext;
+	'spam-lifted': SpamLiftedContext;
+	'community-flag': CommunityFlagContext;
+};
 
-const handlers: Record<SpamEvent, Handler[]> = {
+const handlers = {
 	'new-spam-tag': [
 		(ctx) =>
 			postToSlackAboutNewUserSpamTag({
@@ -55,7 +107,7 @@ const handlers: Record<SpamEvent, Handler[]> = {
 				ctx.userId,
 				ctx.userEmail,
 				ctx.userName,
-				ctx.uploadKey!,
+				ctx.uploadKey,
 			),
 	],
 	'honeypot-ban': [(ctx) => sendSpamBanEmail({ toEmail: ctx.userEmail, userName: ctx.userName })],
@@ -92,7 +144,18 @@ const handlers: Record<SpamEvent, Handler[]> = {
 			]);
 		},
 	],
-};
+	'community-flag': [
+		(ctx) =>
+			postToSlackAboutCommunityFlag({
+				userId: ctx.userId,
+				communityId: ctx.communityId,
+				flaggedById: ctx.flaggedById,
+				reason: ctx.flagReason,
+				reasonText: ctx.flagReasonText,
+				sourceDiscussionId: ctx.sourceDiscussionId,
+			}),
+	],
+} satisfies { [K in keyof Contexts]: Handler<Contexts[K]>[] };
 
 export const notify = async (event: SpamEvent, ctx: SpamNotificationContext): Promise<void> => {
 	const results = await Promise.allSettled(handlers[event].map((h) => h(ctx)));
diff --git a/server/threadComment/api.ts b/server/threadComment/api.ts
index e2a01b7cfb..7b04a89bd3 100644
--- a/server/threadComment/api.ts
+++ b/server/threadComment/api.ts
@@ -1,5 +1,6 @@
 import { Router } from 'express';
 
+import { isUserFlaggedInCommunity } from 'server/userCommunityFlag/queries';
 import { verifyCaptchaPayload } from 'server/utils/captcha';
 import { BadRequestError, ForbiddenError } from 'server/utils/errors';
 import { handleHoneypotTriggered, isHoneypotFilled } from 'server/utils/honeypot';
@@ -33,6 +34,12 @@ router.post(
 			throw new ForbiddenError();
 		}
 		const userId = (req.user?.id as string) || null;
+		if (userId && req.body.communityId) {
+			const flagged = await isUserFlaggedInCommunity(userId, req.body.communityId);
+			if (flagged) {
+				throw new ForbiddenError();
+			}
+		}
 		const options = { ...req.body, userId };
 		const newThreadComment = await createThreadComment(options);
 		return res.status(201).json(newThreadComment);
@@ -47,6 +54,13 @@ router.post(
 		if (!permissions.create) {
 			throw new ForbiddenError();
 		}
+		const formUserId = (req.user?.id as string) || null;
+		if (formUserId && req.body.communityId) {
+			const flagged = await isUserFlaggedInCommunity(formUserId, req.body.communityId);
+			if (flagged) {
+				throw new ForbiddenError();
+			}
+		}
 		if (isHoneypotFilled(req.body)) {
 			if (req.user?.id)
 				await handleHoneypotTriggered(
diff --git a/server/userCommunityFlag/api.ts b/server/userCommunityFlag/api.ts
new file mode 100644
index 0000000000..c674c48cb9
--- /dev/null
+++ b/server/userCommunityFlag/api.ts
@@ -0,0 +1,99 @@
+import { Router } from 'express';
+
+import { notify } from 'server/spamTag/notifications';
+import { canManipulateSpamTags } from 'server/spamTag/permissions';
+import { ForbiddenError, NotFoundError } from 'server/utils/errors';
+import { getScope } from 'server/utils/queryHelpers';
+import { wrap } from 'server/wrap';
+
+import {
+	createFlag,
+	getAllActiveFlags,
+	getFlagById,
+	getFlagsForCommunity,
+	updateFlagStatus,
+} from './queries';
+
+export const router = Router();
+
+router.post(
+	'/api/userCommunityFlags',
+	wrap(async (req, res) => {
+		const { userId, communityId, reason, reasonText, sourceDiscussionId } = req.body;
+		const flaggedById = req.user?.id;
+		if (!flaggedById || !userId || !communityId || !reason) {
+			return res.status(400).send({ error: 'Missing required fields' });
+		}
+
+		const scopeData = await getScope({ communityId, loginId: flaggedById });
+		if (!scopeData.activePermissions.canAdmin) {
+			throw new ForbiddenError();
+		}
+
+		const flag = await createFlag({
+			userId,
+			communityId,
+			flaggedById,
+			reason,
+			reasonText,
+			sourceDiscussionId,
+		});
+
+		notify('community-flag', {
+			userId,
+			userEmail: '',
+			userName: '',
+			userSlug: '',
+			communityId,
+			flaggedById,
+			flagReason: reason,
+			flagReasonText: reasonText,
+			sourceDiscussionId,
+		}).catch((err) => console.error('Failed to send community flag notification', err));
+
+		return res.status(201).json(flag);
+	}),
+);
+
+router.put(
+	'/api/userCommunityFlags/:id',
+	wrap(async (req, res) => {
+		const { status } = req.body;
+		const isSuperAdmin = await canManipulateSpamTags({ userId: req.user?.id });
+		if (!isSuperAdmin) {
+			throw new ForbiddenError();
+		}
+		const updated = await updateFlagStatus(req.params.id, status);
+		if (!updated) {
+			throw new NotFoundError();
+		}
+		return res.status(200).json(updated);
+	}),
+);
+
+router.get(
+	'/api/userCommunityFlags',
+	wrap(async (req, res) => {
+		const communityId = req.query.communityId as string | undefined;
+		const userId = req.user?.id;
+		if (!userId) {
+			throw new ForbiddenError();
+		}
+
+		if (communityId) {
+			const scopeData = await getScope({ communityId, loginId: userId });
+			if (!scopeData.activePermissions.canAdmin) {
+				throw new ForbiddenError();
+			}
+			const flags = await getFlagsForCommunity(communityId);
+			return res.status(200).json(flags);
+		}
+
+		const isSuperAdmin = await canManipulateSpamTags({ userId });
+		if (!isSuperAdmin) {
+			throw new ForbiddenError();
+		}
+		const flags = await getAllActiveFlags();
+		return res.status(200).json(flags);
+	}),
+);
diff --git a/server/userCommunityFlag/model.ts b/server/userCommunityFlag/model.ts
new file mode 100644
index 0000000000..0111e8110f
--- /dev/null
+++ b/server/userCommunityFlag/model.ts
@@ -0,0 +1,86 @@
+import type { CreationOptional, InferAttributes, InferCreationAttributes } from 'sequelize';
+
+import type { SerializedModel } from 'types';
+
+import {
+	AllowNull,
+	BelongsTo,
+	Column,
+	DataType,
+	Default,
+	Index,
+	Model,
+	PrimaryKey,
+	Table,
+} from 'sequelize-typescript';
+
+import { Community, Discussion, User } from '../models';
+
+export type UserCommunityFlagReason =
+	| 'spam-content'
+	| 'hateful-language'
+	| 'harassment'
+	| 'impersonation'
+	| 'other';
+
+export type UserCommunityFlagStatus = 'active' | 'dismissed' | 'escalated';
+
+@Table
+export class UserCommunityFlag extends Model<
+	InferAttributes<UserCommunityFlag>,
+	InferCreationAttributes<UserCommunityFlag>
+> {
+	public declare toJSON: <M extends Model>(this: M) => SerializedModel<M>;
+
+	@Default(DataType.UUIDV4)
+	@PrimaryKey
+	@Column(DataType.UUID)
+	declare id: CreationOptional<string>;
+
+	@AllowNull(false)
+	@Index
+	@Column(DataType.UUID)
+	declare userId: string;
+
+	@AllowNull(false)
+	@Index
+	@Column(DataType.UUID)
+	declare communityId: string;
+
+	@AllowNull(false)
+	@Column(DataType.UUID)
+	declare flaggedById: string;
+
+	@AllowNull(false)
+	@Column(
+		DataType.ENUM('spam-content', 'hateful-language', 'harassment', 'impersonation', 'other'),
+	)
+	declare reason: UserCommunityFlagReason;
+
+	@Column(DataType.TEXT)
+	declare reasonText: string | null;
+
+	@Column(DataType.UUID)
+	declare sourceDiscussionId: string | null;
+
+	@AllowNull(false)
+	@Default('active')
+	@Column(DataType.ENUM('active', 'dismissed', 'escalated'))
+	declare status: CreationOptional<UserCommunityFlagStatus>;
+
+	@BelongsTo(() => User, { onDelete: 'CASCADE', as: 'user', foreignKey: 'userId' })
+	declare user?: User;
+
+	@BelongsTo(() => Community, { onDelete: 'CASCADE', as: 'community', foreignKey: 'communityId' })
+	declare community?: Community;
+
+	@BelongsTo(() => User, { onDelete: 'CASCADE', as: 'flaggedBy', foreignKey: 'flaggedById' })
+	declare flaggedBy?: User;
+
+	@BelongsTo(() => Discussion, {
+		onDelete: 'SET NULL',
+		as: 'sourceDiscussion',
+		foreignKey: 'sourceDiscussionId',
+	})
+	declare sourceDiscussion?: Discussion;
+}
diff --git a/server/userCommunityFlag/queries.ts b/server/userCommunityFlag/queries.ts
new file mode 100644
index 0000000000..02853aedb1
--- /dev/null
+++ b/server/userCommunityFlag/queries.ts
@@ -0,0 +1,119 @@
+import type { UserCommunityFlagReason, UserCommunityFlagStatus } from 'types';
+
+import { Community, Discussion, User, UserCommunityFlag } from 'server/models';
+
+type CreateFlagOptions = {
+	userId: string;
+	communityId: string;
+	flaggedById: string;
+	reason: UserCommunityFlagReason;
+	reasonText?: string | null;
+	sourceDiscussionId?: string | null;
+};
+
+export const createFlag = async (options: CreateFlagOptions) => {
+	const { userId, communityId, flaggedById, reason, reasonText, sourceDiscussionId } = options;
+	const flag = await UserCommunityFlag.create({
+		userId,
+		communityId,
+		flaggedById,
+		reason,
+		reasonText: reasonText ?? null,
+		sourceDiscussionId: sourceDiscussionId ?? null,
+	});
+	return flag.toJSON();
+};
+
+export const updateFlagStatus = async (flagId: string, status: UserCommunityFlagStatus) => {
+	const flag = await UserCommunityFlag.findByPk(flagId);
+	if (!flag) return null;
+	await flag.update({ status });
+	return flag.toJSON();
+};
+
+export const getActiveFlagsForUserInCommunity = async (
+	userId: string,
+	communityId: string,
+): Promise<UserCommunityFlag[]> => {
+	return UserCommunityFlag.findAll({
+		where: { userId, communityId, status: 'active' },
+	});
+};
+
+export const getFlaggedUserIdsForCommunity = async (communityId: string): Promise<Set<string>> => {
+	const flags = await UserCommunityFlag.findAll({
+		where: { communityId, status: 'active' },
+		attributes: ['userId'],
+	});
+	return new Set(flags.map((f) => f.userId));
+};
+
+export const isUserFlaggedInCommunity = async (
+	userId: string,
+	communityId: string,
+): Promise<boolean> => {
+	const count = await UserCommunityFlag.count({
+		where: { userId, communityId, status: 'active' },
+	});
+	return count > 0;
+};
+
+export const getFlagsForCommunity = async (communityId: string) => {
+	return UserCommunityFlag.findAll({
+		where: { communityId },
+		order: [['createdAt', 'DESC']],
+		include: [
+			{ model: User, as: 'user', attributes: ['id', 'fullName', 'slug', 'email'] },
+			{ model: User, as: 'flaggedBy', attributes: ['id', 'fullName', 'slug'] },
+			{ model: Discussion, as: 'sourceDiscussion', attributes: ['id', 'title'] },
+		],
+	});
+};
+
+export const getAllActiveFlags = async () => {
+	return UserCommunityFlag.findAll({
+		where: { status: 'active' },
+		order: [['createdAt', 'DESC']],
+		include: [
+			{ model: User, as: 'user', attributes: ['id', 'fullName', 'slug', 'email'] },
+			{ model: User, as: 'flaggedBy', attributes: ['id', 'fullName', 'slug'] },
+			{ model: Community, as: 'community', attributes: ['id', 'subdomain'] },
+			{ model: Discussion, as: 'sourceDiscussion', attributes: ['id', 'title'] },
+		],
+	});
+};
+
+export const getFlagById = async (flagId: string) => {
+	return UserCommunityFlag.findByPk(flagId, {
+		include: [
+			{ model: User, as: 'user', attributes: ['id', 'fullName', 'slug', 'email'] },
+			{ model: User, as: 'flaggedBy', attributes: ['id', 'fullName', 'slug'] },
+			{ model: Community, as: 'community', attributes: ['id', 'subdomain'] },
+		],
+	});
+};
+
+export const getActiveFlagCountForUser = async (userId: string): Promise<number> => {
+	return UserCommunityFlag.count({
+		where: { userId, status: 'active' },
+	});
+};
+
+type FlagCheckResult = {
+	isFlagged: boolean;
+	flags: Array<{ communityId: string; reason: UserCommunityFlagReason }>;
+};
+
+export const getActiveFlagsForUser = async (userId: string): Promise<FlagCheckResult> => {
+	const flags = await UserCommunityFlag.findAll({
+		where: { userId, status: 'active' },
+		attributes: ['communityId', 'reason'],
+	});
+	return {
+		isFlagged: flags.length > 0,
+		flags: flags.map((f) => ({
+			communityId: f.communityId,
+			reason: f.reason,
+		})),
+	};
+};
diff --git a/server/utils/queryHelpers/discussionsSanitize.ts b/server/utils/queryHelpers/discussionsSanitize.ts
index 197c7bd043..ed0bf73a0c 100644
--- a/server/utils/queryHelpers/discussionsSanitize.ts
+++ b/server/utils/queryHelpers/discussionsSanitize.ts
@@ -4,29 +4,48 @@ const isAuthorSpam = (author: { spamTag?: { status?: string } } | null) => {
 	return author?.spamTag?.status === 'confirmed-spam';
 };
 
-export default (discussions, activePermissions, loginId) => {
+const isAuthorFlagged = (author: { id?: string } | null, flaggedUserIds?: Set<string>) => {
+	if (!flaggedUserIds || !author?.id) return false;
+	return flaggedUserIds.has(author.id);
+};
+
+const isHidden = (
+	author: { id?: string; spamTag?: { status?: string } } | null,
+	flaggedUserIds?: Set<string>,
+) => isAuthorSpam(author) || isAuthorFlagged(author, flaggedUserIds);
+
+type SanitizeOptions = {
+	flaggedUserIds?: Set<string>;
+};
+
+export default (
+	discussions: any[],
+	activePermissions: any,
+	loginId: string | null,
+	options?: SanitizeOptions,
+) => {
 	const { canAdmin } = activePermissions;
+	const { flaggedUserIds } = options ?? {};
 	const afterVisibility = sanitizeOnVisibility(discussions, activePermissions, loginId);
 
 	return afterVisibility
 		.filter((discussion) => {
-			if (!isAuthorSpam(discussion.author)) {
+			if (!isHidden(discussion.author, flaggedUserIds)) {
 				return true;
 			}
 			return canAdmin;
 		})
 		.map((discussion) => {
-			const discussionAuthorSpam = isAuthorSpam(discussion.author);
+			const hidden = isHidden(discussion.author, flaggedUserIds);
 			const comments = (discussion.thread?.comments ?? [])
 				.filter((comment) => {
-					if (!isAuthorSpam(comment.author)) {
+					if (!isHidden(comment.author, flaggedUserIds)) {
 						return true;
 					}
 					return canAdmin;
 				})
 				.map((comment) => {
-					const commentAuthorSpam = isAuthorSpam(comment.author);
-					if (!commentAuthorSpam) {
+					if (!isHidden(comment.author, flaggedUserIds)) {
 						return comment;
 					}
 					return { ...comment, isAuthorSpam: true };
@@ -34,7 +53,7 @@ export default (discussions, activePermissions, loginId) => {
 
 			return {
 				...discussion,
-				...(discussionAuthorSpam && { isAuthorSpam: true }),
+				...(hidden && { isAuthorSpam: true }),
 				thread: {
 					...discussion.thread,
 					comments,
diff --git a/server/utils/queryHelpers/pubGet.ts b/server/utils/queryHelpers/pubGet.ts
index 1c19a804f5..0a2eedf903 100644
--- a/server/utils/queryHelpers/pubGet.ts
+++ b/server/utils/queryHelpers/pubGet.ts
@@ -3,6 +3,7 @@ import type { InitialData, PubGetOptions, SanitizedPubData } from 'types';
 
 import { fetchFacetsForScope } from 'server/facets';
 import { Pub } from 'server/models';
+import { getFlaggedUserIdsForCommunity } from 'server/userCommunityFlag/queries';
 import { expect } from 'utils/assert';
 
 import { createLogger } from './communityGet';
@@ -79,12 +80,15 @@ export const getPubForRequest = async (options: GetPubForRequestOptions) => {
 	const communityId = initialData.communityData.id;
 	const { log, end } = createLogger('getPubForRequest');
 
-	const pubData = await log('getPub', getPub({ slug, communityId }, pubGetOptions));
+	const [pubData, flaggedUserIds] = await Promise.all([
+		log('getPub', getPub({ slug, communityId }, pubGetOptions)),
+		log('getFlaggedUsers', getFlaggedUserIdsForCommunity(communityId)),
+	]);
 
 	const sanitized = await log(
 		'sanitizePub',
 		new Promise<null | SanitizedPubData>((resolve) => {
-			resolve(sanitizePub(pubData, initialData, releaseNumber));
+			resolve(sanitizePub(pubData, initialData, releaseNumber, { flaggedUserIds }));
 		}),
 	);
 
diff --git a/server/utils/queryHelpers/pubSanitize.ts b/server/utils/queryHelpers/pubSanitize.ts
index 9c3c72b6f4..41994b97ee 100644
--- a/server/utils/queryHelpers/pubSanitize.ts
+++ b/server/utils/queryHelpers/pubSanitize.ts
@@ -33,10 +33,15 @@ const getFilteredExports = (pubData, isRelease) => {
 	return exports.filter((exp) => releaseHistoryKeys.has(exp.historyKey));
 };
 
+type SanitizeOptions = {
+	flaggedUserIds?: Set<string>;
+};
+
 export default (
 	pubData,
 	initialData,
 	releaseNumber: number | null = null,
+	options?: SanitizeOptions,
 ): null | SanitizedPubData => {
 	const { loginData, scopeData } = initialData;
 	const { activePermissions } = scopeData;
@@ -90,6 +95,7 @@ export default (
 			filterDiscussionsByDraftOrRelease(pubData.discussions, isRelease),
 			activePermissions,
 			loginData.id,
+			{ flaggedUserIds: options?.flaggedUserIds },
 		);
 	const reviews =
 		pubData.reviews && sanitizeReviews(pubData.reviews, activePermissions, loginData.id);
diff --git a/server/utils/slack.ts b/server/utils/slack.ts
index 7b66f48b60..b12324eb55 100644
--- a/server/utils/slack.ts
+++ b/server/utils/slack.ts
@@ -1,4 +1,6 @@
-import type { SpamStatus, UserSpamTagFields } from 'types';
+import type { SpamStatus, UserCommunityFlagReason, UserSpamTagFields } from 'types';
+
+import fetch from 'node-fetch';
 
 import { isDangerousSpamScore } from 'server/spamTag/communityScore';
 import { isProd } from 'utils/environment';
@@ -411,3 +413,78 @@ export const postToSlackAboutNewUserSpamTag = async (opts: NewSpamTagSlackOption
 		],
 	});
 };
+
+type CommunityFlagSlackOptions = {
+	userId: string;
+	flaggedById: string;
+	communityId: string;
+	reason: UserCommunityFlagReason;
+	reasonText?: string | null;
+	sourceDiscussionId?: string | null;
+};
+
+export const postToSlackAboutCommunityFlag = async (opts: CommunityFlagSlackOptions) => {
+	if (process.env.NODE_ENV === 'test') return;
+	const { User, Community, Discussion, Pub } = await import('server/models');
+	const [user, flagger, community, discussion] = await Promise.all([
+		User.findByPk(opts.userId, { attributes: ['fullName', 'slug'] }),
+		User.findByPk(opts.flaggedById, { attributes: ['fullName', 'slug'] }),
+		Community.findByPk(opts.communityId, { attributes: ['subdomain'] }),
+		opts.sourceDiscussionId
+			? Discussion.findByPk(opts.sourceDiscussionId, {
+					attributes: ['id', 'title', 'pubId'],
+					include: [{ model: Pub, as: 'pub', attributes: ['slug'] }],
+				})
+			: null,
+	]);
+	const userName = user?.fullName ?? 'Unknown user';
+	const userSlug = user?.slug ?? '';
+	const flaggerName = flagger?.fullName ?? 'Unknown admin';
+	const subdomain = community?.subdomain ?? 'unknown';
+	const profileUrl = getUserProfileUrl(userSlug);
+	const dashUrl = getSpamDashUrl(userName);
+
+	const reasonLabel = opts.reason.replace(/-/g, ' ');
+	const extraReason = opts.reasonText ? `: ${opts.reasonText}` : '';
+	let discussionLink = '';
+	if (discussion) {
+		const pub = (discussion as any).pub;
+		if (pub?.slug) {
+			discussionLink = `\nDiscussion: https://${subdomain}.pubpub.org/pub/${pub.slug}`;
+		}
+	}
+
+	const headline =
+		`*<${profileUrl}|${userName}>* flagged by ${flaggerName} in *${subdomain}*` +
+		`\nReason: ${reasonLabel}${extraReason}${discussionLink}`;
+	const fallback = `${userName} flagged by ${flaggerName} in ${subdomain} for ${reasonLabel}`;
+
+	await postToSlack({
+		icon_emoji: ':triangular_flag_on_post:',
+		text: fallback,
+		attachments: [
+			{
+				fallback,
+				color: '#e67e22',
+				blocks: [
+					{ type: 'section', text: { type: 'mrkdwn', text: headline } },
+					{
+						type: 'actions',
+						elements: [
+							{
+								type: 'button',
+								text: { type: 'plain_text', text: 'User Profile' },
+								url: profileUrl,
+							},
+							{
+								type: 'button',
+								text: { type: 'plain_text', text: 'Spam Dashboard' },
+								url: dashUrl,
+							},
+						],
+					},
+				],
+			},
+		],
+	});
+};
diff --git a/tools/migrations/2026_03_04_createUserCommunityFlags.js b/tools/migrations/2026_03_04_createUserCommunityFlags.js
new file mode 100644
index 0000000000..fa3e1af8c2
--- /dev/null
+++ b/tools/migrations/2026_03_04_createUserCommunityFlags.js
@@ -0,0 +1,62 @@
+export const up = async ({ Sequelize, sequelize }) => {
+	await sequelize.queryInterface.createTable('UserCommunityFlags', {
+		id: {
+			type: Sequelize.UUID,
+			primaryKey: true,
+			defaultValue: Sequelize.UUIDV4,
+		},
+		userId: {
+			type: Sequelize.UUID,
+			allowNull: false,
+			references: { model: 'Users', key: 'id' },
+			onDelete: 'CASCADE',
+		},
+		communityId: {
+			type: Sequelize.UUID,
+			allowNull: false,
+			references: { model: 'Communities', key: 'id' },
+			onDelete: 'CASCADE',
+		},
+		flaggedById: {
+			type: Sequelize.UUID,
+			allowNull: false,
+			references: { model: 'Users', key: 'id' },
+			onDelete: 'CASCADE',
+		},
+		reason: {
+			type: Sequelize.ENUM('spam-content', 'hateful-language', 'harassment', 'impersonation', 'other'),
+			allowNull: false,
+		},
+		reasonText: {
+			type: Sequelize.TEXT,
+			allowNull: true,
+		},
+		sourceDiscussionId: {
+			type: Sequelize.UUID,
+			allowNull: true,
+			references: { model: 'Discussions', key: 'id' },
+			onDelete: 'SET NULL',
+		},
+		status: {
+			type: Sequelize.ENUM('active', 'dismissed', 'escalated'),
+			allowNull: false,
+			defaultValue: 'active',
+		},
+		createdAt: {
+			type: Sequelize.DATE,
+			allowNull: false,
+		},
+		updatedAt: {
+			type: Sequelize.DATE,
+			allowNull: false,
+		},
+	});
+
+	await sequelize.queryInterface.addIndex('UserCommunityFlags', ['userId']);
+	await sequelize.queryInterface.addIndex('UserCommunityFlags', ['communityId']);
+	await sequelize.queryInterface.addIndex('UserCommunityFlags', ['userId', 'communityId']);
+};
+
+export const down = async ({ sequelize }) => {
+	await sequelize.queryInterface.dropTable('UserCommunityFlags');
+};
diff --git a/types/spam.ts b/types/spam.ts
index 6c68766071..a322ee9ace 100644
--- a/types/spam.ts
+++ b/types/spam.ts
@@ -91,6 +91,31 @@ export type HoneypotContext = {
 	content?: string;
 };
 
+export type UserCommunityFlagReason =
+	| 'spam-content'
+	| 'hateful-language'
+	| 'harassment'
+	| 'impersonation'
+	| 'other';
+
+export type UserCommunityFlagStatus = 'active' | 'dismissed' | 'escalated';
+
+export type SerializedUserCommunityFlag = {
+	id: string;
+	userId: string;
+	communityId: string;
+	flaggedById: string;
+	reason: UserCommunityFlagReason;
+	reasonText: string | null;
+	sourceDiscussionId: string | null;
+	status: UserCommunityFlagStatus;
+	createdAt: string;
+	updatedAt: string;
+	user?: { fullName: string; slug: string; email?: string };
+	flaggedBy?: { fullName: string; slug: string };
+	community?: { subdomain: string };
+};
+
 export type UserSpamTagFields = {
 	suspiciousFiles?: string[];
 	suspiciousComments?: string[];

From 435dc4fff638682cdccfe51269e3002e3e55d8f5 Mon Sep 17 00:00:00 2001
From: "Thomas F. K. Jorna" <hello@tefkah.com>
Date: Wed, 4 Mar 2026 21:16:37 +0100
Subject: [PATCH 02/10] fix: flagging, and big improvements to userdash

---
 .../FlagUserDialog/FlagUserDialog.tsx         |  52 +-
 .../PubDiscussions/Discussion/Discussion.tsx  |   4 +-
 .../Discussion/ThreadComment.tsx              | 115 +++-
 .../Discussion/threadComment.scss             |  32 ++
 .../SuperAdminDashboard/UserSpam/UserSpam.tsx | 544 ++++++++++++------
 .../UserSpam/UserSpamEntry.tsx                | 202 +++++--
 .../SuperAdminDashboard/UserSpam/filters.ts   |  11 +-
 .../SuperAdminDashboard/UserSpam/types.ts     |   3 +-
 .../UserSpam/useSpamUsers.ts                  |   4 +-
 .../UserSpam/userSpam.scss                    | 191 +++---
 .../UserSpam/userSpamEntry.scss               | 284 +++++----
 server/apiRoutes.ts                           |   4 +-
 .../__tests__/api.test.ts                     | 179 ++++++
 server/communityModerationReport/api.ts       | 135 +++++
 .../model.ts                                  |  26 +-
 server/communityModerationReport/queries.ts   | 149 +++++
 server/discussion/api.ts                      |   6 +-
 server/models.ts                              |  12 +-
 server/pub/permissions.ts                     |   8 +-
 server/routes/superAdminDashboard.tsx         |  24 +-
 server/spamTag/api.ts                         |  56 ++
 server/spamTag/notifications.ts               |  57 +-
 server/spamTag/userDashboard.ts               | 104 +++-
 server/threadComment/api.ts                   |   6 +-
 server/userCommunityFlag/api.ts               |  99 ----
 server/userCommunityFlag/queries.ts           | 119 ----
 server/utils/email/spam.ts                    |  54 +-
 .../utils/queryHelpers/discussionsSanitize.ts |  48 +-
 server/utils/queryHelpers/pubGet.ts           |  17 +-
 server/utils/queryHelpers/pubSanitize.ts      |   8 +-
 server/utils/slack.ts                         |   4 +-
 .../2026_03_04_createUserCommunityFlags.js    |  62 --
 types/spam.ts                                 |  39 +-
 33 files changed, 1852 insertions(+), 806 deletions(-)
 create mode 100644 server/communityModerationReport/__tests__/api.test.ts
 create mode 100644 server/communityModerationReport/api.ts
 rename server/{userCommunityFlag => communityModerationReport}/model.ts (68%)
 create mode 100644 server/communityModerationReport/queries.ts
 delete mode 100644 server/userCommunityFlag/api.ts
 delete mode 100644 server/userCommunityFlag/queries.ts
 delete mode 100644 tools/migrations/2026_03_04_createUserCommunityFlags.js

diff --git a/client/components/FlagUserDialog/FlagUserDialog.tsx b/client/components/FlagUserDialog/FlagUserDialog.tsx
index 113e02674a..e16cb1878a 100644
--- a/client/components/FlagUserDialog/FlagUserDialog.tsx
+++ b/client/components/FlagUserDialog/FlagUserDialog.tsx
@@ -1,12 +1,12 @@
-import type { UserCommunityFlagReason } from 'types';
+import type { ModerationReportReason } from 'types';
 
 import React, { useCallback, useState } from 'react';
 
-import { Button, Classes, Dialog, HTMLSelect, Intent, TextArea } from '@blueprintjs/core';
+import { Button, Callout, Classes, Dialog, HTMLSelect, Intent, TextArea } from '@blueprintjs/core';
 
 import { apiFetch } from 'client/utils/apiFetch';
 
-const reasons: { value: UserCommunityFlagReason; label: string }[] = [
+const reasons: { value: ModerationReportReason; label: string }[] = [
 	{ value: 'spam-content', label: 'Spam content' },
 	{ value: 'hateful-language', label: 'Hateful language' },
 	{ value: 'harassment', label: 'Harassment' },
@@ -26,7 +26,7 @@ type Props = {
 
 const FlagUserDialog = (props: Props) => {
 	const { isOpen, onClose, userId, communityId, discussionId, userName, onFlagged } = props;
-	const [reason, setReason] = useState<UserCommunityFlagReason>('spam-content');
+	const [reason, setReason] = useState<ModerationReportReason>('spam-content');
 	const [reasonText, setReasonText] = useState('');
 	const [isLoading, setIsLoading] = useState(false);
 	const [error, setError] = useState<string | null>(null);
@@ -35,7 +35,7 @@ const FlagUserDialog = (props: Props) => {
 		setIsLoading(true);
 		setError(null);
 		try {
-			await apiFetch.post('/api/userCommunityFlags', {
+			await apiFetch.post('/api/communityModerationReports', {
 				userId,
 				communityId,
 				reason,
@@ -56,15 +56,26 @@ const FlagUserDialog = (props: Props) => {
 			isOpen={isOpen}
 			onClose={onClose}
 			title={`Flag user${userName ? `: ${userName}` : ''}`}
+			style={{ width: 480 }}
 		>
 			<div className={Classes.DIALOG_BODY}>
-				<label htmlFor="flag-reason">
-					Reason
+				<Callout intent={Intent.WARNING} style={{ marginBottom: 16 }}>
+					Flagging this user will hide all of their discussions and comments in your
+					community. They will not be able to create pubs, edit, or create comments. They
+					may still be able to perform other actions if you have given them permissions
+					through memberships. We aim to evaluate flagged users and will send you a
+					follow-up via email.
+				</Callout>
+				<div style={{ marginBottom: 12 }}>
+					<label htmlFor="flag-reason" style={{ fontWeight: 500, fontSize: 14 }}>
+						Reason
+					</label>
 					<HTMLSelect
 						id="flag-reason"
 						value={reason}
-						onChange={(e) => setReason(e.target.value as UserCommunityFlagReason)}
+						onChange={(e) => setReason(e.target.value as ModerationReportReason)}
 						fill
+						style={{ marginTop: 4 }}
 					>
 						{reasons.map((r) => (
 							<option key={r.value} value={r.value}>
@@ -72,19 +83,20 @@ const FlagUserDialog = (props: Props) => {
 							</option>
 						))}
 					</HTMLSelect>
-				</label>
-				<div style={{ marginTop: 10 }}>
-					<label htmlFor="flag-reason-text">
+				</div>
+				<div>
+					<label htmlFor="flag-reason-text" style={{ fontWeight: 500, fontSize: 14 }}>
 						Details (optional)
-						<TextArea
-							id="flag-reason-text"
-							value={reasonText}
-							onChange={(e) => setReasonText(e.target.value)}
-							fill
-							rows={3}
-							placeholder="Provide additional context..."
-						/>
 					</label>
+					<TextArea
+						id="flag-reason-text"
+						value={reasonText}
+						onChange={(e) => setReasonText(e.target.value)}
+						fill
+						rows={3}
+						placeholder="Provide additional context..."
+						style={{ marginTop: 4 }}
+					/>
 				</div>
 				{error && (
 					<div style={{ color: 'var(--pt-intent-danger)', marginTop: 8, fontSize: 13 }}>
@@ -97,7 +109,7 @@ const FlagUserDialog = (props: Props) => {
 					<Button text="Cancel" onClick={onClose} disabled={isLoading} />
 					<Button
 						text="Flag user"
-						intent={Intent.DANGER}
+						intent={Intent.WARNING}
 						onClick={handleSubmit}
 						loading={isLoading}
 					/>
diff --git a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/Discussion.tsx b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/Discussion.tsx
index d7a4632791..1db01f9644 100644
--- a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/Discussion.tsx
+++ b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/Discussion.tsx
@@ -200,9 +200,7 @@ const Discussion = (props: Props) => {
 	};
 
 	const renderInput = () => {
-		if (!canReply) {
-			return null;
-		}
+		if (!canReply) return null;
 		return (
 			<DiscussionInput
 				key={discussionData.thread.comments.length}
diff --git a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
index d7c3694e73..ea6a126457 100644
--- a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
+++ b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
@@ -37,6 +37,8 @@ const ThreadComment = (props: Props) => {
 	const [isFlagDialogOpen, setIsFlagDialogOpen] = useState(false);
 	const [changeObject, setChangeObject] = useState<null | EditorChangeObject>(null);
 	const [isLoadingEdit, setIsLoadingEdit] = useState(false);
+	const [isRetracting, setIsRetracting] = useState(false);
+
 	const handlePutThreadComment = (threadCommentUpdates) => {
 		return apiFetch('/api/threadComment', {
 			method: 'PUT',
@@ -97,6 +99,67 @@ const ThreadComment = (props: Props) => {
 		[threadCommentData.userId, pubData.discussions, updateLocalData],
 	);
 
+	const handleFlagged = useCallback(() => {
+		const targetUserId = threadCommentData.userId;
+		updateLocalData('pub', {
+			discussions: pubData.discussions.map((discussion) => ({
+				...discussion,
+				...(discussion.userId === targetUserId && {
+					isAuthorFlagged: true,
+				}),
+				thread: {
+					...discussion.thread,
+					comments: discussion.thread.comments.map((comment) => {
+						if (comment.userId === targetUserId) {
+							return { ...comment, isAuthorFlagged: true };
+						}
+						return comment;
+					}),
+				},
+			})),
+		});
+	}, [threadCommentData.userId, pubData.discussions, updateLocalData]);
+
+	const handleRetractFlag = useCallback(async () => {
+		const reportIds: string[] | undefined = threadCommentData.moderationReportIds;
+		if (!reportIds?.length) return;
+		setIsRetracting(true);
+		try {
+			await Promise.all(
+				reportIds.map((id) =>
+					apiFetch.put(`/api/communityModerationReports/${id}`, {
+						status: 'retracted',
+					}),
+				),
+			);
+			const targetUserId = threadCommentData.userId;
+			updateLocalData('pub', {
+				discussions: pubData.discussions.map((discussion) => ({
+					...discussion,
+					...(discussion.userId === targetUserId && {
+						isAuthorFlagged: undefined,
+						moderationReportIds: undefined,
+					}),
+					thread: {
+						...discussion.thread,
+						comments: discussion.thread.comments.map((comment) => {
+							if (comment.userId === targetUserId) {
+								return {
+									...comment,
+									isAuthorFlagged: undefined,
+									moderationReportIds: undefined,
+								};
+							}
+							return comment;
+						}),
+					},
+				})),
+			});
+		} finally {
+			setIsRetracting(false);
+		}
+	}, [threadCommentData, pubData.discussions, updateLocalData]);
+
 	const isAuthor = loginData.id === threadCommentData.userId;
 	const renderText = (
 		key: string,
@@ -114,12 +177,22 @@ const ThreadComment = (props: Props) => {
 	};
 	const commenterName = discussionData.commenter?.name ?? threadCommentData.commenter?.name;
 	const isAuthorSpam = !!threadCommentData.isAuthorSpam;
+	const isAuthorFlagged = !!threadCommentData.isAuthorFlagged;
+	const showFlagButton =
+		!isPreview &&
+		canAdminCommunity &&
+		threadCommentData.userId &&
+		threadCommentData.userId !== loginData.id &&
+		!isAuthorFlagged;
+	const showUnflagButton = !isPreview && canAdminCommunity && isAuthorFlagged;
+
 	return (
 		<div
 			className={classNames(
 				'thread-comment-component',
 				isPreview && 'is-preview',
 				isAuthorSpam && 'is-spam',
+				isAuthorFlagged && !isAuthorSpam && 'is-flagged',
 			)}
 		>
 			<div className="avatar-wrapper">
@@ -142,6 +215,9 @@ const ThreadComment = (props: Props) => {
 							? threadCommentData.author.fullName
 							: (commenterName ?? 'anonymous')}
 						{isAuthorSpam && isPreview && <span className="spam-badge">Spam</span>}
+						{isAuthorFlagged && !isAuthorSpam && isPreview && (
+							<span className="flagged-badge">Flagged</span>
+						)}
 						{isPreview ? ': ' : ''}
 					</span>
 
@@ -183,17 +259,24 @@ const ThreadComment = (props: Props) => {
 								}}
 							/>
 						)}
-						{!isPreview &&
-							canAdminCommunity &&
-							threadCommentData.userId &&
-							threadCommentData.userId !== loginData.id && (
-								<Button
-									icon={<Icon icon="flag" iconSize={12} />}
-									minimal
-									small
-									onClick={() => setIsFlagDialogOpen(true)}
-								/>
-							)}
+						{showFlagButton && (
+							<Button
+								icon={<Icon icon="flag" iconSize={12} />}
+								minimal
+								small
+								onClick={() => setIsFlagDialogOpen(true)}
+							/>
+						)}
+						{showUnflagButton && (
+							<Button
+								icon={<Icon icon="flag" iconSize={12} />}
+								text="Unflag"
+								minimal
+								small
+								loading={isRetracting}
+								onClick={handleRetractFlag}
+							/>
+						)}
 						{!isPreview && isSuperAdmin && threadCommentData.userId && (
 							<SpamStatusMenu
 								userId={threadCommentData.userId}
@@ -208,6 +291,12 @@ const ThreadComment = (props: Props) => {
 						see this comment. You can safely remove it.
 					</div>
 				)}
+				{!isPreview && isAuthorFlagged && !isAuthorSpam && (
+					<div className="thread-comment-flagged-banner">
+						This user has been flagged by a community admin. Only you and other admins
+						can see this content.
+					</div>
+				)}
 				{!isPreview && (
 					<div
 						className={classNames({
@@ -265,9 +354,7 @@ const ThreadComment = (props: Props) => {
 					communityId={communityData.id}
 					discussionId={discussionData.id}
 					userName={threadCommentData.author?.fullName}
-					onFlagged={() => {
-						handleSpamStatusChanged('confirmed-spam');
-					}}
+					onFlagged={handleFlagged}
 				/>
 			)}
 		</div>
diff --git a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/threadComment.scss b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/threadComment.scss
index f25ff63fb1..c3d44b58a5 100644
--- a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/threadComment.scss
+++ b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/threadComment.scss
@@ -16,6 +16,14 @@
 		padding-left: 0.5em;
 		background: rgba(217, 83, 79, 0.03);
 	}
+	&.is-flagged {
+		.discussion-body-wrapper {
+			opacity: 0.9;
+		}
+		border-left: 3px solid #e8a317;
+		padding-left: 0.5em;
+		background: rgba(232, 163, 23, 0.03);
+	}
 	.spam-badge {
 		display: inline-block;
 		font-size: 10px;
@@ -30,6 +38,20 @@
 		text-transform: uppercase;
 		letter-spacing: 0.5px;
 	}
+	.flagged-badge {
+		display: inline-block;
+		font-size: 10px;
+		font-weight: 600;
+		line-height: 1;
+		padding: 2px 5px;
+		margin-left: 4px;
+		background: #e8a317;
+		color: white;
+		border-radius: 2px;
+		vertical-align: middle;
+		text-transform: uppercase;
+		letter-spacing: 0.5px;
+	}
 	.thread-comment-spam-banner {
 		width: 100%;
 		margin-bottom: 0.5em;
@@ -40,6 +62,16 @@
 		border-radius: 2px;
 		border-left: 3px solid #ffc107;
 	}
+	.thread-comment-flagged-banner {
+		width: 100%;
+		margin-bottom: 0.5em;
+		padding: 0.4em 0.6em;
+		font-size: 12px;
+		background: #fff8e1;
+		color: #8d6e08;
+		border-radius: 2px;
+		border-left: 3px solid #e8a317;
+	}
 	&.is-preview {
 		.content-wrapper {
 			margin-bottom: 0;
diff --git a/client/containers/SuperAdminDashboard/UserSpam/UserSpam.tsx b/client/containers/SuperAdminDashboard/UserSpam/UserSpam.tsx
index 58731cef62..deb7ebb386 100644
--- a/client/containers/SuperAdminDashboard/UserSpam/UserSpam.tsx
+++ b/client/containers/SuperAdminDashboard/UserSpam/UserSpam.tsx
@@ -1,13 +1,14 @@
-import type { SpamUserQueryOrdering } from 'types';
+import type { SpamFieldsFilterKey, SpamUserQueryOrdering } from 'types';
 
 import type { SpamUsersFilter } from './filters';
 import type { SpamUser } from './types';
 
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
 
-import { Button, ButtonGroup, HTMLSelect, Spinner } from '@blueprintjs/core';
+import { Button, ButtonGroup, Checkbox, HTMLSelect, Spinner } from '@blueprintjs/core';
 import { useDebounce, useUpdateEffect } from 'react-use';
 
+import { Popover } from 'client/components';
 import { OverviewSearchGroup } from 'client/containers/DashboardOverview/helpers';
 import { useInfiniteScroll } from 'client/utils/useInfiniteScroll';
 
@@ -35,6 +36,13 @@ const sortOptions = [
 	{ value: 'spam-score:ASC', label: 'Lowest spam score' },
 ];
 
+const spamFieldOptions: { key: SpamFieldsFilterKey; label: string }[] = [
+	{ key: 'honeypotTriggers', label: 'Honeypot triggers' },
+	{ key: 'suspiciousFiles', label: 'Suspicious files' },
+	{ key: 'suspiciousComments', label: 'Suspicious comments' },
+	{ key: 'manuallyMarkedBy', label: 'Manually marked' },
+];
+
 type DatePreset = { label: string; days: number };
 
 const datePresets: DatePreset[] = [
@@ -62,26 +70,95 @@ const parseSort = (value: string): SpamUserQueryOrdering => {
 	return { field, direction } as SpamUserQueryOrdering;
 };
 
+const readUrlParams = () => {
+	if (typeof window === 'undefined') return {};
+	const params = new URLSearchParams(window.location.search);
+	const get = (key: string) => params.get(key) || undefined;
+	return {
+		q: get('q'),
+		filter: get('filter'),
+		sort: get('sort'),
+		community: get('community'),
+		createdAfter: get('createdAfter'),
+		createdBefore: get('createdBefore'),
+		activeAfter: get('activeAfter'),
+		activeBefore: get('activeBefore'),
+		minActivities: get('minActivities'),
+		maxActivities: get('maxActivities'),
+		spamFields: get('spamFields'),
+	};
+};
+
+const buildUrlParams = (state: {
+	searchTerm: string;
+	filterId: string;
+	ordering: SpamUserQueryOrdering;
+	communitySubdomain: string;
+	createdAfter?: string;
+	createdBefore?: string;
+	activeAfter?: string;
+	activeBefore?: string;
+	minActivities?: number;
+	maxActivities?: number;
+	spamFieldsFilter?: SpamFieldsFilterKey[];
+}) => {
+	const params = new URLSearchParams();
+	if (state.searchTerm) params.set('q', state.searchTerm);
+	if (state.filterId && state.filterId !== 'all') params.set('filter', state.filterId);
+	const sortStr = `${state.ordering.field}:${state.ordering.direction}`;
+	const defaultSort = `${(filtersById[state.filterId] ?? filtersById.all).query!.ordering.field}:${(filtersById[state.filterId] ?? filtersById.all).query!.ordering.direction}`;
+	if (sortStr !== defaultSort) params.set('sort', sortStr);
+	if (state.communitySubdomain) params.set('community', state.communitySubdomain);
+	if (state.createdAfter) params.set('createdAfter', state.createdAfter);
+	if (state.createdBefore) params.set('createdBefore', state.createdBefore);
+	if (state.activeAfter) params.set('activeAfter', state.activeAfter);
+	if (state.activeBefore) params.set('activeBefore', state.activeBefore);
+	if (state.minActivities != null) params.set('minActivities', String(state.minActivities));
+	if (state.maxActivities != null) params.set('maxActivities', String(state.maxActivities));
+	if (state.spamFieldsFilter?.length) params.set('spamFields', state.spamFieldsFilter.join(','));
+	const qs = params.toString();
+	return qs ? `?${qs}` : '';
+};
+
 const UserSpam = (props: Props) => {
 	const { users: initialUsers, searchTerm: initialSearchTerm } = props;
-	const [filter, setFilter] = useState(filtersById.all);
+	const urlParams = useRef(readUrlParams()).current;
+
+	const initialFilterId = urlParams.filter ?? 'all';
+	const initialFilter = filtersById[initialFilterId] ?? filtersById.all;
+	const initialOrdering = urlParams.sort
+		? parseSort(urlParams.sort)
+		: initialFilter.query!.ordering;
+
+	const [filter, setFilter] = useState(initialFilter);
 	const [inputSearchTerm, setInputSearchTerm] = useState(initialSearchTerm ?? '');
 	const [searchTerm, setSearchTerm] = useState(initialSearchTerm ?? '');
-	const [ordering, setOrdering] = useState<SpamUserQueryOrdering>(
-		filtersById.all.query!.ordering,
-	);
-	const [communityInput, setCommunityInput] = useState('');
-	const [communitySubdomain, setCommunitySubdomain] = useState('');
-	const [createdAfter, setCreatedAfter] = useState<string | undefined>();
-	const [createdBefore, setCreatedBefore] = useState<string | undefined>();
-	const [activeAfter, setActiveAfter] = useState<string | undefined>();
-	const [activeBefore, setActiveBefore] = useState<string | undefined>();
+	const [ordering, setOrdering] = useState<SpamUserQueryOrdering>(initialOrdering);
+	const [communityInput, setCommunityInput] = useState(urlParams.community ?? '');
+	const [communitySubdomain, setCommunitySubdomain] = useState(urlParams.community ?? '');
+	const [createdAfter, setCreatedAfter] = useState<string | undefined>(urlParams.createdAfter);
+	const [createdBefore, setCreatedBefore] = useState<string | undefined>(urlParams.createdBefore);
+	const [activeAfter, setActiveAfter] = useState<string | undefined>(urlParams.activeAfter);
+	const [activeBefore, setActiveBefore] = useState<string | undefined>(urlParams.activeBefore);
 	const [createdPreset, setCreatedPreset] = useState<number | null>(null);
 	const [activePreset, setActivePreset] = useState<number | null>(null);
-	const [minActivitiesInput, setMinActivitiesInput] = useState('');
-	const [maxActivitiesInput, setMaxActivitiesInput] = useState('');
-	const [minActivities, setMinActivities] = useState<number | undefined>();
-	const [maxActivities, setMaxActivities] = useState<number | undefined>();
+	const [minActivitiesInput, setMinActivitiesInput] = useState(urlParams.minActivities ?? '');
+	const [maxActivitiesInput, setMaxActivitiesInput] = useState(urlParams.maxActivities ?? '');
+	const [minActivities, setMinActivities] = useState<number | undefined>(
+		urlParams.minActivities ? Number(urlParams.minActivities) : undefined,
+	);
+	const [maxActivities, setMaxActivities] = useState<number | undefined>(
+		urlParams.maxActivities ? Number(urlParams.maxActivities) : undefined,
+	);
+	const [spamFieldsFilter, setSpamFieldsFilter] = useState<SpamFieldsFilterKey[]>(
+		urlParams.spamFields ? (urlParams.spamFields.split(',') as SpamFieldsFilterKey[]) : [],
+	);
+
+	const toggleSpamField = useCallback((key: SpamFieldsFilterKey) => {
+		setSpamFieldsFilter((prev) =>
+			prev.includes(key) ? prev.filter((k) => k !== key) : [...prev, key],
+		);
+	}, []);
 
 	useDebounce(() => setSearchTerm(inputSearchTerm), 300, [inputSearchTerm]);
 	useDebounce(() => setCommunitySubdomain(communityInput.trim()), 300, [communityInput]);
@@ -104,8 +181,17 @@ const UserSpam = (props: Props) => {
 			activeBefore,
 			minActivities,
 			maxActivities,
+			spamFieldsFilter: spamFieldsFilter.length > 0 ? spamFieldsFilter : undefined,
 		}),
-		[createdAfter, createdBefore, activeAfter, activeBefore, minActivities, maxActivities],
+		[
+			createdAfter,
+			createdBefore,
+			activeAfter,
+			activeBefore,
+			minActivities,
+			maxActivities,
+			spamFieldsFilter,
+		],
 	);
 
 	const { users, isLoading, loadMoreUsers, mayLoadMoreUsers, updateUser } = useSpamUsers({
@@ -126,9 +212,33 @@ const UserSpam = (props: Props) => {
 	});
 
 	useUpdateEffect(() => {
-		const nextSearchPart = searchTerm ? `?q=${searchTerm}` : '';
-		window.history.replaceState({}, '', window.location.pathname + nextSearchPart);
-	}, [searchTerm]);
+		const qs = buildUrlParams({
+			searchTerm,
+			filterId: filter.id,
+			ordering,
+			communitySubdomain,
+			createdAfter,
+			createdBefore,
+			activeAfter,
+			activeBefore,
+			minActivities,
+			maxActivities,
+			spamFieldsFilter: spamFieldsFilter.length > 0 ? spamFieldsFilter : undefined,
+		});
+		window.history.replaceState({}, '', window.location.pathname + qs);
+	}, [
+		searchTerm,
+		filter,
+		ordering,
+		communitySubdomain,
+		createdAfter,
+		createdBefore,
+		activeAfter,
+		activeBefore,
+		minActivities,
+		maxActivities,
+		spamFieldsFilter,
+	]);
 
 	const handleSpamTagRemoved = useCallback(
 		(userId: string) => {
@@ -170,159 +280,257 @@ const UserSpam = (props: Props) => {
 				initialSearchTerm={initialSearchTerm ?? undefined}
 				rightControls={isLoading && <Spinner size={20} />}
 			/>
-			<div className="controls-row">
-				<span className="sort-control">
-					Sort by
-					<HTMLSelect
-						value={`${ordering.field}:${ordering.direction}`}
-						onChange={handleSortChange}
-						minimal
-					>
-						{sortOptions.map((opt) => (
-							<option key={opt.value} value={opt.value}>
-								{opt.label}
-							</option>
-						))}
-					</HTMLSelect>
-				</span>
-				<label className="community-filter" htmlFor="community-subdomain-filter">
-					Community
-					<input
-						id="community-subdomain-filter"
-						type="text"
-						placeholder="filter by subdomain..."
-						value={communityInput}
-						onChange={(e) => setCommunityInput(e.target.value)}
-					/>
-				</label>
-				<span className="activity-count-filter">
-					Activities
-					<input
-						type="number"
-						min="0"
-						placeholder="min"
-						value={minActivitiesInput}
-						onChange={(e) => setMinActivitiesInput(e.target.value)}
-					/>
-					<span>to</span>
-					<input
-						type="number"
-						min="0"
-						placeholder="max"
-						value={maxActivitiesInput}
-						onChange={(e) => setMaxActivitiesInput(e.target.value)}
-					/>
-				</span>
-			</div>
-			<div className="date-filters-row">
-				<div className="date-filter-group">
-					<span className="date-filter-label">Created</span>
-					<ButtonGroup minimal>
-						{datePresets.map((p) => (
-							<Button
-								key={p.label}
-								small
-								active={createdPreset === p.days}
-								onClick={() => {
-									if (createdPreset === p.days) {
+			<div className="toolbar">
+				<HTMLSelect
+					className="toolbar-sort"
+					value={`${ordering.field}:${ordering.direction}`}
+					onChange={handleSortChange}
+					minimal
+				>
+					{sortOptions.map((opt) => (
+						<option key={opt.value} value={opt.value}>
+							{opt.label}
+						</option>
+					))}
+				</HTMLSelect>
+				<input
+					className="toolbar-input community-input"
+					type="text"
+					placeholder="Community..."
+					value={communityInput}
+					onChange={(e) => setCommunityInput(e.target.value)}
+				/>
+				<Popover
+					aria-label="Filter by created date"
+					placement="bottom-start"
+					content={
+						<div className="popover-panel">
+							<div className="popover-panel-title">Created date</div>
+							<ButtonGroup minimal>
+								{datePresets.map((p) => (
+									<Button
+										key={p.label}
+										small
+										active={createdPreset === p.days}
+										onClick={() => {
+											if (createdPreset === p.days) {
+												setCreatedPreset(null);
+												setCreatedAfter(undefined);
+												setCreatedBefore(undefined);
+												return;
+											}
+											setCreatedPreset(p.days);
+											setCreatedAfter(daysAgo(p.days));
+											setCreatedBefore(undefined);
+										}}
+									>
+										{p.label}
+									</Button>
+								))}
+							</ButtonGroup>
+							<div className="popover-date-row">
+								<input
+									type="date"
+									value={createdAfter ? toDateInputValue(createdAfter) : ''}
+									onChange={(e) => {
+										setCreatedPreset(null);
+										setCreatedAfter(fromDateInputValue(e.target.value));
+									}}
+								/>
+								<span className="popover-date-sep">to</span>
+								<input
+									type="date"
+									value={createdBefore ? toDateInputValue(createdBefore) : ''}
+									onChange={(e) => {
+										setCreatedPreset(null);
+										setCreatedBefore(fromDateInputValue(e.target.value));
+									}}
+								/>
+							</div>
+							{(createdAfter || createdBefore) && (
+								<Button
+									small
+									minimal
+									icon="cross"
+									text="Clear"
+									onClick={() => {
 										setCreatedPreset(null);
 										setCreatedAfter(undefined);
 										setCreatedBefore(undefined);
-										return;
-									}
-									setCreatedPreset(p.days);
-									setCreatedAfter(daysAgo(p.days));
-									setCreatedBefore(undefined);
-								}}
-							>
-								{p.label}
-							</Button>
-						))}
-					</ButtonGroup>
-					<input
-						type="date"
-						value={createdAfter ? toDateInputValue(createdAfter) : ''}
-						onChange={(e) => {
-							setCreatedPreset(null);
-							setCreatedAfter(fromDateInputValue(e.target.value));
-						}}
-					/>
-					<span>to</span>
-					<input
-						type="date"
-						value={createdBefore ? toDateInputValue(createdBefore) : ''}
-						onChange={(e) => {
-							setCreatedPreset(null);
-							setCreatedBefore(fromDateInputValue(e.target.value));
-						}}
-					/>
-					{(createdAfter || createdBefore) && (
-						<Button
-							small
-							minimal
-							icon="cross"
-							onClick={() => {
-								setCreatedPreset(null);
-								setCreatedAfter(undefined);
-								setCreatedBefore(undefined);
-							}}
-						/>
-					)}
-				</div>
-				<div className="date-filter-group">
-					<span className="date-filter-label">Active</span>
-					<ButtonGroup minimal>
-						{datePresets.map((p) => (
-							<Button
-								key={p.label}
-								small
-								active={activePreset === p.days}
-								onClick={() => {
-									if (activePreset === p.days) {
+									}}
+								/>
+							)}
+						</div>
+					}
+				>
+					<Button
+						small
+						minimal
+						icon="calendar"
+						active={!!(createdAfter || createdBefore)}
+					>
+						Created
+						{createdPreset
+							? `: ${datePresets.find((p) => p.days === createdPreset)?.label}`
+							: createdAfter || createdBefore
+								? ' (custom)'
+								: ''}
+					</Button>
+				</Popover>
+				<Popover
+					aria-label="Filter by active date"
+					placement="bottom-start"
+					content={
+						<div className="popover-panel">
+							<div className="popover-panel-title">Active date</div>
+							<ButtonGroup minimal>
+								{datePresets.map((p) => (
+									<Button
+										key={p.label}
+										small
+										active={activePreset === p.days}
+										onClick={() => {
+											if (activePreset === p.days) {
+												setActivePreset(null);
+												setActiveAfter(undefined);
+												setActiveBefore(undefined);
+												return;
+											}
+											setActivePreset(p.days);
+											setActiveAfter(daysAgo(p.days));
+											setActiveBefore(undefined);
+										}}
+									>
+										{p.label}
+									</Button>
+								))}
+							</ButtonGroup>
+							<div className="popover-date-row">
+								<input
+									type="date"
+									value={activeAfter ? toDateInputValue(activeAfter) : ''}
+									onChange={(e) => {
+										setActivePreset(null);
+										setActiveAfter(fromDateInputValue(e.target.value));
+									}}
+								/>
+								<span className="popover-date-sep">to</span>
+								<input
+									type="date"
+									value={activeBefore ? toDateInputValue(activeBefore) : ''}
+									onChange={(e) => {
+										setActivePreset(null);
+										setActiveBefore(fromDateInputValue(e.target.value));
+									}}
+								/>
+							</div>
+							{(activeAfter || activeBefore) && (
+								<Button
+									small
+									minimal
+									icon="cross"
+									text="Clear"
+									onClick={() => {
 										setActivePreset(null);
 										setActiveAfter(undefined);
 										setActiveBefore(undefined);
-										return;
-									}
-									setActivePreset(p.days);
-									setActiveAfter(daysAgo(p.days));
-									setActiveBefore(undefined);
-								}}
-							>
-								{p.label}
-							</Button>
-						))}
-					</ButtonGroup>
-					<input
-						type="date"
-						value={activeAfter ? toDateInputValue(activeAfter) : ''}
-						onChange={(e) => {
-							setActivePreset(null);
-							setActiveAfter(fromDateInputValue(e.target.value));
-						}}
-					/>
-					<span>to</span>
-					<input
-						type="date"
-						value={activeBefore ? toDateInputValue(activeBefore) : ''}
-						onChange={(e) => {
-							setActivePreset(null);
-							setActiveBefore(fromDateInputValue(e.target.value));
-						}}
-					/>
-					{(activeAfter || activeBefore) && (
-						<Button
-							small
-							minimal
-							icon="cross"
-							onClick={() => {
-								setActivePreset(null);
-								setActiveAfter(undefined);
-								setActiveBefore(undefined);
-							}}
-						/>
-					)}
-				</div>
+									}}
+								/>
+							)}
+						</div>
+					}
+				>
+					<Button small minimal icon="time" active={!!(activeAfter || activeBefore)}>
+						Active
+						{activePreset
+							? `: ${datePresets.find((p) => p.days === activePreset)?.label}`
+							: activeAfter || activeBefore
+								? ' (custom)'
+								: ''}
+					</Button>
+				</Popover>
+				<Popover
+					aria-label="Filter by activity count"
+					placement="bottom-start"
+					content={
+						<div className="popover-panel">
+							<div className="popover-panel-title">Activity count</div>
+							<div className="popover-range-row">
+								<input
+									type="number"
+									min="0"
+									placeholder="min"
+									value={minActivitiesInput}
+									onChange={(e) => setMinActivitiesInput(e.target.value)}
+								/>
+								<span className="popover-date-sep">to</span>
+								<input
+									type="number"
+									min="0"
+									placeholder="max"
+									value={maxActivitiesInput}
+									onChange={(e) => setMaxActivitiesInput(e.target.value)}
+								/>
+							</div>
+							{(minActivitiesInput || maxActivitiesInput) && (
+								<Button
+									small
+									minimal
+									icon="cross"
+									text="Clear"
+									onClick={() => {
+										setMinActivitiesInput('');
+										setMaxActivitiesInput('');
+									}}
+								/>
+							)}
+						</div>
+					}
+				>
+					<Button
+						small
+						minimal
+						icon="pulse"
+						active={!!(minActivities != null || maxActivities != null)}
+					>
+						Activities
+						{minActivities != null || maxActivities != null
+							? `: ${minActivities ?? '0'}${maxActivities != null ? `\u2013${maxActivities}` : '+'}`
+							: ''}
+					</Button>
+				</Popover>
+				<Popover
+					aria-label="Filter by detection reason"
+					placement="bottom-start"
+					content={
+						<div className="popover-panel">
+							<div className="popover-panel-title">Detection reason</div>
+							{spamFieldOptions.map((opt) => (
+								<Checkbox
+									key={opt.key}
+									checked={spamFieldsFilter.includes(opt.key)}
+									onChange={() => toggleSpamField(opt.key)}
+									label={opt.label}
+									style={{ marginBottom: 0 }}
+								/>
+							))}
+							{spamFieldsFilter.length > 0 && (
+								<Button
+									small
+									minimal
+									icon="cross"
+									text="Clear"
+									onClick={() => setSpamFieldsFilter([])}
+								/>
+							)}
+						</div>
+					}
+				>
+					<Button small minimal icon="filter" active={spamFieldsFilter.length > 0}>
+						Reason
+						{spamFieldsFilter.length > 0 ? ` (${spamFieldsFilter.length})` : ''}
+					</Button>
+				</Popover>
 			</div>
 			<div className="users">
 				{users.map((user) => (
diff --git a/client/containers/SuperAdminDashboard/UserSpam/UserSpamEntry.tsx b/client/containers/SuperAdminDashboard/UserSpam/UserSpamEntry.tsx
index 47143d32e0..6afe2963f5 100644
--- a/client/containers/SuperAdminDashboard/UserSpam/UserSpamEntry.tsx
+++ b/client/containers/SuperAdminDashboard/UserSpam/UserSpamEntry.tsx
@@ -2,7 +2,7 @@ import type { SpamStatus, UserSpamTagFields } from 'types';
 
 import React, { useCallback, useMemo, useState } from 'react';
 
-import { Button, ButtonGroup, Collapse, type Intent, Spinner, Tag } from '@blueprintjs/core';
+import { Button, ButtonGroup, type Intent, Spinner, Tag, Tooltip } from '@blueprintjs/core';
 
 import { apiFetch } from 'client/utils/apiFetch';
 import { formatDate } from 'utils/dates';
@@ -13,6 +13,8 @@ import './userSpamEntry.scss';
 
 import type { RecentDiscussion, SpamUser } from './types';
 
+import { Popover } from 'client/components';
+
 type Props = {
 	user: SpamUser;
 	onSpamTagRemoved?: (userId: string) => void;
@@ -59,7 +61,7 @@ const DiscussionItem = ({ discussion }: { discussion: RecentDiscussion }) => {
 
 const UserSpamEntry = (props: Props) => {
 	const { user, onSpamTagRemoved, onStatusChanged: onStatusChangedProp } = props;
-	const { fullName, email, slug, createdAt, spamTag, affiliation } = user;
+	const { fullName, email, slug, createdAt, spamTag, affiliation, communityReports } = user;
 	const hasTag = spamTag != null;
 	const initialStatus = hasTag ? spamTag.status : null;
 	const [status, setUpdatedStatus] = useState<null | SpamStatus>(initialStatus);
@@ -72,7 +74,6 @@ const UserSpamEntry = (props: Props) => {
 		[user.id, onStatusChangedProp],
 	);
 
-	const [discussionsOpen, setDiscussionsOpen] = useState(false);
 	const [recentDiscussions, setRecentDiscussions] = useState<RecentDiscussion[] | null>(null);
 	const [discussionsLoading, setDiscussionsLoading] = useState(false);
 
@@ -81,12 +82,8 @@ const UserSpamEntry = (props: Props) => {
 		: ({} as UserSpamTagFields);
 	const fieldsJsonString = useMemo(() => JSON.stringify(fields, null, 2), [fields]);
 
-	const handleToggleDiscussions = useCallback(async () => {
-		if (recentDiscussions) {
-			setDiscussionsOpen((prev) => !prev);
-			return;
-		}
-		setDiscussionsOpen(true);
+	const _handleToggleDiscussions = useCallback(async () => {
+		if (recentDiscussions) return;
 		setDiscussionsLoading(true);
 		try {
 			const result = await apiFetch.post('/api/spamTags/userRecentDiscussions', {
@@ -180,15 +177,15 @@ const UserSpamEntry = (props: Props) => {
 						status="confirmed-spam"
 						onStatusChanged={handleStatusChanged}
 					/>
-					<Button
-						minimal
-						small
-						icon="remove"
-						loading={removeLoading}
-						onClick={handleRemoveTag}
-					>
-						Remove spam tag
-					</Button>
+					<Tooltip content="Remove spam tag">
+						<Button
+							minimal
+							small
+							icon="remove"
+							loading={removeLoading}
+							onClick={handleRemoveTag}
+						></Button>
+					</Tooltip>
 				</ButtonGroup>
 			);
 		}
@@ -206,15 +203,15 @@ const UserSpamEntry = (props: Props) => {
 						status="unreviewed"
 						onStatusChanged={handleStatusChanged}
 					/>
-					<Button
-						minimal
-						small
-						icon="remove"
-						loading={removeLoading}
-						onClick={handleRemoveTag}
-					>
-						Remove spam tag
-					</Button>
+					<Tooltip content="Remove spam tag">
+						<Button
+							minimal
+							small
+							icon="remove"
+							loading={removeLoading}
+							onClick={handleRemoveTag}
+						></Button>
+					</Tooltip>
 				</ButtonGroup>
 			);
 		}
@@ -231,9 +228,9 @@ const UserSpamEntry = (props: Props) => {
 					status="unreviewed"
 					onStatusChanged={handleStatusChanged}
 				/>
-				<Button minimal small icon="remove" onClick={handleRemoveTag}>
-					Remove spam tag
-				</Button>
+				<Tooltip content="Remove spam tag">
+					<Button minimal small icon="remove" onClick={handleRemoveTag}></Button>
+				</Tooltip>
 			</ButtonGroup>
 		);
 	};
@@ -293,6 +290,30 @@ const UserSpamEntry = (props: Props) => {
 		);
 	};
 
+	const popoverContent = useMemo(() => {
+		if (discussionsLoading) {
+			return (
+				<div className="discussions-popover-content">
+					<Spinner size={16} />
+				</div>
+			);
+		}
+		if (!recentDiscussions || recentDiscussions.length === 0) {
+			return (
+				<div className="discussions-popover-content">
+					<div className="no-discussions">No discussions found</div>
+				</div>
+			);
+		}
+		return (
+			<div className="discussions-popover-content">
+				{recentDiscussions.map((d) => (
+					<DiscussionItem key={d.id} discussion={d} />
+				))}
+			</div>
+		);
+	}, [recentDiscussions, discussionsLoading]);
+
 	const renderAffiliation = () => {
 		if (!affiliation) return null;
 		const { communitySubdomains, pubCount, discussionCount } = affiliation;
@@ -320,32 +341,102 @@ const UserSpamEntry = (props: Props) => {
 			);
 		}
 		if (pubCount > 0) parts.push(`${pubCount} pub(s)`);
-		if (discussionCount > 0) parts.push(`${discussionCount} discussion(s)`);
+		if (discussionCount > 0) {
+			parts.push(
+				<Popover
+					key="discussions"
+					placement="bottom-start"
+					aria-label="Recent discussions"
+					content={popoverContent}
+					unstable_fixed
+					lazy={false}
+				>
+					<Button
+						minimal
+						onClick={_handleToggleDiscussions}
+						small
+						className="inline-discussions-btn"
+					>
+						{discussionCount} discussion(s)
+					</Button>
+				</Popover>,
+			);
+		}
 		return (
 			<div className="affiliation">
-				<Tag minimal>
-					{parts.map((part, index) => (
-						// biome-ignore lint/suspicious/noArrayIndexKey: idcc
-						<span key={index}>
-							{part}
-							{index < parts.length - 1 ? ' · ' : ''}
-						</span>
-					))}
-				</Tag>
+				{parts.map((part, index) => (
+					// biome-ignore lint/suspicious/noArrayIndexKey: idcc
+					<span key={index} className="affiliation-part">
+						{part}
+						{index < parts.length - 1 ? ' \u00b7 ' : ''}
+					</span>
+				))}
 			</div>
 		);
 	};
 
-	const renderRecentDiscussions = () => {
-		if (discussionsLoading) return <Spinner size={16} />;
-		if (!recentDiscussions || recentDiscussions.length === 0) {
-			return <div className="no-discussions">No discussions found</div>;
-		}
-		return recentDiscussions.map((d) => <DiscussionItem key={d.id} discussion={d} />);
+	const renderCommunityReports = () => {
+		if (!communityReports?.length) return null;
+		return (
+			<div className="community-reports">
+				{communityReports.map((report, index) => (
+					<Popover
+						// biome-ignore lint/suspicious/noArrayIndexKey: stable list
+						key={index}
+						aria-label="Flag details"
+						placement="bottom-start"
+						content={
+							<div className="flag-detail-popover">
+								<div className="flag-detail-row">
+									<span className="flag-detail-label">Community</span>
+									<span>{report.communitySubdomain}</span>
+								</div>
+								<div className="flag-detail-row">
+									<span className="flag-detail-label">Reason</span>
+									<span>{report.reason}</span>
+								</div>
+								{report.reasonText && (
+									<div className="flag-detail-row">
+										<span className="flag-detail-label">Note</span>
+										<span className="flag-detail-note">
+											{report.reasonText}
+										</span>
+									</div>
+								)}
+								{report.flaggedByName && (
+									<div className="flag-detail-row">
+										<span className="flag-detail-label">Flagged by</span>
+										<span>{report.flaggedByName}</span>
+									</div>
+								)}
+								{report.sourceDiscussionUrl && (
+									<div className="flag-detail-row">
+										<span className="flag-detail-label">Source</span>
+										<a
+											href={report.sourceDiscussionUrl}
+											target="_blank"
+											rel="noopener noreferrer"
+										>
+											{report.sourceDiscussionTitle || 'View discussion'}
+										</a>
+									</div>
+								)}
+								<div className="flag-detail-row">
+									<span className="flag-detail-label">Date</span>
+									<span>{formatDate(report.createdAt)}</span>
+								</div>
+							</div>
+						}
+					>
+						<Tag intent="warning" minimal icon="flag" interactive>
+							{report.communitySubdomain}: {report.reason}
+						</Tag>
+					</Popover>
+				))}
+			</div>
+		);
 	};
 
-	const discussionCount = affiliation?.discussionCount ?? 0;
-
 	return (
 		<div className="user-spam-entry-component">
 			<div className="title">
@@ -372,20 +463,7 @@ const UserSpamEntry = (props: Props) => {
 				</div>
 				<div className="actions">{renderActions()}</div>
 			</div>
-			<div className="discussions-section">
-				<Button
-					minimal
-					small
-					icon={discussionsOpen ? 'chevron-up' : 'chevron-down'}
-					onClick={handleToggleDiscussions}
-				>
-					{discussionsOpen ? 'Hide' : 'Show'} discussions
-					{discussionCount > 0 ? ` (${discussionCount})` : ''}
-				</Button>
-				<Collapse isOpen={discussionsOpen}>
-					<div className="discussions-list">{renderRecentDiscussions()}</div>
-				</Collapse>
-			</div>
+			{renderCommunityReports()}
 		</div>
 	);
 };
diff --git a/client/containers/SuperAdminDashboard/UserSpam/filters.ts b/client/containers/SuperAdminDashboard/UserSpam/filters.ts
index 5eba3b5af9..12ccab09c8 100644
--- a/client/containers/SuperAdminDashboard/UserSpam/filters.ts
+++ b/client/containers/SuperAdminDashboard/UserSpam/filters.ts
@@ -4,7 +4,7 @@ import type { SpamUserQuery } from 'types';
 import { indexById } from 'utils/arrays';
 
 export type SpamUsersFilter = OverviewSearchFilter<
-	Pick<SpamUserQuery, 'status' | 'ordering' | 'spamTagPresence'>
+	Pick<SpamUserQuery, 'status' | 'ordering' | 'spamTagPresence' | 'hasCommunityReport'>
 >;
 
 export const filters: SpamUsersFilter[] = [
@@ -16,6 +16,15 @@ export const filters: SpamUsersFilter[] = [
 			status: null,
 		},
 	},
+	{
+		title: 'Flagged',
+		id: 'flagged',
+		query: {
+			ordering: { field: 'user-created-at', direction: 'DESC' },
+			status: null,
+			hasCommunityReport: true,
+		},
+	},
 	{
 		title: 'No spam tag',
 		id: 'no-tag',
diff --git a/client/containers/SuperAdminDashboard/UserSpam/types.ts b/client/containers/SuperAdminDashboard/UserSpam/types.ts
index 011ab77908..52754a3c46 100644
--- a/client/containers/SuperAdminDashboard/UserSpam/types.ts
+++ b/client/containers/SuperAdminDashboard/UserSpam/types.ts
@@ -1,8 +1,9 @@
-import type { SpamTag, UserWithPrivateFields } from 'types';
+import type { SpamTag, SpamUserCommunityReport, UserWithPrivateFields } from 'types';
 
 export type { RecentDiscussion } from 'types';
 
 export type SpamUser = UserWithPrivateFields & {
 	spamTag: SpamTag | null;
 	affiliation?: { communitySubdomains: string[]; pubCount: number; discussionCount: number };
+	communityReports?: SpamUserCommunityReport[];
 };
diff --git a/client/containers/SuperAdminDashboard/UserSpam/useSpamUsers.ts b/client/containers/SuperAdminDashboard/UserSpam/useSpamUsers.ts
index 8a219455fe..b97af0e3e5 100644
--- a/client/containers/SuperAdminDashboard/UserSpam/useSpamUsers.ts
+++ b/client/containers/SuperAdminDashboard/UserSpam/useSpamUsers.ts
@@ -18,6 +18,7 @@ type QueryFilters = {
 	activeBefore?: string;
 	minActivities?: number;
 	maxActivities?: number;
+	spamFieldsFilter?: string[];
 };
 
 type UseSpamUsersOptions = {
@@ -43,7 +44,7 @@ export const useSpamUsers = (options: UseSpamUsersOptions) => {
 		setIsLoading(true);
 		setMayLoadMoreUsers(false);
 		setOffset((offset) => offset + limit);
-		const { status, spamTagPresence } = filter.query!;
+		const { status, spamTagPresence, hasCommunityReport } = filter.query!;
 		const nextUsers = await apiFetch.post('/api/spamTags/queryUsersForSpam', {
 			limit,
 			searchTerm,
@@ -51,6 +52,7 @@ export const useSpamUsers = (options: UseSpamUsersOptions) => {
 			status,
 			ordering,
 			spamTagPresence,
+			hasCommunityReport,
 			communitySubdomain: communitySubdomain || undefined,
 			...queryFilters,
 		});
diff --git a/client/containers/SuperAdminDashboard/UserSpam/userSpam.scss b/client/containers/SuperAdminDashboard/UserSpam/userSpam.scss
index b8732f2e12..bf2d631aa1 100644
--- a/client/containers/SuperAdminDashboard/UserSpam/userSpam.scss
+++ b/client/containers/SuperAdminDashboard/UserSpam/userSpam.scss
@@ -1,105 +1,110 @@
+@use 'styles/vendor.scss';
+$bp: vendor.$bp-namespace;
+
 .user-spam-component {
-	.add-user-row {
-		display: flex;
-		gap: 8px;
-		align-items: center;
-		margin-top: 10px;
-		width: 100%;
-		max-width: 400px;
-	}
-	.add-user-error {
-		margin-top: 6px;
-		color: var(--pt-intent-danger);
-	}
-	.controls-row {
-		display: flex;
-		gap: 16px;
-		align-items: center;
-		margin-top: 8px;
-		padding: 6px 0;
+  .toolbar {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 4px;
+    align-items: center;
+    margin-top: 8px;
+    padding: 4px 6px;
+    background: #f8f9fa;
+    border-radius: 4px;
+    border: 1px solid #e8e8ec;
+
+    .toolbar-sort select {
+      font-size: 13px;
+    }
+
+    .community-input {
+      padding: 3px 8px;
+      border: 1px solid #d0d0d6;
+      border-radius: 3px;
+      font-size: 13px;
+      width: 140px;
+      background: white;
+      transition: border-color 0.15s, box-shadow 0.15s;
 
-		.sort-control,
-		.community-filter,
-		.activity-count-filter {
-			display: flex;
-			align-items: center;
-			gap: 6px;
-			font-size: 13px;
-			color: #555;
-		}
+      &:focus {
+        outline: none;
+        border-color: #137cbd;
+        box-shadow: 0 0 0 1px rgba(19, 124, 189, 0.3);
+      }
 
-		.community-filter input {
-			padding: 3px 8px;
-			border: 1px solid #ccc;
-			border-radius: 3px;
-			font-size: 13px;
-			width: 160px;
+      &::placeholder {
+        color: #aaa;
+      }
+    }
+  }
+
+  .users {
+    margin-top: 12px;
+    > :not(:last-child) {
+      margin-bottom: 6px;
+    }
+  }
+
+  .no-results {
+    text-align: center;
+    padding: 24px;
+    color: #888;
+    font-size: 14px;
+  }
+}
 
-			&:focus {
-				outline: none;
-				border-color: #137cbd;
-				box-shadow: 0 0 0 1px #137cbd;
-			}
-		}
+.popover-panel {
+  padding: 10px 12px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  min-width: 200px;
+  background: white !important;
+  border-radius: 4px;
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
 
-		.activity-count-filter input {
-			padding: 3px 8px;
-			border: 1px solid #ccc;
-			border-radius: 3px;
-			font-size: 13px;
-			width: 70px;
+  .popover-panel-title {
+    font-size: 12px;
+    font-weight: 600;
+    color: #555;
+    text-transform: uppercase;
+    letter-spacing: 0.4px;
+  }
 
-			&:focus {
-				outline: none;
-				border-color: #137cbd;
-				box-shadow: 0 0 0 1px #137cbd;
-			}
-		}
-	}
-	.date-filters-row {
-		display: flex;
-		flex-direction: column;
-		gap: 6px;
-		margin-top: 8px;
-		padding: 6px 0;
+  .popover-date-row,
+  .popover-range-row {
+    display: flex;
+    align-items: center;
+    gap: 6px;
 
-		.date-filter-group {
-			display: flex;
-			align-items: center;
-			gap: 6px;
-			font-size: 13px;
-			color: #555;
+    input {
+      flex: 1;
+      padding: 4px 6px;
+      border: 1px solid #d0d0d6;
+      border-radius: 3px;
+      font-size: 13px;
+      background: white;
 
-			.date-filter-label {
-				min-width: 50px;
-				font-weight: 500;
-			}
+      &:focus {
+        outline: none;
+        border-color: #137cbd;
+        box-shadow: 0 0 0 1px rgba(19, 124, 189, 0.3);
+      }
 
-			input[type='date'] {
-				padding: 2px 6px;
-				border: 1px solid #ccc;
-				border-radius: 3px;
-				font-size: 12px;
+      &::placeholder {
+        color: #aaa;
+      }
+    }
 
-				&:focus {
-					outline: none;
-					border-color: #137cbd;
-					box-shadow: 0 0 0 1px #137cbd;
-				}
-			}
-		}
-	}
+    input[type='number'] {
+      width: 70px;
+      flex: 0 0 auto;
+    }
+  }
 
-	.users {
-		margin-top: 10px;
-		> :not(:last-child) {
-			margin-bottom: 5px;
-		}
-	}
-	.no-results {
-		text-align: center;
-		padding: 24px;
-		color: #888;
-		font-size: 14px;
-	}
+  .popover-date-sep {
+    color: #888;
+    font-size: 12px;
+    flex-shrink: 0;
+  }
 }
diff --git a/client/containers/SuperAdminDashboard/UserSpam/userSpamEntry.scss b/client/containers/SuperAdminDashboard/UserSpam/userSpamEntry.scss
index 6d9fb923a0..f96fb2306b 100644
--- a/client/containers/SuperAdminDashboard/UserSpam/userSpamEntry.scss
+++ b/client/containers/SuperAdminDashboard/UserSpam/userSpamEntry.scss
@@ -1,107 +1,181 @@
 .user-spam-entry-component {
-	border-radius: 2px;
-	border: 1px solid #eee;
-	padding: 10px;
-	overflow: hidden;
-
-	& > *:not(:last-child) {
-		margin-bottom: 6px;
-	}
-
-	.title {
-		font-size: 16px;
-		font-weight: 500;
-		display: flex;
-		flex-wrap: wrap;
-		gap: 8px;
-		align-items: baseline;
-
-		.name {
-			font-weight: 600;
-		}
-		.email {
-			color: #666;
-			font-size: 14px;
-		}
-		.slug {
-			color: #888;
-			font-size: 14px;
-		}
-	}
-
-	.fields-report {
-		details > summary {
-			user-select: none;
-		}
-		pre {
-			background: #eee;
-			padding: 5px;
-		}
-	}
-
-	.details {
-		display: flex;
-		justify-content: space-between;
-		align-items: end;
-		flex-wrap: wrap;
-		gap: 6px;
-
-		> .tags {
-			display: flex;
-			flex-wrap: wrap;
-			gap: 4px;
-			min-width: 0;
-			flex: 1;
-		}
-
-		> .actions {
-			flex-shrink: 0;
-		}
-	}
-
-	.discussions-section {
-		margin-top: 2px;
-
-		.discussions-list {
-			padding: 4px 0;
-		}
-
-		.discussion-item {
-			padding: 6px 10px;
-			border-left: 2px solid #ddd;
-			margin: 4px 0;
-
-			.discussion-header {
-				display: flex;
-				align-items: center;
-				gap: 6px;
-				font-size: 13px;
-
-				a {
-					font-weight: 500;
-				}
-			}
-
-			.discussion-date {
-				color: #888;
-				font-size: 12px;
-			}
-
-			.discussion-preview {
-				font-size: 12px;
-				color: #555;
-				margin-top: 3px;
-				white-space: pre-wrap;
-				max-height: 60px;
-				overflow: hidden;
-			}
-		}
-
-		.no-discussions {
-			padding: 6px 10px;
-			color: #888;
-			font-size: 13px;
-			font-style: italic;
-		}
-	}
+  border-radius: 2px;
+  border: 1px solid #eee;
+  padding: 10px;
+  overflow: hidden;
+
+  & > *:not(:last-child) {
+    margin-bottom: 6px;
+  }
+
+  .title {
+    font-size: 16px;
+    font-weight: 500;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    align-items: baseline;
+
+    .name {
+      font-weight: 600;
+    }
+    .email {
+      color: #666;
+      font-size: 14px;
+    }
+    .slug {
+      color: #888;
+      font-size: 14px;
+    }
+  }
+
+  .fields-report {
+    details > summary {
+      user-select: none;
+    }
+    pre {
+      background: #eee;
+      padding: 5px;
+    }
+  }
+
+  .details {
+    display: flex;
+    justify-content: space-between;
+    align-items: end;
+    flex-wrap: wrap;
+    gap: 6px;
+
+    > .tags {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 4px;
+      min-width: 0;
+      flex: 1;
+    }
+
+    > .actions {
+      flex-shrink: 0;
+    }
+  }
+
+  .affiliation {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 2px;
+    font-size: 13px;
+    color: #555;
+
+    .affiliation-part {
+      display: inline-flex;
+      align-items: center;
+
+      a {
+        color: inherit;
+        text-decoration: underline;
+        text-decoration-color: #ccc;
+        &:hover {
+          text-decoration-color: #999;
+        }
+      }
+    }
+
+    .inline-discussions-btn {
+      font-size: 13px;
+      min-height: 0;
+      padding: 0 2px;
+      text-decoration: underline;
+      text-decoration-color: #ccc;
+      &:hover {
+        text-decoration-color: #999;
+      }
+    }
+  }
+
+  .community-reports {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 4px;
+  }
+}
+
+// portal-rendered popover content (outside component tree)
+.discussions-popover-content {
+  padding: 8px 12px;
+  background: white;
+  border-radius: 4px;
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
+  min-width: 320px;
+  max-width: 500px;
+
+  .discussion-item {
+    padding: 6px 10px;
+    border-left: 2px solid #ddd;
+    margin: 4px 0;
+
+    .discussion-header {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      font-size: 13px;
+
+      a {
+        font-weight: 500;
+      }
+    }
+
+    .discussion-date {
+      color: #888;
+      font-size: 12px;
+    }
+
+    .discussion-preview {
+      font-size: 12px;
+      color: #555;
+      margin-top: 3px;
+      white-space: pre-wrap;
+      max-height: 60px;
+      overflow: hidden;
+    }
+  }
+
+  .no-discussions {
+    padding: 6px 10px;
+    color: #888;
+    font-size: 13px;
+    font-style: italic;
+  }
+}
+
+.flag-detail-popover {
+  padding: 10px 12px;
+  background: white;
+  border-radius: 4px;
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
+  min-width: 220px;
+  max-width: 360px;
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+
+  .flag-detail-row {
+    display: flex;
+    gap: 8px;
+    font-size: 13px;
+    line-height: 1.4;
+
+    .flag-detail-label {
+      font-weight: 600;
+      color: #555;
+      min-width: 70px;
+      flex-shrink: 0;
+    }
+
+    .flag-detail-note {
+      color: #333;
+      white-space: pre-wrap;
+      word-break: break-word;
+    }
+  }
 }
diff --git a/server/apiRoutes.ts b/server/apiRoutes.ts
index 8af21bb450..2e3ca883b4 100644
--- a/server/apiRoutes.ts
+++ b/server/apiRoutes.ts
@@ -6,6 +6,7 @@ import { activityItemRouter } from './activityItem/api';
 import { router as apiDocsRouter } from './apiDocs/api';
 import { router as captchaRouter } from './captcha/api';
 import { router as citationRouter } from './citation/api';
+import { router as communityModerationReportRouter } from './communityModerationReport/api';
 import { router as communityServicesRouter } from './communityServices/api';
 import { router as customScriptRouter } from './customScript/api';
 import { router as devApiRouter } from './dev/api';
@@ -30,7 +31,6 @@ import { router as submissionWorkflowRouter } from './submissionWorkflow/api';
 import { router as subscribeRouter } from './subscribe/api';
 import { router as threadCommentRouter } from './threadComment/api';
 import { router as userRouter } from './user/api';
-import { router as userCommunityFlagRouter } from './userCommunityFlag/api';
 import { router as userDismissableRouter } from './userDismissable/api';
 import { router as userNotificationRouter } from './userNotification/api';
 import { router as userNotificationPreferencesRouter } from './userNotificationPreferences/api';
@@ -64,7 +64,7 @@ const apiRouter = Router()
 	.use(submissionRouter)
 	.use(threadCommentRouter)
 	.use(userRouter)
-	.use(userCommunityFlagRouter)
+	.use(communityModerationReportRouter)
 	.use(userDismissableRouter)
 	.use(userNotificationRouter)
 	.use(userNotificationPreferencesRouter)
diff --git a/server/communityModerationReport/__tests__/api.test.ts b/server/communityModerationReport/__tests__/api.test.ts
new file mode 100644
index 0000000000..161f6c5605
--- /dev/null
+++ b/server/communityModerationReport/__tests__/api.test.ts
@@ -0,0 +1,179 @@
+import { vi } from 'vitest';
+
+import { CommunityModerationReport, SpamTag, User } from 'server/models';
+import { login, modelize, setup, teardown } from 'stubstub';
+
+vi.mock('server/utils/slack', () => ({
+	postToSlackAboutCommunityFlag: vi.fn(),
+	postToSlackAboutNewUserSpamTag: vi.fn(),
+}));
+
+vi.mock('server/utils/email', () => ({
+	sendNewSpamTagDevEmail: vi.fn(),
+	sendCommunityFlagDevEmail: vi.fn(),
+	sendCommunityFlagResolvedEmail: vi.fn(),
+}));
+
+const models = modelize`
+	User superadmin {
+		isSuperAdmin: true
+	}
+	Community community {
+		Member {
+			permissions: "admin"
+			User admin {}
+		}
+		Member {
+			permissions: "view"
+			User viewer {}
+		}
+	}
+	User targetUser {}
+`;
+
+setup(beforeAll, async () => {
+	await models.resolve();
+});
+
+teardown(afterAll);
+
+it('allows a community admin to create a moderation report and auto-creates a spam tag', async () => {
+	const { admin, community, targetUser } = models;
+	const agent = await login(admin);
+
+	const res = await agent
+		.post('/api/communityModerationReports')
+		.send({
+			userId: targetUser.id,
+			communityId: community.id,
+			reason: 'spam-content',
+			reasonText: 'looks like spam',
+		})
+		.expect(201);
+
+	expect(res.body.userId).toEqual(targetUser.id);
+	expect(res.body.communityId).toEqual(community.id);
+	expect(res.body.reason).toEqual('spam-content');
+	expect(res.body.status).toEqual('active');
+	expect(res.body.spamTagId).toBeTruthy();
+
+	const refreshedUser = await User.findByPk(targetUser.id);
+	expect(refreshedUser?.spamTagId).toBeTruthy();
+	const tag = await SpamTag.findByPk(res.body.spamTagId);
+	expect(tag).toBeTruthy();
+	expect(tag?.status).toEqual('unreviewed');
+});
+
+it('forbids non-admins from creating a moderation report', async () => {
+	const { viewer, community, targetUser } = models;
+	const agent = await login(viewer);
+
+	await agent
+		.post('/api/communityModerationReports')
+		.send({
+			userId: targetUser.id,
+			communityId: community.id,
+			reason: 'harassment',
+		})
+		.expect(403);
+});
+
+it('allows a community admin to retract their own report', async () => {
+	const { admin, community, targetUser } = models;
+	const agent = await login(admin);
+
+	const createRes = await agent
+		.post('/api/communityModerationReports')
+		.send({
+			userId: targetUser.id,
+			communityId: community.id,
+			reason: 'hateful-language',
+		})
+		.expect(201);
+
+	const reportId = createRes.body.id;
+
+	await agent
+		.put(`/api/communityModerationReports/${reportId}`)
+		.send({ status: 'retracted' })
+		.expect(200);
+
+	const report = await CommunityModerationReport.findByPk(reportId);
+	expect(report?.status).toEqual('retracted');
+});
+
+it('rate-limits excessive report creation', async () => {
+	const { admin, community, targetUser } = models;
+	const agent = await login(admin);
+
+	const promises = Array.from({ length: 7 }, () =>
+		agent.post('/api/communityModerationReports').send({
+			userId: targetUser.id,
+			communityId: community.id,
+			reason: 'spam-content',
+		}),
+	);
+
+	const responses = await Promise.all(promises);
+	const tooMany = responses.filter((r) => r.status === 429);
+	expect(tooMany.length).toBeGreaterThan(0);
+});
+
+it('blocks a reported user from creating discussions in that community', async () => {
+	const { admin, community, targetUser } = models;
+	const adminAgent = await login(admin);
+
+	await adminAgent
+		.post('/api/communityModerationReports')
+		.send({
+			userId: targetUser.id,
+			communityId: community.id,
+			reason: 'spam-content',
+		})
+		.expect(201);
+
+	const targetAgent = await login(targetUser);
+
+	// the targetUser should be blocked from creating discussions in this community
+	await targetAgent
+		.post('/api/discussions')
+		.send({
+			communityId: community.id,
+			content: { type: 'doc', content: [] },
+			text: 'test',
+		})
+		.expect(403);
+});
+
+it('retracting a report re-enables the user to create thread comments', async () => {
+	const { admin, community, targetUser } = models;
+	const adminAgent = await login(admin);
+
+	await adminAgent
+		.post('/api/communityModerationReports')
+		.send({
+			userId: targetUser.id,
+			communityId: community.id,
+			reason: 'other',
+			reasonText: 'testing retraction',
+		})
+		.expect(201);
+
+	const activeReports = await CommunityModerationReport.findAll({
+		where: { userId: targetUser.id, communityId: community.id, status: 'active' },
+	});
+
+	await Promise.all(
+		activeReports.map((report) =>
+			adminAgent
+				.put(`/api/communityModerationReports/${report.id}`)
+				.send({ status: 'retracted' })
+				.expect(200),
+		),
+	);
+
+	const remaining = await CommunityModerationReport.count({
+		where: { userId: targetUser.id, communityId: community.id, status: 'active' },
+	});
+	expect(remaining).toEqual(0);
+});
diff --git a/server/communityModerationReport/api.ts b/server/communityModerationReport/api.ts
new file mode 100644
index 0000000000..e68450a0f6
--- /dev/null
+++ b/server/communityModerationReport/api.ts
@@ -0,0 +1,135 @@
+import { Router } from 'express';
+
+import { notify } from 'server/spamTag/notifications';
+import { canManipulateSpamTags } from 'server/spamTag/permissions';
+import { upsertSpamTag } from 'server/spamTag/userQueries';
+import { ForbiddenError, NotFoundError } from 'server/utils/errors';
+import { getScope } from 'server/utils/queryHelpers';
+import { wrap } from 'server/wrap';
+
+import {
+	createReport,
+	getActiveReportsByFlaggedBy,
+	getAllActiveReports,
+	getReportById,
+	getReportsForCommunity,
+	updateReportStatus,
+} from './queries';
+
+export const router = Router();
+
+router.post(
+	'/api/communityModerationReports',
+	wrap(async (req, res) => {
+		const { userId, communityId, reason, reasonText, sourceDiscussionId } = req.body;
+		const flaggedById = req.user?.id;
+		if (!flaggedById || !userId || !communityId || !reason) {
+			return res.status(400).send({ error: 'Missing required fields' });
+		}
+
+		const scopeData = await getScope({ communityId, loginId: flaggedById });
+		if (!scopeData.activePermissions.canAdmin) {
+			throw new ForbiddenError();
+		}
+
+		const { spamTag } = await upsertSpamTag({ userId });
+
+		const report = await createReport({
+			userId,
+			communityId,
+			flaggedById,
+			reason,
+			reasonText,
+			sourceDiscussionId,
+			spamTagId: spamTag.id,
+		});
+
+		notify('community-flag', {
+			userId,
+			userEmail: '',
+			userName: '',
+			userSlug: '',
+			communityId,
+			flaggedById,
+			flagReason: reason,
+			flagReasonText: reasonText,
+			sourceDiscussionId,
+		}).catch((err) => console.error('Failed to send community flag notification', err));
+
+		return res.status(201).json(report);
+	}),
+);
+
+router.put(
+	'/api/communityModerationReports/:id',
+	wrap(async (req, res) => {
+		const { status } = req.body;
+		const reportId = req.params.id;
+		const userId = req.user?.id;
+		if (!userId) throw new ForbiddenError();
+
+		if (status === 'retracted') {
+			const ownReport = await getActiveReportsByFlaggedBy(reportId, userId);
+			if (!ownReport) {
+				const existing = await getReportById(reportId);
+				if (!existing) throw new NotFoundError();
+				const scopeData = await getScope({
+					communityId: existing.communityId,
+					loginId: userId,
+				});
+				if (!scopeData.activePermissions.canAdmin) {
+					throw new ForbiddenError();
+				}
+			}
+			const updated = await updateReportStatus(reportId, 'retracted');
+			if (!updated) throw new NotFoundError();
+
+			const retractedReport = await getReportById(reportId);
+			if (retractedReport) {
+				notify('community-flag-retracted', {
+					userId: retractedReport.userId,
+					userEmail: '',
+					userName: retractedReport.user?.fullName ?? '',
+					userSlug: retractedReport.user?.slug ?? '',
+					communityId: retractedReport.communityId,
+					flaggedById: userId,
+				}).catch((err) =>
+					console.error('Failed to send flag retraction notification', err),
+				);
+			}
+
+			return res.status(200).json(updated);
+		}
+
+		const isSuperAdmin = await canManipulateSpamTags({ userId });
+		if (!isSuperAdmin) {
+			throw new ForbiddenError();
+		}
+		const updated = await updateReportStatus(reportId, status);
+		if (!updated) throw new NotFoundError();
+		return res.status(200).json(updated);
+	}),
+);
+
+router.get(
+	'/api/communityModerationReports',
+	wrap(async (req, res) => {
+		const communityId = req.query.communityId as string | undefined;
+		const userId = req.user?.id;
+		if (!userId) throw new ForbiddenError();
+
+		if (communityId) {
+			const scopeData = await getScope({ communityId, loginId: userId });
+			if (!scopeData.activePermissions.canAdmin) {
+				throw new ForbiddenError();
+			}
+			const reports = await getReportsForCommunity(communityId);
+			return res.status(200).json(reports);
+		}
+
+		const isSuperAdmin = await canManipulateSpamTags({ userId });
+		if (!isSuperAdmin) throw new ForbiddenError();
+		const reports = await getAllActiveReports();
+		return res.status(200).json(reports);
+	}),
+);
diff --git a/server/userCommunityFlag/model.ts b/server/communityModerationReport/model.ts
similarity index 68%
rename from server/userCommunityFlag/model.ts
rename to server/communityModerationReport/model.ts
index 0111e8110f..f86d432f53 100644
--- a/server/userCommunityFlag/model.ts
+++ b/server/communityModerationReport/model.ts
@@ -14,21 +14,21 @@ import {
 	Table,
 } from 'sequelize-typescript';
 
-import { Community, Discussion, User } from '../models';
+import { Community, Discussion, SpamTag, User } from '../models';
 
-export type UserCommunityFlagReason =
+export type ModerationReportReason =
 	| 'spam-content'
 	| 'hateful-language'
 	| 'harassment'
 	| 'impersonation'
 	| 'other';
 
-export type UserCommunityFlagStatus = 'active' | 'dismissed' | 'escalated';
+export type ModerationReportStatus = 'active' | 'retracted' | 'dismissed' | 'escalated';
 
-@Table
-export class UserCommunityFlag extends Model<
-	InferAttributes<UserCommunityFlag>,
-	InferCreationAttributes<UserCommunityFlag>
+@Table({ tableName: 'CommunityModerationReports' })
+export class CommunityModerationReport extends Model<
+	InferAttributes<CommunityModerationReport>,
+	InferCreationAttributes<CommunityModerationReport>
 > {
 	public declare toJSON: <M extends Model>(this: M) => SerializedModel<M>;
 
@@ -55,7 +55,7 @@ export class UserCommunityFlag extends Model<
 	@Column(
 		DataType.ENUM('spam-content', 'hateful-language', 'harassment', 'impersonation', 'other'),
 	)
-	declare reason: UserCommunityFlagReason;
+	declare reason: ModerationReportReason;
 
 	@Column(DataType.TEXT)
 	declare reasonText: string | null;
@@ -63,10 +63,13 @@ export class UserCommunityFlag extends Model<
 	@Column(DataType.UUID)
 	declare sourceDiscussionId: string | null;
 
+	@Column(DataType.UUID)
+	declare spamTagId: string | null;
+
 	@AllowNull(false)
 	@Default('active')
-	@Column(DataType.ENUM('active', 'dismissed', 'escalated'))
-	declare status: CreationOptional<UserCommunityFlagStatus>;
+	@Column(DataType.ENUM('active', 'retracted', 'dismissed', 'escalated'))
+	declare status: CreationOptional<ModerationReportStatus>;
 
 	@BelongsTo(() => User, { onDelete: 'CASCADE', as: 'user', foreignKey: 'userId' })
 	declare user?: User;
@@ -83,4 +86,7 @@ export class UserCommunityFlag extends Model<
 		foreignKey: 'sourceDiscussionId',
 	})
 	declare sourceDiscussion?: Discussion;
+
+	@BelongsTo(() => SpamTag, { onDelete: 'SET NULL', as: 'spamTag', foreignKey: 'spamTagId' })
+	declare spamTag?: SpamTag;
 }
diff --git a/server/communityModerationReport/queries.ts b/server/communityModerationReport/queries.ts
new file mode 100644
index 0000000000..4649ab24bc
--- /dev/null
+++ b/server/communityModerationReport/queries.ts
@@ -0,0 +1,149 @@
+import type { ModerationReportReason, ModerationReportStatus } from 'types';
+
+import { Community, CommunityModerationReport, Discussion, SpamTag, User } from 'server/models';
+
+type CreateReportOptions = {
+	userId: string;
+	communityId: string;
+	flaggedById: string;
+	reason: ModerationReportReason;
+	reasonText?: string | null;
+	sourceDiscussionId?: string | null;
+	spamTagId?: string | null;
+};
+
+export const createReport = async (options: CreateReportOptions) => {
+	const { userId, communityId, flaggedById, reason, reasonText, sourceDiscussionId, spamTagId } =
+		options;
+	const report = await CommunityModerationReport.create({
+		userId,
+		communityId,
+		flaggedById,
+		reason,
+		reasonText: reasonText ?? null,
+		sourceDiscussionId: sourceDiscussionId ?? null,
+		spamTagId: spamTagId ?? null,
+	});
+	return report.toJSON();
+};
+
+export const updateReportStatus = async (reportId: string, status: ModerationReportStatus) => {
+	const report = await CommunityModerationReport.findByPk(reportId);
+	if (!report) return null;
+	await report.update({ status });
+	return report.toJSON();
+};
+
+export const getActiveReportsForUserInCommunity = async (
+	userId: string,
+	communityId: string,
+): Promise<CommunityModerationReport[]> => {
+	return CommunityModerationReport.findAll({
+		where: { userId, communityId, status: 'active' },
+	});
+};
+
+export const getReportedUserIdsForCommunity = async (communityId: string): Promise<Set<string>> => {
+	const reports = await CommunityModerationReport.findAll({
+		where: { communityId, status: 'active' },
+		attributes: ['userId'],
+	});
+	return new Set(reports.map((r) => r.userId));
+};
+
+export const isUserReportedInCommunity = async (
+	userId: string,
+	communityId: string,
+): Promise<boolean> => {
+	const count = await CommunityModerationReport.count({
+		where: { userId, communityId, status: 'active' },
+	});
+	return count > 0;
+};
+
+export const getReportsForCommunity = async (communityId: string) => {
+	return CommunityModerationReport.findAll({
+		where: { communityId },
+		order: [['createdAt', 'DESC']],
+		include: [
+			{ model: User, as: 'user', attributes: ['id', 'fullName', 'slug', 'email'] },
+			{ model: User, as: 'flaggedBy', attributes: ['id', 'fullName', 'slug'] },
+			{ model: Discussion, as: 'sourceDiscussion', attributes: ['id', 'title'] },
+			{ model: SpamTag, as: 'spamTag', attributes: ['id', 'status'] },
+		],
+	});
+};
+
+export const getAllActiveReports = async () => {
+	return CommunityModerationReport.findAll({
+		where: { status: 'active' },
+		order: [['createdAt', 'DESC']],
+		include: [
+			{ model: User, as: 'user', attributes: ['id', 'fullName', 'slug', 'email'] },
+			{ model: User, as: 'flaggedBy', attributes: ['id', 'fullName', 'slug'] },
+			{ model: Community, as: 'community', attributes: ['id', 'subdomain'] },
+			{ model: Discussion, as: 'sourceDiscussion', attributes: ['id', 'title'] },
+			{ model: SpamTag, as: 'spamTag', attributes: ['id', 'status'] },
+		],
+	});
+};
+
+export const getReportById = async (reportId: string) => {
+	return CommunityModerationReport.findByPk(reportId, {
+		include: [
+			{ model: User, as: 'user', attributes: ['id', 'fullName', 'slug', 'email'] },
+			{ model: User, as: 'flaggedBy', attributes: ['id', 'fullName', 'slug'] },
+			{ model: Community, as: 'community', attributes: ['id', 'subdomain'] },
+			{ model: SpamTag, as: 'spamTag', attributes: ['id', 'status'] },
+		],
+	});
+};
+
+export const getActiveReportCountForUser = async (userId: string): Promise<number> => {
+	return CommunityModerationReport.count({
+		where: { userId, status: 'active' },
+	});
+};
+
+export const getActiveReportsByFlaggedBy = async (
+	reportId: string,
+	flaggedById: string,
+): Promise<CommunityModerationReport | null> => {
+	return CommunityModerationReport.findOne({
+		where: { id: reportId, flaggedById },
+	});
+};
+
+export const getActiveReportIdsForUserInCommunity = async (
+	userId: string,
+	communityId: string,
+): Promise<string[]> => {
+	const reports = await CommunityModerationReport.findAll({
+		where: { userId, communityId, status: 'active' },
+		attributes: ['id'],
+	});
+	return reports.map((r) => r.id);
+};
+
+type ReportedUserMapEntry = {
+	reportIds: string[];
+};
+
+export const getReportedUserMapForCommunity = async (
+	communityId: string,
+): Promise<Map<string, ReportedUserMapEntry>> => {
+	const reports = await CommunityModerationReport.findAll({
+		where: { communityId, status: 'active' },
+		attributes: ['id', 'userId'],
+	});
+	const map = new Map<string, ReportedUserMapEntry>();
+	for (const r of reports) {
+		const existing = map.get(r.userId);
+		if (existing) {
+			existing.reportIds.push(r.id);
+		} else {
+			map.set(r.userId, { reportIds: [r.id] });
+		}
+	}
+	return map;
+};
diff --git a/server/discussion/api.ts b/server/discussion/api.ts
index 4cbec050b7..0640dd29b4 100644
--- a/server/discussion/api.ts
+++ b/server/discussion/api.ts
@@ -1,6 +1,6 @@
 import { Router } from 'express';
 
-import { isUserFlaggedInCommunity } from 'server/userCommunityFlag/queries';
+import { isUserReportedInCommunity } from 'server/communityModerationReport/queries';
 import { verifyCaptchaPayload } from 'server/utils/captcha';
 import { BadRequestError, ForbiddenError } from 'server/utils/errors';
 import { handleHoneypotTriggered, isHoneypotFilled } from 'server/utils/honeypot';
@@ -35,7 +35,7 @@ router.post(
 		}
 		const userId = (req.user?.id as string) || null;
 		if (userId && req.body.communityId) {
-			const flagged = await isUserFlaggedInCommunity(userId, req.body.communityId);
+			const flagged = await isUserReportedInCommunity(userId, req.body.communityId);
 			if (flagged) {
 				throw new ForbiddenError();
 			}
@@ -56,7 +56,7 @@ router.post(
 		}
 		const formUserId = (req.user?.id as string) || null;
 		if (formUserId && req.body.communityId) {
-			const flagged = await isUserFlaggedInCommunity(formUserId, req.body.communityId);
+			const flagged = await isUserReportedInCommunity(formUserId, req.body.communityId);
 			if (flagged) {
 				throw new ForbiddenError();
 			}
diff --git a/server/models.ts b/server/models.ts
index 95c4d04c2e..78ff6f8c45 100644
--- a/server/models.ts
+++ b/server/models.ts
@@ -9,6 +9,12 @@ import { sequelize } from './sequelize';
 /* Import and create all models. */
 /* Also import them to make them available to other modules */
 
+/* Import and create all models. */
+/* Also import them to make them available to other modules */
+
+/* Import and create all models. */
+/* Also import them to make them available to other modules */
+
 import { ActivityItem } from './activityItem/model';
 import { AuthToken } from './authToken/model';
 import { Collection } from './collection/model';
@@ -17,6 +23,7 @@ import { CollectionPub } from './collectionPub/model';
 import { Commenter } from './commenter/model';
 import { Community } from './community/model';
 import { CommunityAdmin } from './communityAdmin/model';
+import { CommunityModerationReport } from './communityModerationReport/model';
 import { CrossrefDepositRecord } from './crossrefDepositRecord/model';
 import { CustomScript } from './customScript/model';
 import { DepositTarget } from './depositTarget/model';
@@ -56,7 +63,6 @@ import { Thread } from './thread/model';
 import { ThreadComment } from './threadComment/model';
 import { ThreadEvent } from './threadEvent/model';
 import { User } from './user/model';
-import { UserCommunityFlag } from './userCommunityFlag/model';
 import { UserDismissable } from './userDismissable/model';
 import { UserNotification } from './userNotification/model';
 import { UserNotificationPreferences } from './userNotificationPreferences/model';
@@ -116,7 +122,7 @@ sequelize.addModels([
 	ThreadComment,
 	ThreadEvent,
 	User,
-	UserCommunityFlag,
+	CommunityModerationReport,
 	UserDismissable,
 	UserNotification,
 	UserNotificationPreferences,
@@ -209,7 +215,7 @@ export {
 	ThreadComment,
 	ThreadEvent,
 	User,
-	UserCommunityFlag,
+	CommunityModerationReport,
 	UserDismissable,
 	UserNotification,
 	UserNotificationPreferences,
diff --git a/server/pub/permissions.ts b/server/pub/permissions.ts
index 62aed904e2..7df99ca264 100644
--- a/server/pub/permissions.ts
+++ b/server/pub/permissions.ts
@@ -1,7 +1,7 @@
 import type { CanCreatePub } from 'types';
 
+import { isUserReportedInCommunity } from 'server/communityModerationReport/queries';
 import { Community } from 'server/models';
-import { isUserFlaggedInCommunity } from 'server/userCommunityFlag/queries';
 import { getScope } from 'server/utils/queryHelpers';
 import { expect } from 'utils/assert';
 
@@ -39,10 +39,10 @@ export const canCreatePub = async ({
 			return { create: false };
 		}
 
-		const [scopeData, communityData, isFlagged] = await Promise.all([
+		const [scopeData, communityData, isReported] = await Promise.all([
 			getScope({ communityId, collectionId, loginId: userId }),
 			Community.findOne({ where: { id: communityId }, attributes: ['hideCreatePubButton'] }),
-			isUserFlaggedInCommunity(userId, communityId),
+			isUserReportedInCommunity(userId, communityId),
 		]);
 
 		const {
@@ -51,7 +51,7 @@ export const canCreatePub = async ({
 		const { hideCreatePubButton } = expect(communityData);
 
 		return {
-			create: !isFlagged && (canManage || !hideCreatePubButton),
+			create: !isReported && (canManage || !hideCreatePubButton),
 			collectionIds: [collectionId],
 		};
 	}
diff --git a/server/routes/superAdminDashboard.tsx b/server/routes/superAdminDashboard.tsx
index 29cd183a29..8516959231 100644
--- a/server/routes/superAdminDashboard.tsx
+++ b/server/routes/superAdminDashboard.tsx
@@ -40,12 +40,32 @@ const getTabProps = async (tabKind: SuperAdminTabKind, locationData: types.Locat
 	}
 	if (tabKind === 'spamUsers') {
 		const searchTerm = locationData.query.q ?? null;
-		const { query } = spamUsersFiltersById.all;
+		const filterId = (locationData.query.filter as string) ?? 'all';
+		const baseFilter = spamUsersFiltersById[filterId] ?? spamUsersFiltersById.all;
+		const sortParam = locationData.query.sort as string | undefined;
+		const ordering = sortParam
+			? {
+					field: sortParam.split(':')[0],
+					direction: sortParam.split(':')[1] || 'DESC',
+				}
+			: baseFilter.query!.ordering;
 		const users = await queryUsersForSpamManagement({
 			limit: 50,
 			searchTerm,
 			includeAffiliation: true,
-			...query!,
+			...baseFilter.query!,
+			ordering: ordering as any,
+			communitySubdomain: (locationData.query.community as string) || undefined,
+			createdAfter: (locationData.query.createdAfter as string) || undefined,
+			createdBefore: (locationData.query.createdBefore as string) || undefined,
+			activeAfter: (locationData.query.activeAfter as string) || undefined,
+			activeBefore: (locationData.query.activeBefore as string) || undefined,
+			minActivities: locationData.query.minActivities
+				? Number(locationData.query.minActivities)
+				: undefined,
+			maxActivities: locationData.query.maxActivities
+				? Number(locationData.query.maxActivities)
+				: undefined,
 		});
 		return {
 			searchTerm,
diff --git a/server/spamTag/api.ts b/server/spamTag/api.ts
index 539ebeace2..422bd3c5e5 100644
--- a/server/spamTag/api.ts
+++ b/server/spamTag/api.ts
@@ -2,6 +2,7 @@ import type { UserSpamTagFields } from 'types';
 
 import { Router } from 'express';
 
+import { CommunityModerationReport, User } from 'server/models';
 import { ForbiddenError } from 'server/utils/errors';
 import { wrap } from 'server/wrap';
 import { expect } from 'utils/assert';
@@ -13,6 +14,47 @@ import { canManipulateSpamTags } from './permissions';
 import { getRecentDiscussionsForUser, queryUsersForSpamManagement } from './userDashboard';
 import { getSpamTagForUser, removeSpamTagFromUser, upsertSpamTag } from './userQueries';
 
+const notifyReportersOfResolution = async (
+	userId: string,
+	reportedUser: {
+		id: string;
+		email?: string | null;
+		fullName?: string | null;
+		slug: string;
+		avatar?: string | null;
+	},
+	resolution: string,
+) => {
+	const reports = await CommunityModerationReport.findAll({
+		where: { userId, status: 'active' },
+		attributes: ['flaggedById', 'communityId'],
+	});
+	if (reports.length === 0) return;
+
+	const flaggedByIds = [...new Set(reports.map((r) => r.flaggedById))];
+	const reporters = await User.findAll({
+		where: { id: flaggedByIds },
+		attributes: ['id', 'email', 'fullName'],
+	});
+	const reporterMap = new Map(reporters.map((u) => [u.id, u]));
+
+	await Promise.all(
+		reports.map((report) => {
+			const reporter = reporterMap.get(report.flaggedById);
+			if (!reporter?.email) return Promise.resolve();
+			return notify(
+				'community-flag-resolved',
+				contextFromUser(reportedUser, {
+					communityId: report.communityId,
+					flaggedByEmail: reporter.email,
+					flaggedByName: reporter.fullName ?? '',
+					resolution,
+				}),
+			);
+		}),
+	);
+};
+
 export const router = Router();
 
 router.put(
@@ -59,6 +101,16 @@ router.put(
 				spamFields: spamTag.fields as UserSpamTagFields,
 			}),
 		);
+
+		// notify community admins who filed reports about this user
+		const resolution =
+			status === 'confirmed-spam'
+				? 'The user has been confirmed as spam and banned.'
+				: 'The user has been reviewed and confirmed as not spam.';
+		notifyReportersOfResolution(userId, user, resolution).catch((err) =>
+			console.error('Failed to notify reporters of resolution', err),
+		);
+
 		return res.status(200).send({});
 	}),
 );
@@ -112,6 +164,8 @@ router.post('/api/spamTags/queryUsersForSpam', async (req, res) => {
 		activeBefore,
 		minActivities,
 		maxActivities,
+		hasCommunityReport,
+		spamFieldsFilter,
 	} = req.body;
 	const canQuery = await canManipulateSpamTags({
 		userId: expect(req.user).id,
@@ -134,6 +188,8 @@ router.post('/api/spamTags/queryUsersForSpam', async (req, res) => {
 		activeBefore,
 		minActivities: minActivities != null ? Number(minActivities) : undefined,
 		maxActivities: maxActivities != null ? Number(maxActivities) : undefined,
+		hasCommunityReport: !!hasCommunityReport,
+		spamFieldsFilter: Array.isArray(spamFieldsFilter) ? spamFieldsFilter : undefined,
 	});
 	return res.status(200).send(queryResult);
 });
diff --git a/server/spamTag/notifications.ts b/server/spamTag/notifications.ts
index db428cfd69..7ce9f47c9f 100644
--- a/server/spamTag/notifications.ts
+++ b/server/spamTag/notifications.ts
@@ -1,7 +1,9 @@
-import type { SpamStatus, UserCommunityFlagReason, UserSpamTagFields } from 'types';
+import type { ModerationReportReason, SpamStatus, UserSpamTagFields } from 'types';
 
 import {
 	sendBanDevEmail,
+	sendCommunityFlagDevEmail,
+	sendCommunityFlagResolvedEmail,
 	sendLiftDevEmail,
 	sendNewSpamTagDevEmail,
 	sendSpamBanEmail,
@@ -21,7 +23,9 @@ export type SpamEvent =
 	| 'honeypot-ban'
 	| 'manual-ban'
 	| 'spam-lifted'
-	| 'community-flag';
+	| 'community-flag'
+	| 'community-flag-retracted'
+	| 'community-flag-resolved';
 
 type SharedContext = {
 	userId: string;
@@ -57,10 +61,22 @@ type CommunityFlagContext = SharedContext & {
 	communityId: string;
 	sourceDiscussionId?: string | null;
 	flaggedById: string;
-	flagReason: UserCommunityFlagReason;
+	flagReason: ModerationReportReason;
 	flagReasonText?: string | null;
 };
 
+type CommunityFlagRetractedContext = SharedContext & {
+	communityId: string;
+	flaggedById: string;
+};
+
+type CommunityFlagResolvedContext = SharedContext & {
+	communityId: string;
+	flaggedByEmail?: string;
+	flaggedByName?: string;
+	resolution?: string;
+};
+
 export type SpamNotificationContext = {
 	userId: string;
 	userEmail: string;
@@ -75,8 +91,11 @@ export type SpamNotificationContext = {
 	communityId?: string;
 	sourceDiscussionId?: string | null;
 	flaggedById?: string;
-	flagReason?: UserCommunityFlagReason;
+	flagReason?: ModerationReportReason;
 	flagReasonText?: string | null;
+	flaggedByEmail?: string;
+	flaggedByName?: string;
+	resolution?: string;
 };
 
 type Handler<T extends SharedContext> = (ctx: T) => Promise<void>;
@@ -88,6 +107,8 @@ type Contexts = {
 	'manual-ban': ManualBanContext;
 	'spam-lifted': SpamLiftedContext;
 	'community-flag': CommunityFlagContext;
+	'community-flag-retracted': CommunityFlagRetractedContext;
+	'community-flag-resolved': CommunityFlagResolvedContext;
 };
 
 const handlers = {
@@ -154,6 +175,34 @@ const handlers = {
 				reasonText: ctx.flagReasonText,
 				sourceDiscussionId: ctx.sourceDiscussionId,
 			}),
+		(ctx) =>
+			sendCommunityFlagDevEmail({
+				userEmail: ctx.userEmail,
+				userName: ctx.userName,
+				communityId: ctx.communityId,
+				flagReason: ctx.flagReason,
+			}),
+	],
+	'community-flag-retracted': [
+		(ctx) =>
+			postToSlackAboutCommunityFlag({
+				userId: ctx.userId,
+				communityId: ctx.communityId,
+				flaggedById: ctx.flaggedById,
+				reason: 'other',
+				reasonText: 'Flag retracted by community admin',
+			}),
+	],
+	'community-flag-resolved': [
+		async (ctx) => {
+			if (!ctx.flaggedByEmail) return;
+			await sendCommunityFlagResolvedEmail({
+				toEmail: ctx.flaggedByEmail,
+				flaggedByName: ctx.flaggedByName ?? '',
+				userName: ctx.userName,
+				resolution: ctx.resolution ?? 'reviewed',
+			});
+		},
 	],
 } satisfies { [K in keyof Contexts]: Handler<Contexts[K]>[] };
 
diff --git a/server/spamTag/userDashboard.ts b/server/spamTag/userDashboard.ts
index 69aea0923b..6754715eed 100644
--- a/server/spamTag/userDashboard.ts
+++ b/server/spamTag/userDashboard.ts
@@ -4,6 +4,7 @@ import { literal, Op } from 'sequelize';
 
 import {
 	Community,
+	CommunityModerationReport,
 	Discussion,
 	Member,
 	Pub,
@@ -45,6 +46,8 @@ const getUserWhereQuery = (options: {
 	activeBefore?: string;
 	minActivities?: number;
 	maxActivities?: number;
+	hasCommunityReport?: boolean;
+	spamFieldsFilter?: types.SpamFieldsFilterKey[];
 }) => {
 	const conditions: any[] = [];
 
@@ -102,6 +105,43 @@ const getUserWhereQuery = (options: {
 		conditions.push(literal(`${activityCountSubquery} <= ${Number(options.maxActivities)}`));
 	}
 
+	if (options.hasCommunityReport) {
+		conditions.push({
+			id: {
+				[Op.in]: literal(`(
+					SELECT DISTINCT "userId" FROM "CommunityModerationReports"
+					WHERE "status" = 'active'
+				)`),
+			},
+		});
+	}
+
+	if (options.spamFieldsFilter?.length) {
+		const allowed = new Set<string>([
+			'honeypotTriggers',
+			'suspiciousFiles',
+			'suspiciousComments',
+			'manuallyMarkedBy',
+		]);
+		const validKeys = options.spamFieldsFilter.filter((k) => allowed.has(k));
+		if (validKeys.length > 0) {
+			// each key: fields->key exists and is a non-empty array
+			const jsonConditions = validKeys
+				.map((k) => {
+					const escaped = User.sequelize!.escape(k);
+					return `("fields"->>${escaped} IS NOT NULL AND jsonb_array_length("fields"->${escaped}) > 0)`;
+				})
+				.join(' OR ');
+			conditions.push({
+				spamTagId: {
+					[Op.in]: literal(`(
+						SELECT "id" FROM "SpamTags" WHERE ${jsonConditions}
+					)`),
+				},
+			});
+		}
+	}
+
 	if (conditions.length === 0) return {};
 	if (conditions.length === 1) return { where: conditions[0] };
 	return { where: { [Op.and]: conditions } };
@@ -142,6 +182,7 @@ export type UserSpamManagementRow =
 type SerializedSpamUserRow = Record<string, unknown> & {
 	id: string;
 	affiliation?: types.SpamUserAffiliation;
+	communityReports?: types.SpamUserCommunityReport[];
 };
 
 export const queryUsersForSpamManagement = async (
@@ -162,6 +203,8 @@ export const queryUsersForSpamManagement = async (
 		activeBefore,
 		minActivities,
 		maxActivities,
+		hasCommunityReport,
+		spamFieldsFilter,
 	} = query;
 	const hasStatusFilter = status && status.length > 0;
 	const spamTagRequired = spamTagPresence === 'present' || !!hasStatusFilter;
@@ -184,6 +227,8 @@ export const queryUsersForSpamManagement = async (
 			activeBefore,
 			minActivities,
 			maxActivities,
+			hasCommunityReport,
+			spamFieldsFilter,
 		}),
 		attributes: ['id', 'fullName', 'email', 'slug', 'createdAt'],
 		limit,
@@ -198,15 +243,72 @@ export const queryUsersForSpamManagement = async (
 	});
 	if (includeAffiliation && plain.length > 0) {
 		const userIds = plain.map((r) => r.id as string);
-		const affiliationMap = await getAffiliationForUserIds(userIds);
+		const [affiliationMap, reportsMap] = await Promise.all([
+			getAffiliationForUserIds(userIds),
+			getCommunityReportsForUserIds(userIds),
+		]);
 		return plain.map((r) => ({
 			...r,
 			affiliation: affiliationMap.get(r.id as string),
+			communityReports: reportsMap.get(r.id as string) ?? [],
 		})) as SerializedSpamUserRow[];
 	}
 	return plain as SerializedSpamUserRow[];
 };
 
+const getCommunityReportsForUserIds = async (
+	userIds: string[],
+): Promise<Map<string, types.SpamUserCommunityReport[]>> => {
+	const reports = await CommunityModerationReport.findAll({
+		raw: true,
+		where: { userId: { [Op.in]: userIds }, status: 'active' },
+		attributes: ['userId', 'reason', 'reasonText', 'status', 'createdAt'],
+		include: [
+			{ model: Community, as: 'community', attributes: ['subdomain'] },
+			{ model: User, as: 'flaggedBy', attributes: ['fullName'] },
+			{
+				model: Discussion,
+				as: 'sourceDiscussion',
+				attributes: ['title'],
+				include: [
+					{
+						model: Pub,
+						as: 'pub',
+						attributes: ['slug'],
+						include: [{ model: Community, as: 'community', attributes: ['subdomain'] }],
+					},
+				],
+			},
+		],
+	});
+	const map = new Map<string, types.SpamUserCommunityReport[]>();
+	for (const r of reports) {
+		const raw = r as any;
+		const subdomain = raw['sourceDiscussion.pub.community.subdomain'] as string | undefined;
+		const pubSlug = raw['sourceDiscussion.pub.slug'] as string | undefined;
+		const discussionTitle = raw['sourceDiscussion.title'] as string | undefined;
+		const sourceUrl =
+			subdomain && pubSlug ? `https://${subdomain}.pubpub.org/pub/${pubSlug}` : null;
+		const entry: types.SpamUserCommunityReport = {
+			communitySubdomain: raw['community.subdomain'] ?? 'unknown',
+			reason: raw.reason,
+			reasonText: raw.reasonText ?? null,
+			status: raw.status,
+			createdAt: raw.createdAt,
+			flaggedByName: raw['flaggedBy.fullName'] ?? null,
+			sourceDiscussionTitle: discussionTitle || null,
+			sourceDiscussionUrl: sourceUrl,
+		};
+		const existing = map.get(raw.userId);
+		if (existing) {
+			existing.push(entry);
+		} else {
+			map.set(raw.userId, [entry]);
+		}
+	}
+	return map;
+};
+
 const getAffiliationForUserIds = async (
 	userIds: string[],
 ): Promise<Map<string, types.SpamUserAffiliation>> => {
diff --git a/server/threadComment/api.ts b/server/threadComment/api.ts
index 7b04a89bd3..080b355865 100644
--- a/server/threadComment/api.ts
+++ b/server/threadComment/api.ts
@@ -1,6 +1,6 @@
 import { Router } from 'express';
 
-import { isUserFlaggedInCommunity } from 'server/userCommunityFlag/queries';
+import { isUserReportedInCommunity } from 'server/communityModerationReport/queries';
 import { verifyCaptchaPayload } from 'server/utils/captcha';
 import { BadRequestError, ForbiddenError } from 'server/utils/errors';
 import { handleHoneypotTriggered, isHoneypotFilled } from 'server/utils/honeypot';
@@ -35,7 +35,7 @@ router.post(
 		}
 		const userId = (req.user?.id as string) || null;
 		if (userId && req.body.communityId) {
-			const flagged = await isUserFlaggedInCommunity(userId, req.body.communityId);
+			const flagged = await isUserReportedInCommunity(userId, req.body.communityId);
 			if (flagged) {
 				throw new ForbiddenError();
 			}
@@ -56,7 +56,7 @@ router.post(
 		}
 		const formUserId = (req.user?.id as string) || null;
 		if (formUserId && req.body.communityId) {
-			const flagged = await isUserFlaggedInCommunity(formUserId, req.body.communityId);
+			const flagged = await isUserReportedInCommunity(formUserId, req.body.communityId);
 			if (flagged) {
 				throw new ForbiddenError();
 			}
diff --git a/server/userCommunityFlag/api.ts b/server/userCommunityFlag/api.ts
deleted file mode 100644
index c674c48cb9..0000000000
--- a/server/userCommunityFlag/api.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { Router } from 'express';
-
-import { notify } from 'server/spamTag/notifications';
-import { canManipulateSpamTags } from 'server/spamTag/permissions';
-import { ForbiddenError, NotFoundError } from 'server/utils/errors';
-import { getScope } from 'server/utils/queryHelpers';
-import { wrap } from 'server/wrap';
-
-import {
-	createFlag,
-	getAllActiveFlags,
-	getFlagById,
-	getFlagsForCommunity,
-	updateFlagStatus,
-} from './queries';
-
-export const router = Router();
-
-router.post(
-	'/api/userCommunityFlags',
-	wrap(async (req, res) => {
-		const { userId, communityId, reason, reasonText, sourceDiscussionId } = req.body;
-		const flaggedById = req.user?.id;
-		if (!flaggedById || !userId || !communityId || !reason) {
-			return res.status(400).send({ error: 'Missing required fields' });
-		}
-
-		const scopeData = await getScope({ communityId, loginId: flaggedById });
-		if (!scopeData.activePermissions.canAdmin) {
-			throw new ForbiddenError();
-		}
-
-		const flag = await createFlag({
-			userId,
-			communityId,
-			flaggedById,
-			reason,
-			reasonText,
-			sourceDiscussionId,
-		});
-
-		notify('community-flag', {
-			userId,
-			userEmail: '',
-			userName: '',
-			userSlug: '',
-			communityId,
-			flaggedById,
-			flagReason: reason,
-			flagReasonText: reasonText,
-			sourceDiscussionId,
-		}).catch((err) => console.error('Failed to send community flag notification', err));
-
-		return res.status(201).json(flag);
-	}),
-);
-
-router.put(
-	'/api/userCommunityFlags/:id',
-	wrap(async (req, res) => {
-		const { status } = req.body;
-		const isSuperAdmin = await canManipulateSpamTags({ userId: req.user?.id });
-		if (!isSuperAdmin) {
-			throw new ForbiddenError();
-		}
-		const updated = await updateFlagStatus(req.params.id, status);
-		if (!updated) {
-			throw new NotFoundError();
-		}
-		return res.status(200).json(updated);
-	}),
-);
-
-router.get(
-	'/api/userCommunityFlags',
-	wrap(async (req, res) => {
-		const communityId = req.query.communityId as string | undefined;
-		const userId = req.user?.id;
-		if (!userId) {
-			throw new ForbiddenError();
-		}
-
-		if (communityId) {
-			const scopeData = await getScope({ communityId, loginId: userId });
-			if (!scopeData.activePermissions.canAdmin) {
-				throw new ForbiddenError();
-			}
-			const flags = await getFlagsForCommunity(communityId);
-			return res.status(200).json(flags);
-		}
-
-		const isSuperAdmin = await canManipulateSpamTags({ userId });
-		if (!isSuperAdmin) {
-			throw new ForbiddenError();
-		}
-		const flags = await getAllActiveFlags();
-		return res.status(200).json(flags);
-	}),
-);
diff --git a/server/userCommunityFlag/queries.ts b/server/userCommunityFlag/queries.ts
deleted file mode 100644
index 02853aedb1..0000000000
--- a/server/userCommunityFlag/queries.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import type { UserCommunityFlagReason, UserCommunityFlagStatus } from 'types';
-
-import { Community, Discussion, User, UserCommunityFlag } from 'server/models';
-
-type CreateFlagOptions = {
-	userId: string;
-	communityId: string;
-	flaggedById: string;
-	reason: UserCommunityFlagReason;
-	reasonText?: string | null;
-	sourceDiscussionId?: string | null;
-};
-
-export const createFlag = async (options: CreateFlagOptions) => {
-	const { userId, communityId, flaggedById, reason, reasonText, sourceDiscussionId } = options;
-	const flag = await UserCommunityFlag.create({
-		userId,
-		communityId,
-		flaggedById,
-		reason,
-		reasonText: reasonText ?? null,
-		sourceDiscussionId: sourceDiscussionId ?? null,
-	});
-	return flag.toJSON();
-};
-
-export const updateFlagStatus = async (flagId: string, status: UserCommunityFlagStatus) => {
-	const flag = await UserCommunityFlag.findByPk(flagId);
-	if (!flag) return null;
-	await flag.update({ status });
-	return flag.toJSON();
-};
-
-export const getActiveFlagsForUserInCommunity = async (
-	userId: string,
-	communityId: string,
-): Promise<UserCommunityFlag[]> => {
-	return UserCommunityFlag.findAll({
-		where: { userId, communityId, status: 'active' },
-	});
-};
-
-export const getFlaggedUserIdsForCommunity = async (communityId: string): Promise<Set<string>> => {
-	const flags = await UserCommunityFlag.findAll({
-		where: { communityId, status: 'active' },
-		attributes: ['userId'],
-	});
-	return new Set(flags.map((f) => f.userId));
-};
-
-export const isUserFlaggedInCommunity = async (
-	userId: string,
-	communityId: string,
-): Promise<boolean> => {
-	const count = await UserCommunityFlag.count({
-		where: { userId, communityId, status: 'active' },
-	});
-	return count > 0;
-};
-
-export const getFlagsForCommunity = async (communityId: string) => {
-	return UserCommunityFlag.findAll({
-		where: { communityId },
-		order: [['createdAt', 'DESC']],
-		include: [
-			{ model: User, as: 'user', attributes: ['id', 'fullName', 'slug', 'email'] },
-			{ model: User, as: 'flaggedBy', attributes: ['id', 'fullName', 'slug'] },
-			{ model: Discussion, as: 'sourceDiscussion', attributes: ['id', 'title'] },
-		],
-	});
-};
-
-export const getAllActiveFlags = async () => {
-	return UserCommunityFlag.findAll({
-		where: { status: 'active' },
-		order: [['createdAt', 'DESC']],
-		include: [
-			{ model: User, as: 'user', attributes: ['id', 'fullName', 'slug', 'email'] },
-			{ model: User, as: 'flaggedBy', attributes: ['id', 'fullName', 'slug'] },
-			{ model: Community, as: 'community', attributes: ['id', 'subdomain'] },
-			{ model: Discussion, as: 'sourceDiscussion', attributes: ['id', 'title'] },
-		],
-	});
-};
-
-export const getFlagById = async (flagId: string) => {
-	return UserCommunityFlag.findByPk(flagId, {
-		include: [
-			{ model: User, as: 'user', attributes: ['id', 'fullName', 'slug', 'email'] },
-			{ model: User, as: 'flaggedBy', attributes: ['id', 'fullName', 'slug'] },
-			{ model: Community, as: 'community', attributes: ['id', 'subdomain'] },
-		],
-	});
-};
-
-export const getActiveFlagCountForUser = async (userId: string): Promise<number> => {
-	return UserCommunityFlag.count({
-		where: { userId, status: 'active' },
-	});
-};
-
-type FlagCheckResult = {
-	isFlagged: boolean;
-	flags: Array<{ communityId: string; reason: UserCommunityFlagReason }>;
-};
-
-export const getActiveFlagsForUser = async (userId: string): Promise<FlagCheckResult> => {
-	const flags = await UserCommunityFlag.findAll({
-		where: { userId, status: 'active' },
-		attributes: ['communityId', 'reason'],
-	});
-	return {
-		isFlagged: flags.length > 0,
-		flags: flags.map((f) => ({
-			communityId: f.communityId,
-			reason: f.reason,
-		})),
-	};
-};
diff --git a/server/utils/email/spam.ts b/server/utils/email/spam.ts
index d541291a1f..4576bf4189 100644
--- a/server/utils/email/spam.ts
+++ b/server/utils/email/spam.ts
@@ -4,7 +4,7 @@ import { getSuperAdminTabUrl } from 'utils/superAdmin';
 
 import { sendEmail } from './reset';
 
-export const DEV_TEAM_EMAIL = 'dev@pubpub.org';
+export const DEV_TEAM_EMAIL = 'other@tefkah.com';
 
 export const sendSpamBanEmail = ({ toEmail, userName }: { toEmail: string; userName: string }) => {
 	return sendEmail({
@@ -106,3 +106,55 @@ export const sendLiftDevEmail = ({
 		`),
 	});
 };
+
+export const sendCommunityFlagDevEmail = ({
+	userEmail,
+	userName,
+	communityId,
+	flagReason,
+}: {
+	userEmail: string;
+	userName: string;
+	communityId: string;
+	flagReason: string;
+}) => {
+	const reviewUrl = `https://pubpub.org${getSuperAdminTabUrl('spamUsers')}?q=${encodeURIComponent(userEmail || userName)}`;
+	return sendEmail({
+		to: [DEV_TEAM_EMAIL],
+		subject: `Community flag: ${userName || 'Unknown'} flagged for ${flagReason}`,
+		text: stripIndent(`
+			A community admin has flagged ${userName} (${userEmail}) for "${flagReason}" in community ${communityId}.
+
+			Review: ${reviewUrl}
+
+			-- PubPub Spam System
+		`),
+	});
+};
+
+export const sendCommunityFlagResolvedEmail = ({
+	toEmail,
+	flaggedByName,
+	userName,
+	resolution,
+}: {
+	toEmail: string;
+	flaggedByName: string;
+	userName: string;
+	resolution: string;
+}) => {
+	return sendEmail({
+		to: [toEmail],
+		subject: `Update on your report of ${userName} on PubPub`,
+		text: stripIndent(`
+			Hello${flaggedByName ? ` ${flaggedByName}` : ''},
+
+			Thank you for flagging ${userName} in your community. We have reviewed the report and the outcome is: ${resolution}.
+
+			If you have further concerns, please contact us at hello@pubpub.org.
+
+			Sincerely,
+			PubPub Team
+		`),
+	});
+};
diff --git a/server/utils/queryHelpers/discussionsSanitize.ts b/server/utils/queryHelpers/discussionsSanitize.ts
index ed0bf73a0c..a4ca576e12 100644
--- a/server/utils/queryHelpers/discussionsSanitize.ts
+++ b/server/utils/queryHelpers/discussionsSanitize.ts
@@ -14,8 +14,19 @@ const isHidden = (
 	flaggedUserIds?: Set<string>,
 ) => isAuthorSpam(author) || isAuthorFlagged(author, flaggedUserIds);
 
+type ReportedUserMapEntry = { reportIds: string[] };
+
 type SanitizeOptions = {
 	flaggedUserIds?: Set<string>;
+	reportedUserMap?: Map<string, ReportedUserMapEntry>;
+};
+
+const getReportIds = (
+	authorId: string | undefined,
+	reportedUserMap?: Map<string, ReportedUserMapEntry>,
+): string[] | undefined => {
+	if (!reportedUserMap || !authorId) return undefined;
+	return reportedUserMap.get(authorId)?.reportIds;
 };
 
 export default (
@@ -25,35 +36,46 @@ export default (
 	options?: SanitizeOptions,
 ) => {
 	const { canAdmin } = activePermissions;
-	const { flaggedUserIds } = options ?? {};
+	const { flaggedUserIds, reportedUserMap } = options ?? {};
 	const afterVisibility = sanitizeOnVisibility(discussions, activePermissions, loginId);
 
 	return afterVisibility
 		.filter((discussion) => {
-			if (!isHidden(discussion.author, flaggedUserIds)) {
-				return true;
-			}
+			if (!isHidden(discussion.author, flaggedUserIds)) return true;
 			return canAdmin;
 		})
 		.map((discussion) => {
-			const hidden = isHidden(discussion.author, flaggedUserIds);
+			const spam = isAuthorSpam(discussion.author);
+			const flagged = isAuthorFlagged(discussion.author, flaggedUserIds);
+			const reportIds = flagged
+				? getReportIds(discussion.author?.id, reportedUserMap)
+				: undefined;
+
 			const comments = (discussion.thread?.comments ?? [])
 				.filter((comment) => {
-					if (!isHidden(comment.author, flaggedUserIds)) {
-						return true;
-					}
+					if (!isHidden(comment.author, flaggedUserIds)) return true;
 					return canAdmin;
 				})
 				.map((comment) => {
-					if (!isHidden(comment.author, flaggedUserIds)) {
-						return comment;
-					}
-					return { ...comment, isAuthorSpam: true };
+					const commentSpam = isAuthorSpam(comment.author);
+					const commentFlagged = isAuthorFlagged(comment.author, flaggedUserIds);
+					if (!commentSpam && !commentFlagged) return comment;
+					const commentReportIds = commentFlagged
+						? getReportIds(comment.author?.id, reportedUserMap)
+						: undefined;
+					return {
+						...comment,
+						...(commentSpam && { isAuthorSpam: true }),
+						...(commentFlagged && !commentSpam && { isAuthorFlagged: true }),
+						...(commentReportIds && { moderationReportIds: commentReportIds }),
+					};
 				});
 
 			return {
 				...discussion,
-				...(hidden && { isAuthorSpam: true }),
+				...(spam && { isAuthorSpam: true }),
+				...(flagged && !spam && { isAuthorFlagged: true }),
+				...(reportIds && { moderationReportIds: reportIds }),
 				thread: {
 					...discussion.thread,
 					comments,
diff --git a/server/utils/queryHelpers/pubGet.ts b/server/utils/queryHelpers/pubGet.ts
index 0a2eedf903..f274f1002f 100644
--- a/server/utils/queryHelpers/pubGet.ts
+++ b/server/utils/queryHelpers/pubGet.ts
@@ -1,9 +1,12 @@
 import type * as types from 'types';
 import type { InitialData, PubGetOptions, SanitizedPubData } from 'types';
 
+import {
+	getReportedUserIdsForCommunity,
+	getReportedUserMapForCommunity,
+} from 'server/communityModerationReport/queries';
 import { fetchFacetsForScope } from 'server/facets';
 import { Pub } from 'server/models';
-import { getFlaggedUserIdsForCommunity } from 'server/userCommunityFlag/queries';
 import { expect } from 'utils/assert';
 
 import { createLogger } from './communityGet';
@@ -80,15 +83,21 @@ export const getPubForRequest = async (options: GetPubForRequestOptions) => {
 	const communityId = initialData.communityData.id;
 	const { log, end } = createLogger('getPubForRequest');
 
-	const [pubData, flaggedUserIds] = await Promise.all([
+	const [pubData, flaggedUserIds, reportedUserMap] = await Promise.all([
 		log('getPub', getPub({ slug, communityId }, pubGetOptions)),
-		log('getFlaggedUsers', getFlaggedUserIdsForCommunity(communityId)),
+		log('getReportedUsers', getReportedUserIdsForCommunity(communityId)),
+		log('getReportedUserMap', getReportedUserMapForCommunity(communityId)),
 	]);
 
 	const sanitized = await log(
 		'sanitizePub',
 		new Promise<null | SanitizedPubData>((resolve) => {
-			resolve(sanitizePub(pubData, initialData, releaseNumber, { flaggedUserIds }));
+			resolve(
+				sanitizePub(pubData, initialData, releaseNumber, {
+					flaggedUserIds,
+					reportedUserMap,
+				}),
+			);
 		}),
 	);
 
diff --git a/server/utils/queryHelpers/pubSanitize.ts b/server/utils/queryHelpers/pubSanitize.ts
index 41994b97ee..bfd0cb183e 100644
--- a/server/utils/queryHelpers/pubSanitize.ts
+++ b/server/utils/queryHelpers/pubSanitize.ts
@@ -33,8 +33,11 @@ const getFilteredExports = (pubData, isRelease) => {
 	return exports.filter((exp) => releaseHistoryKeys.has(exp.historyKey));
 };
 
+type ReportedUserMapEntry = { reportIds: string[] };
+
 type SanitizeOptions = {
 	flaggedUserIds?: Set<string>;
+	reportedUserMap?: Map<string, ReportedUserMapEntry>;
 };
 
 export default (
@@ -95,7 +98,10 @@ export default (
 			filterDiscussionsByDraftOrRelease(pubData.discussions, isRelease),
 			activePermissions,
 			loginData.id,
-			{ flaggedUserIds: options?.flaggedUserIds },
+			{
+				flaggedUserIds: options?.flaggedUserIds,
+				reportedUserMap: options?.reportedUserMap,
+			},
 		);
 	const reviews =
 		pubData.reviews && sanitizeReviews(pubData.reviews, activePermissions, loginData.id);
diff --git a/server/utils/slack.ts b/server/utils/slack.ts
index b12324eb55..94bd16ae46 100644
--- a/server/utils/slack.ts
+++ b/server/utils/slack.ts
@@ -1,4 +1,4 @@
-import type { SpamStatus, UserCommunityFlagReason, UserSpamTagFields } from 'types';
+import type { ModerationReportReason, SpamStatus, UserSpamTagFields } from 'types';
 
 import fetch from 'node-fetch';
 
@@ -418,7 +418,7 @@ type CommunityFlagSlackOptions = {
 	userId: string;
 	flaggedById: string;
 	communityId: string;
-	reason: UserCommunityFlagReason;
+	reason: ModerationReportReason;
 	reasonText?: string | null;
 	sourceDiscussionId?: string | null;
 };
diff --git a/tools/migrations/2026_03_04_createUserCommunityFlags.js b/tools/migrations/2026_03_04_createUserCommunityFlags.js
deleted file mode 100644
index fa3e1af8c2..0000000000
--- a/tools/migrations/2026_03_04_createUserCommunityFlags.js
+++ /dev/null
@@ -1,62 +0,0 @@
-export const up = async ({ Sequelize, sequelize }) => {
-	await sequelize.queryInterface.createTable('UserCommunityFlags', {
-		id: {
-			type: Sequelize.UUID,
-			primaryKey: true,
-			defaultValue: Sequelize.UUIDV4,
-		},
-		userId: {
-			type: Sequelize.UUID,
-			allowNull: false,
-			references: { model: 'Users', key: 'id' },
-			onDelete: 'CASCADE',
-		},
-		communityId: {
-			type: Sequelize.UUID,
-			allowNull: false,
-			references: { model: 'Communities', key: 'id' },
-			onDelete: 'CASCADE',
-		},
-		flaggedById: {
-			type: Sequelize.UUID,
-			allowNull: false,
-			references: { model: 'Users', key: 'id' },
-			onDelete: 'CASCADE',
-		},
-		reason: {
-			type: Sequelize.ENUM('spam-content', 'hateful-language', 'harassment', 'impersonation', 'other'),
-			allowNull: false,
-		},
-		reasonText: {
-			type: Sequelize.TEXT,
-			allowNull: true,
-		},
-		sourceDiscussionId: {
-			type: Sequelize.UUID,
-			allowNull: true,
-			references: { model: 'Discussions', key: 'id' },
-			onDelete: 'SET NULL',
-		},
-		status: {
-			type: Sequelize.ENUM('active', 'dismissed', 'escalated'),
-			allowNull: false,
-			defaultValue: 'active',
-		},
-		createdAt: {
-			type: Sequelize.DATE,
-			allowNull: false,
-		},
-		updatedAt: {
-			type: Sequelize.DATE,
-			allowNull: false,
-		},
-	});
-
-	await sequelize.queryInterface.addIndex('UserCommunityFlags', ['userId']);
-	await sequelize.queryInterface.addIndex('UserCommunityFlags', ['communityId']);
-	await sequelize.queryInterface.addIndex('UserCommunityFlags', ['userId', 'communityId']);
-};
-
-export const down = async ({ sequelize }) => {
-	await sequelize.queryInterface.dropTable('UserCommunityFlags');
-};
diff --git a/types/spam.ts b/types/spam.ts
index a322ee9ace..a280703d80 100644
--- a/types/spam.ts
+++ b/types/spam.ts
@@ -48,6 +48,17 @@ export type SpamUserAffiliation = {
 	discussionCount: number;
 };
 
+export type SpamUserCommunityReport = {
+	communitySubdomain: string;
+	reason: string;
+	reasonText: string | null;
+	status: string;
+	createdAt: string;
+	flaggedByName: string | null;
+	sourceDiscussionTitle: string | null;
+	sourceDiscussionUrl: string | null;
+};
+
 export type SpamUserQuery = {
 	status?: SpamStatus[] | null;
 	offset?: number;
@@ -63,8 +74,16 @@ export type SpamUserQuery = {
 	activeBefore?: string;
 	minActivities?: number;
 	maxActivities?: number;
+	hasCommunityReport?: boolean;
+	spamFieldsFilter?: SpamFieldsFilterKey[];
 };
 
+export type SpamFieldsFilterKey =
+	| 'honeypotTriggers'
+	| 'suspiciousFiles'
+	| 'suspiciousComments'
+	| 'manuallyMarkedBy';
+
 export type RecentDiscussion = {
 	id: string;
 	title: string | null;
@@ -91,24 +110,31 @@ export type HoneypotContext = {
 	content?: string;
 };
 
-export type UserCommunityFlagReason =
+export type ModerationReportReason =
 	| 'spam-content'
 	| 'hateful-language'
 	| 'harassment'
 	| 'impersonation'
 	| 'other';
 
-export type UserCommunityFlagStatus = 'active' | 'dismissed' | 'escalated';
+/** @deprecated use ModerationReportReason */
+export type UserCommunityFlagReason = ModerationReportReason;
+
+export type ModerationReportStatus = 'active' | 'retracted' | 'dismissed' | 'escalated';
 
-export type SerializedUserCommunityFlag = {
+/** @deprecated use ModerationReportStatus */
+export type UserCommunityFlagStatus = ModerationReportStatus;
+
+export type SerializedCommunityModerationReport = {
 	id: string;
 	userId: string;
 	communityId: string;
 	flaggedById: string;
-	reason: UserCommunityFlagReason;
+	reason: ModerationReportReason;
 	reasonText: string | null;
 	sourceDiscussionId: string | null;
-	status: UserCommunityFlagStatus;
+	spamTagId: string | null;
+	status: ModerationReportStatus;
 	createdAt: string;
 	updatedAt: string;
 	user?: { fullName: string; slug: string; email?: string };
@@ -116,6 +142,9 @@ export type SerializedUserCommunityFlag = {
 	community?: { subdomain: string };
 };
 
+/** @deprecated use SerializedCommunityModerationReport */
+export type SerializedUserCommunityFlag = SerializedCommunityModerationReport;
+
 export type UserSpamTagFields = {
 	suspiciousFiles?: string[];
 	suspiciousComments?: string[];

From 20ba71141ace6748b69304800650287b0696f129 Mon Sep 17 00:00:00 2001
From: "Thomas F. K. Jorna" <hello@tefkah.com>
Date: Thu, 5 Mar 2026 11:40:46 +0100
Subject: [PATCH 03/10] fix: revert to tabs for scss

---
 .../UserSpam/userSpam.scss                    | 178 ++++-----
 .../UserSpam/userSpamEntry.scss               | 344 +++++++++---------
 2 files changed, 261 insertions(+), 261 deletions(-)

diff --git a/client/containers/SuperAdminDashboard/UserSpam/userSpam.scss b/client/containers/SuperAdminDashboard/UserSpam/userSpam.scss
index bf2d631aa1..580cf147e2 100644
--- a/client/containers/SuperAdminDashboard/UserSpam/userSpam.scss
+++ b/client/containers/SuperAdminDashboard/UserSpam/userSpam.scss
@@ -2,109 +2,109 @@
 $bp: vendor.$bp-namespace;
 
 .user-spam-component {
-  .toolbar {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 4px;
-    align-items: center;
-    margin-top: 8px;
-    padding: 4px 6px;
-    background: #f8f9fa;
-    border-radius: 4px;
-    border: 1px solid #e8e8ec;
+	.toolbar {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 4px;
+		align-items: center;
+		margin-top: 8px;
+		padding: 4px 6px;
+		background: #f8f9fa;
+		border-radius: 4px;
+		border: 1px solid #e8e8ec;
 
-    .toolbar-sort select {
-      font-size: 13px;
-    }
+		.toolbar-sort select {
+			font-size: 13px;
+		}
 
-    .community-input {
-      padding: 3px 8px;
-      border: 1px solid #d0d0d6;
-      border-radius: 3px;
-      font-size: 13px;
-      width: 140px;
-      background: white;
-      transition: border-color 0.15s, box-shadow 0.15s;
+		.community-input {
+			padding: 3px 8px;
+			border: 1px solid #d0d0d6;
+			border-radius: 3px;
+			font-size: 13px;
+			width: 140px;
+			background: white;
+			transition: border-color 0.15s, box-shadow 0.15s;
 
-      &:focus {
-        outline: none;
-        border-color: #137cbd;
-        box-shadow: 0 0 0 1px rgba(19, 124, 189, 0.3);
-      }
+			&:focus {
+				outline: none;
+				border-color: #137cbd;
+				box-shadow: 0 0 0 1px rgba(19, 124, 189, 0.3);
+			}
 
-      &::placeholder {
-        color: #aaa;
-      }
-    }
-  }
+			&::placeholder {
+				color: #aaa;
+			}
+		}
+	}
 
-  .users {
-    margin-top: 12px;
-    > :not(:last-child) {
-      margin-bottom: 6px;
-    }
-  }
+	.users {
+		margin-top: 12px;
+		> :not(:last-child) {
+			margin-bottom: 6px;
+		}
+	}
 
-  .no-results {
-    text-align: center;
-    padding: 24px;
-    color: #888;
-    font-size: 14px;
-  }
+	.no-results {
+		text-align: center;
+		padding: 24px;
+		color: #888;
+		font-size: 14px;
+	}
 }
 
 .popover-panel {
-  padding: 10px 12px;
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  min-width: 200px;
-  background: white !important;
-  border-radius: 4px;
-  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
+	padding: 10px 12px;
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+	min-width: 200px;
+	background: white !important;
+	border-radius: 4px;
+	box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
 
-  .popover-panel-title {
-    font-size: 12px;
-    font-weight: 600;
-    color: #555;
-    text-transform: uppercase;
-    letter-spacing: 0.4px;
-  }
+	.popover-panel-title {
+		font-size: 12px;
+		font-weight: 600;
+		color: #555;
+		text-transform: uppercase;
+		letter-spacing: 0.4px;
+	}
 
-  .popover-date-row,
-  .popover-range-row {
-    display: flex;
-    align-items: center;
-    gap: 6px;
+	.popover-date-row,
+	.popover-range-row {
+		display: flex;
+		align-items: center;
+		gap: 6px;
 
-    input {
-      flex: 1;
-      padding: 4px 6px;
-      border: 1px solid #d0d0d6;
-      border-radius: 3px;
-      font-size: 13px;
-      background: white;
+		input {
+			flex: 1;
+			padding: 4px 6px;
+			border: 1px solid #d0d0d6;
+			border-radius: 3px;
+			font-size: 13px;
+			background: white;
 
-      &:focus {
-        outline: none;
-        border-color: #137cbd;
-        box-shadow: 0 0 0 1px rgba(19, 124, 189, 0.3);
-      }
+			&:focus {
+				outline: none;
+				border-color: #137cbd;
+				box-shadow: 0 0 0 1px rgba(19, 124, 189, 0.3);
+			}
 
-      &::placeholder {
-        color: #aaa;
-      }
-    }
+			&::placeholder {
+				color: #aaa;
+			}
+		}
 
-    input[type='number'] {
-      width: 70px;
-      flex: 0 0 auto;
-    }
-  }
+		input[type='number'] {
+			width: 70px;
+			flex: 0 0 auto;
+		}
+	}
 
-  .popover-date-sep {
-    color: #888;
-    font-size: 12px;
-    flex-shrink: 0;
-  }
+	.popover-date-sep {
+		color: #888;
+		font-size: 12px;
+		flex-shrink: 0;
+	}
 }
diff --git a/client/containers/SuperAdminDashboard/UserSpam/userSpamEntry.scss b/client/containers/SuperAdminDashboard/UserSpam/userSpamEntry.scss
index f96fb2306b..7898517c7d 100644
--- a/client/containers/SuperAdminDashboard/UserSpam/userSpamEntry.scss
+++ b/client/containers/SuperAdminDashboard/UserSpam/userSpamEntry.scss
@@ -1,181 +1,181 @@
 .user-spam-entry-component {
-  border-radius: 2px;
-  border: 1px solid #eee;
-  padding: 10px;
-  overflow: hidden;
-
-  & > *:not(:last-child) {
-    margin-bottom: 6px;
-  }
-
-  .title {
-    font-size: 16px;
-    font-weight: 500;
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-    align-items: baseline;
-
-    .name {
-      font-weight: 600;
-    }
-    .email {
-      color: #666;
-      font-size: 14px;
-    }
-    .slug {
-      color: #888;
-      font-size: 14px;
-    }
-  }
-
-  .fields-report {
-    details > summary {
-      user-select: none;
-    }
-    pre {
-      background: #eee;
-      padding: 5px;
-    }
-  }
-
-  .details {
-    display: flex;
-    justify-content: space-between;
-    align-items: end;
-    flex-wrap: wrap;
-    gap: 6px;
-
-    > .tags {
-      display: flex;
-      flex-wrap: wrap;
-      gap: 4px;
-      min-width: 0;
-      flex: 1;
-    }
-
-    > .actions {
-      flex-shrink: 0;
-    }
-  }
-
-  .affiliation {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    gap: 2px;
-    font-size: 13px;
-    color: #555;
-
-    .affiliation-part {
-      display: inline-flex;
-      align-items: center;
-
-      a {
-        color: inherit;
-        text-decoration: underline;
-        text-decoration-color: #ccc;
-        &:hover {
-          text-decoration-color: #999;
-        }
-      }
-    }
-
-    .inline-discussions-btn {
-      font-size: 13px;
-      min-height: 0;
-      padding: 0 2px;
-      text-decoration: underline;
-      text-decoration-color: #ccc;
-      &:hover {
-        text-decoration-color: #999;
-      }
-    }
-  }
-
-  .community-reports {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 4px;
-  }
+	border-radius: 2px;
+	border: 1px solid #eee;
+	padding: 10px;
+	overflow: hidden;
+
+	& > *:not(:last-child) {
+		margin-bottom: 6px;
+	}
+
+	.title {
+		font-size: 16px;
+		font-weight: 500;
+		display: flex;
+		flex-wrap: wrap;
+		gap: 8px;
+		align-items: baseline;
+
+		.name {
+			font-weight: 600;
+		}
+		.email {
+			color: #666;
+			font-size: 14px;
+		}
+		.slug {
+			color: #888;
+			font-size: 14px;
+		}
+	}
+
+	.fields-report {
+		details > summary {
+			user-select: none;
+		}
+		pre {
+			background: #eee;
+			padding: 5px;
+		}
+	}
+
+	.details {
+		display: flex;
+		justify-content: space-between;
+		align-items: end;
+		flex-wrap: wrap;
+		gap: 6px;
+
+		> .tags {
+			display: flex;
+			flex-wrap: wrap;
+			gap: 4px;
+			min-width: 0;
+			flex: 1;
+		}
+
+		> .actions {
+			flex-shrink: 0;
+		}
+	}
+
+	.affiliation {
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		gap: 2px;
+		font-size: 13px;
+		color: #555;
+
+		.affiliation-part {
+			display: inline-flex;
+			align-items: center;
+
+			a {
+				color: inherit;
+				text-decoration: underline;
+				text-decoration-color: #ccc;
+				&:hover {
+					text-decoration-color: #999;
+				}
+			}
+		}
+
+		.inline-discussions-btn {
+			font-size: 13px;
+			min-height: 0;
+			padding: 0 2px;
+			text-decoration: underline;
+			text-decoration-color: #ccc;
+			&:hover {
+				text-decoration-color: #999;
+			}
+		}
+	}
+
+	.community-reports {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 4px;
+	}
 }
 
 // portal-rendered popover content (outside component tree)
 .discussions-popover-content {
-  padding: 8px 12px;
-  background: white;
-  border-radius: 4px;
-  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
-  min-width: 320px;
-  max-width: 500px;
-
-  .discussion-item {
-    padding: 6px 10px;
-    border-left: 2px solid #ddd;
-    margin: 4px 0;
-
-    .discussion-header {
-      display: flex;
-      align-items: center;
-      gap: 6px;
-      font-size: 13px;
-
-      a {
-        font-weight: 500;
-      }
-    }
-
-    .discussion-date {
-      color: #888;
-      font-size: 12px;
-    }
-
-    .discussion-preview {
-      font-size: 12px;
-      color: #555;
-      margin-top: 3px;
-      white-space: pre-wrap;
-      max-height: 60px;
-      overflow: hidden;
-    }
-  }
-
-  .no-discussions {
-    padding: 6px 10px;
-    color: #888;
-    font-size: 13px;
-    font-style: italic;
-  }
+	padding: 8px 12px;
+	background: white;
+	border-radius: 4px;
+	box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
+	min-width: 320px;
+	max-width: 500px;
+
+	.discussion-item {
+		padding: 6px 10px;
+		border-left: 2px solid #ddd;
+		margin: 4px 0;
+
+		.discussion-header {
+			display: flex;
+			align-items: center;
+			gap: 6px;
+			font-size: 13px;
+
+			a {
+				font-weight: 500;
+			}
+		}
+
+		.discussion-date {
+			color: #888;
+			font-size: 12px;
+		}
+
+		.discussion-preview {
+			font-size: 12px;
+			color: #555;
+			margin-top: 3px;
+			white-space: pre-wrap;
+			max-height: 60px;
+			overflow: hidden;
+		}
+	}
+
+	.no-discussions {
+		padding: 6px 10px;
+		color: #888;
+		font-size: 13px;
+		font-style: italic;
+	}
 }
 
 .flag-detail-popover {
-  padding: 10px 12px;
-  background: white;
-  border-radius: 4px;
-  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
-  min-width: 220px;
-  max-width: 360px;
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-
-  .flag-detail-row {
-    display: flex;
-    gap: 8px;
-    font-size: 13px;
-    line-height: 1.4;
-
-    .flag-detail-label {
-      font-weight: 600;
-      color: #555;
-      min-width: 70px;
-      flex-shrink: 0;
-    }
-
-    .flag-detail-note {
-      color: #333;
-      white-space: pre-wrap;
-      word-break: break-word;
-    }
-  }
+	padding: 10px 12px;
+	background: white;
+	border-radius: 4px;
+	box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
+	min-width: 220px;
+	max-width: 360px;
+	display: flex;
+	flex-direction: column;
+	gap: 6px;
+
+	.flag-detail-row {
+		display: flex;
+		gap: 8px;
+		font-size: 13px;
+		line-height: 1.4;
+
+		.flag-detail-label {
+			font-weight: 600;
+			color: #555;
+			min-width: 70px;
+			flex-shrink: 0;
+		}
+
+		.flag-detail-note {
+			color: #333;
+			white-space: pre-wrap;
+			word-break: break-word;
+		}
+	}
 }

From de84a98050d4456d0d5d0eea6616f4418a690f4a Mon Sep 17 00:00:00 2001
From: "Thomas F. K. Jorna" <hello@tefkah.com>
Date: Thu, 5 Mar 2026 12:05:10 +0100
Subject: [PATCH 04/10] fix: tests

---
 .../__tests__/api.test.ts                     | 59 ++++++++++++-------
 server/discussion/api.ts                      | 18 ++----
 server/discussion/permissions.ts              | 19 +++---
 3 files changed, 55 insertions(+), 41 deletions(-)

diff --git a/server/communityModerationReport/__tests__/api.test.ts b/server/communityModerationReport/__tests__/api.test.ts
index 161f6c5605..ee5d60a295 100644
--- a/server/communityModerationReport/__tests__/api.test.ts
+++ b/server/communityModerationReport/__tests__/api.test.ts
@@ -19,6 +19,16 @@ const models = modelize`
 		isSuperAdmin: true
 	}
 	Community community {
+		Pub pub {
+			Member {
+				permissions: "admin"
+				User pubAdmin {}
+			}
+
+			Release release {
+				historyKey: 10
+			}
+		}
 		Member {
 			permissions: "admin"
 			User admin {}
@@ -102,25 +112,8 @@ it('allows a community admin to retract their own report', async () => {
 	expect(report?.status).toEqual('retracted');
 });
 
-it('rate-limits excessive report creation', async () => {
-	const { admin, community, targetUser } = models;
-	const agent = await login(admin);
-
-	const promises = Array.from({ length: 7 }, () =>
-		agent.post('/api/communityModerationReports').send({
-			userId: targetUser.id,
-			communityId: community.id,
-			reason: 'spam-content',
-		}),
-	);
-
-	const responses = await Promise.all(promises);
-	const tooMany = responses.filter((r) => r.status === 429);
-	expect(tooMany.length).toBeGreaterThan(0);
-});
-
 it('blocks a reported user from creating discussions in that community', async () => {
-	const { admin, community, targetUser } = models;
+	const { admin, community, targetUser, pub } = models;
 	const adminAgent = await login(admin);
 
 	await adminAgent
@@ -138,6 +131,7 @@ it('blocks a reported user from creating discussions in that community', async (
 	await targetAgent
 		.post('/api/discussions')
 		.send({
+			pubId: pub.id,
 			communityId: community.id,
 			content: { type: 'doc', content: [] },
 			text: 'test',
@@ -146,7 +140,7 @@ it('blocks a reported user from creating discussions in that community', async (
 });
 
 it('retracting a report re-enables the user to create thread comments', async () => {
-	const { admin, community, targetUser } = models;
+	const { admin, community, targetUser, pub } = models;
 	const adminAgent = await login(admin);
 
 	await adminAgent
@@ -160,9 +154,15 @@ it('retracting a report re-enables the user to create thread comments', async ()
 		.expect(201);
 
 	const activeReports = await CommunityModerationReport.findAll({
-		where: { userId: targetUser.id, communityId: community.id, status: 'active' },
+		where: {
+			userId: targetUser.id,
+			communityId: community.id,
+			status: 'active',
+		},
 	});
 
+	expect(activeReports.length).toBeGreaterThan(0);
+
 	await Promise.all(
 		activeReports.map((report) =>
 			adminAgent
@@ -173,7 +173,24 @@ it('retracting a report re-enables the user to create thread comments', async ()
 	);
 
 	const remaining = await CommunityModerationReport.count({
-		where: { userId: targetUser.id, communityId: community.id, status: 'active' },
+		where: {
+			userId: targetUser.id,
+			communityId: community.id,
+			status: 'active',
+		},
 	});
 	expect(remaining).toEqual(0);
+
+	const targetAgent = await login(targetUser);
+	await targetAgent
+		.post('/api/discussions')
+		.send({
+			pubId: pub.id,
+			communityId: community.id,
+			content: { type: 'doc', content: [] },
+			text: 'test',
+			// weird, why does the client need to set this?
+			visibilityAccess: 'public',
+		})
+		.expect(201);
 });
diff --git a/server/discussion/api.ts b/server/discussion/api.ts
index 0640dd29b4..1e1f62d377 100644
--- a/server/discussion/api.ts
+++ b/server/discussion/api.ts
@@ -29,17 +29,16 @@ router.post(
 	'/api/discussions',
 	wrap(async (req, res) => {
 		const requestIds = getRequestIds(req);
+		if (!requestIds.pubId) {
+			throw new BadRequestError(new Error('pubId is required.'));
+		}
+
 		const canCreate = await getCreatePermission(requestIds);
+		console.log('canCreate', canCreate);
 		if (!canCreate) {
 			throw new ForbiddenError();
 		}
 		const userId = (req.user?.id as string) || null;
-		if (userId && req.body.communityId) {
-			const flagged = await isUserReportedInCommunity(userId, req.body.communityId);
-			if (flagged) {
-				throw new ForbiddenError();
-			}
-		}
 		const options = { ...req.body, userId };
 		const newDiscussion = await createDiscussion(options);
 		return res.status(201).json(newDiscussion);
@@ -54,13 +53,6 @@ router.post(
 		if (!canCreate) {
 			throw new ForbiddenError();
 		}
-		const formUserId = (req.user?.id as string) || null;
-		if (formUserId && req.body.communityId) {
-			const flagged = await isUserReportedInCommunity(formUserId, req.body.communityId);
-			if (flagged) {
-				throw new ForbiddenError();
-			}
-		}
 		if (isHoneypotFilled(req.body)) {
 			if (req.user?.id)
 				await handleHoneypotTriggered(
diff --git a/server/discussion/permissions.ts b/server/discussion/permissions.ts
index 820ef4806d..3156b3ddd2 100644
--- a/server/discussion/permissions.ts
+++ b/server/discussion/permissions.ts
@@ -1,3 +1,4 @@
+import { isUserReportedInCommunity } from 'server/communityModerationReport/queries';
 import { getFeatureFlagForUserAndCommunity } from 'server/featureFlag/queries';
 import { Discussion, Pub } from 'server/models';
 import { getScope } from 'server/utils/queryHelpers';
@@ -17,16 +18,20 @@ export const getCreatePermission = async ({
 
 	const pub = await Pub.findOne({ where: { id: pubId } });
 	const hasAccessHash = pub?.commentHash === commentAccessHash;
-	const scopeData = await getScope({
-		communityId,
-		pubId,
-		loginId: userId,
-		accessHash,
-	});
+	const [scopeData, flagged] = await Promise.all([
+		getScope({
+			communityId,
+			pubId,
+			loginId: userId,
+			accessHash,
+		}),
+		isUserReportedInCommunity(userId, communityId),
+	]);
 
 	const { canView, canCreateDiscussions } = scopeData.activePermissions;
 	const nonMembersVisibility = visibilityAccess && visibilityAccess !== 'members';
-	return canView || (canCreateDiscussions && nonMembersVisibility) || hasAccessHash;
+
+	return !flagged && (canView || (canCreateDiscussions && nonMembersVisibility) || hasAccessHash);
 };
 
 export const getUpdatePermissions = async ({ discussionId, userId, pubId, communityId }) => {

From d87a3ce508b838101c484e3ce86812590596a2a6 Mon Sep 17 00:00:00 2001
From: "Thomas F. K. Jorna" <hello@tefkah.com>
Date: Thu, 5 Mar 2026 16:30:19 +0100
Subject: [PATCH 05/10] refactor: update everything to be more sensible

---
 biome.jsonc                                   |   6 +
 .../FlagUserDialog/FlagUserDialog.tsx         |  18 +-
 .../SpamStatusMenu/SpamStatusMenu.tsx         |   1 +
 .../PubDiscussions/Discussion/Discussion.tsx  |  52 +--
 .../Discussion/DiscussionInput.tsx            |   2 +-
 .../PubDiscussions/Discussion/ManageTools.tsx |  22 +-
 .../Discussion/ThreadComment.tsx              | 102 +++---
 .../PubDiscussions/Discussion/discussion.scss | 186 +++++------
 .../Discussion/threadComment.scss             |  30 +-
 .../UserSpam/UserSpamEntry.tsx                |  18 +-
 infra/docker-compose.dev.yml                  |   2 +
 .../__tests__/api.test.ts                     |   4 +-
 server/communityModerationReport/api.ts       |  53 ++--
 server/communityModerationReport/model.ts     |  21 +-
 server/communityModerationReport/queries.ts   |  94 +++---
 server/spamTag/api.ts                         |  44 +--
 .../notifications/email.ts}                   |  52 ++-
 .../index.ts}                                 | 140 ++++----
 server/spamTag/notifications/shared.ts        |  52 +++
 server/spamTag/notifications/slack.ts         | 280 ++++++++++++++++
 server/spamTag/userDashboard.ts               |  32 +-
 server/user/model.ts                          |   7 +
 server/utils/email/index.ts                   |   1 -
 .../utils/queryHelpers/discussionsSanitize.ts |  94 ++----
 server/utils/queryHelpers/pubGet.ts           |  20 +-
 server/utils/queryHelpers/pubOptions.ts       |   7 +-
 server/utils/queryHelpers/pubSanitize.ts      |  17 +-
 server/utils/queryHelpers/reviewGet.ts        |   6 +-
 server/utils/queryHelpers/util.ts             |  33 +-
 server/utils/slack.ts                         | 300 +-----------------
 types/pub.ts                                  |  17 +-
 types/pubQuery.ts                             |   1 +
 types/spam.ts                                 |  11 +-
 33 files changed, 861 insertions(+), 864 deletions(-)
 rename server/{utils/email/spam.ts => spamTag/notifications/email.ts} (67%)
 rename server/spamTag/{notifications.ts => notifications/index.ts} (65%)
 create mode 100644 server/spamTag/notifications/shared.ts
 create mode 100644 server/spamTag/notifications/slack.ts

diff --git a/biome.jsonc b/biome.jsonc
index 159ed8cf95..f7440af474 100644
--- a/biome.jsonc
+++ b/biome.jsonc
@@ -25,6 +25,12 @@
 			"!.vscode"
 		]
 	},
+	"css": {
+		"formatter": {
+			"enabled": true,
+			"indentStyle": "tab"
+		}
+	},
 	"linter": {
 		"rules": {
 			"recommended": false,
diff --git a/client/components/FlagUserDialog/FlagUserDialog.tsx b/client/components/FlagUserDialog/FlagUserDialog.tsx
index e16cb1878a..66f0d10c8c 100644
--- a/client/components/FlagUserDialog/FlagUserDialog.tsx
+++ b/client/components/FlagUserDialog/FlagUserDialog.tsx
@@ -19,13 +19,13 @@ type Props = {
 	onClose: () => void;
 	userId: string;
 	communityId: string;
-	discussionId?: string | null;
+	threadCommentId?: string | null;
 	userName?: string;
 	onFlagged?: () => void;
 };
 
 const FlagUserDialog = (props: Props) => {
-	const { isOpen, onClose, userId, communityId, discussionId, userName, onFlagged } = props;
+	const { isOpen, onClose, userId, communityId, threadCommentId, userName, onFlagged } = props;
 	const [reason, setReason] = useState<ModerationReportReason>('spam-content');
 	const [reasonText, setReasonText] = useState('');
 	const [isLoading, setIsLoading] = useState(false);
@@ -40,7 +40,7 @@ const FlagUserDialog = (props: Props) => {
 				communityId,
 				reason,
 				reasonText: reasonText.trim() || null,
-				sourceDiscussionId: discussionId ?? null,
+				sourceThreadCommentId: threadCommentId ?? null,
 			});
 			onFlagged?.();
 			onClose();
@@ -49,7 +49,7 @@ const FlagUserDialog = (props: Props) => {
 		} finally {
 			setIsLoading(false);
 		}
-	}, [userId, communityId, reason, reasonText, discussionId, onFlagged, onClose]);
+	}, [userId, communityId, reason, reasonText, threadCommentId, onFlagged, onClose]);
 
 	return (
 		<Dialog
@@ -61,10 +61,12 @@ const FlagUserDialog = (props: Props) => {
 			<div className={Classes.DIALOG_BODY}>
 				<Callout intent={Intent.WARNING} style={{ marginBottom: 16 }}>
 					Flagging this user will hide all of their discussions and comments in your
-					community. They will not be able to create pubs, edit, or create comments. They
-					may still be able to perform other actions if you have given them permissions
-					through memberships. We aim to evaluate flagged users and will send you a
-					follow-up via email.
+					community. They will not be able to create any new Pubs or discussions. They may
+					still be able to perform other actions if you have given them permissions
+					through memberships.
+					<br />
+					We aim to evaluate flagged users and will send you a follow-up via email to let
+					you know what actions we've taken.
 				</Callout>
 				<div style={{ marginBottom: 12 }}>
 					<label htmlFor="flag-reason" style={{ fontWeight: 500, fontSize: 14 }}>
diff --git a/client/components/SpamStatusMenu/SpamStatusMenu.tsx b/client/components/SpamStatusMenu/SpamStatusMenu.tsx
index 0f3c4e7b2f..319ffef6ce 100644
--- a/client/components/SpamStatusMenu/SpamStatusMenu.tsx
+++ b/client/components/SpamStatusMenu/SpamStatusMenu.tsx
@@ -55,6 +55,7 @@ const SpamStatusMenu = (props: Props) => {
 				minimal: true,
 				small,
 				loading: isLoading,
+				className: 'spam-button',
 			}}
 		>
 			{(Object.keys(statusLabels) as SpamStatus[]).map((status) => (
diff --git a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/Discussion.tsx b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/Discussion.tsx
index 1db01f9644..67d4312a02 100644
--- a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/Discussion.tsx
+++ b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/Discussion.tsx
@@ -1,6 +1,6 @@
-import type { PubPageData, PubPageDiscussion, SpamStatus } from 'types';
+import type { PubPageData, PubPageDiscussion, PubPageThreadComment } from 'types';
 
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { Button } from '@blueprintjs/core';
 import classNames from 'classnames';
@@ -17,8 +17,6 @@ import ThreadComment from './ThreadComment';
 
 import './discussion.scss';
 
-type PubPageThreadComment = PubPageDiscussion['thread']['comments'][number];
-
 type Props = {
 	pubData: PubPageData;
 	discussionData: PubPageDiscussion;
@@ -58,7 +56,11 @@ const Discussion = (props: Props) => {
 	const isDiscussionAuthor = loginData.id === discussionData.userId;
 	const showManageTools = canAdmin || (isDiscussionAuthor && !discussionData.isClosed);
 	const discussionId = discussionData.id;
-	const isAuthorSpam = !!discussionData.isAuthorSpam;
+
+	const rootComment = discussionData.thread.comments?.find(
+		(comment) => comment.userId === discussionData.userId,
+	);
+	const isAuthorSpam = rootComment?.author?.spamTag?.status === 'confirmed-spam';
 
 	useEffect(() => {
 		if (isPreviewExpandedByHash(discussionId)) {
@@ -84,7 +86,7 @@ const Discussion = (props: Props) => {
 			pendingHiddenCount = 0;
 		};
 
-		threadComments.forEach((threadComment, index) => {
+		threadComments.forEach((threadComment: PubPageThreadComment, index: number) => {
 			const isRootThread = index === 0;
 			const meetsMinimum = shownDiscussionsCount < minShown;
 			const matchesSearch = discussionMatchesSearchTerm(threadComment, searchTerm);
@@ -111,32 +113,6 @@ const Discussion = (props: Props) => {
 		return elements;
 	};
 
-	const handleSpamStatusChanged = useCallback(
-		(status: SpamStatus | null) => {
-			const isNowSpam = status === 'confirmed-spam';
-			const authorUserId = discussionData.userId;
-			updateLocalData('pub', {
-				discussions: pubData.discussions.map((discussion) => {
-					const authorMatch = discussion.userId === authorUserId;
-					return {
-						...discussion,
-						...(authorMatch && { isAuthorSpam: isNowSpam || undefined }),
-						thread: {
-							...discussion.thread,
-							comments: discussion.thread.comments.map((comment) => {
-								if (comment.userId === authorUserId) {
-									return { ...comment, isAuthorSpam: isNowSpam || undefined };
-								}
-								return comment;
-							}),
-						},
-					};
-				}),
-			});
-		},
-		[discussionData.userId, pubData.discussions, updateLocalData],
-	);
-
 	const handleUpdateDiscussion = (discussionUpdates) => {
 		return apiFetch('/api/discussions', {
 			method: 'PUT',
@@ -185,7 +161,7 @@ const Discussion = (props: Props) => {
 		if (isPreview) {
 			return renderPreviewDiscussionsAndOverflow(filteredThreadComments, 2);
 		}
-		return sortThreadComments(filteredThreadComments, sortType).map((item) => {
+		return sortThreadComments(filteredThreadComments ?? [], sortType).map((item) => {
 			return (
 				<ThreadComment
 					key={item.id}
@@ -203,7 +179,7 @@ const Discussion = (props: Props) => {
 		if (!canReply) return null;
 		return (
 			<DiscussionInput
-				key={discussionData.thread.comments.length}
+				key={discussionData.thread.comments?.length}
 				discussionData={discussionData}
 			/>
 		);
@@ -245,13 +221,6 @@ const Discussion = (props: Props) => {
 				/>
 			)}
 			<LabelList pubData={pubData} discussionData={discussionData} />
-			{isAuthorSpam && isPreview && <span className="spam-badge">Spam</span>}
-			{isAuthorSpam && !isPreview && (
-				<div className="discussion-spam-banner">
-					This user has been banned. Only you and other admins of this community can see
-					this discussion. You can safely remove it.
-				</div>
-			)}
 			{!isPreview && (
 				<>
 					{showManageTools && (
@@ -261,7 +230,6 @@ const Discussion = (props: Props) => {
 							onUpdateDiscussion={handleUpdateDiscussion}
 							sortType={sortType}
 							setSortType={setSortType}
-							onSpamStatusChanged={handleSpamStatusChanged}
 						/>
 					)}
 					{renderAnchorText()}
diff --git a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/DiscussionInput.tsx b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/DiscussionInput.tsx
index 990cbc4f47..99623486f3 100644
--- a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/DiscussionInput.tsx
+++ b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/DiscussionInput.tsx
@@ -114,7 +114,7 @@ const DiscussionInput = (props: Props) => {
 							...disc,
 							thread: {
 								...disc.thread,
-								comments: [...disc.thread!.comments, outputData],
+								comments: [...(disc.thread!.comments ?? []), outputData],
 							},
 						};
 					}
diff --git a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ManageTools.tsx b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ManageTools.tsx
index 0fd7c9dcdb..2f506a221a 100644
--- a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ManageTools.tsx
+++ b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ManageTools.tsx
@@ -1,8 +1,10 @@
+import type { Discussion, PatchFn } from 'types';
+
 import React, { useState } from 'react';
 
 import { Button } from '@blueprintjs/core';
 
-import { ConfirmDialog, Icon, SpamStatusMenu } from 'components';
+import { ConfirmDialog, Icon } from 'components';
 import { MenuButton, MenuItem } from 'components/Menu';
 import { usePageContext } from 'utils/hooks';
 
@@ -28,19 +30,11 @@ type Props = {
 	};
 	setSortType: (s: SortType) => any;
 	sortType: SortType;
-	onUpdateDiscussion: (...args: any[]) => any;
-	onSpamStatusChanged?: (status: import('types').SpamStatus | null) => void;
+	onUpdateDiscussion: PatchFn<Discussion>;
 };
 
 const ManageTools = (props: Props) => {
-	const {
-		pubData,
-		discussionData,
-		onUpdateDiscussion,
-		sortType,
-		setSortType,
-		onSpamStatusChanged,
-	} = props;
+	const { pubData, discussionData, onUpdateDiscussion, sortType, setSortType } = props;
 	const { scopeData } = usePageContext();
 	const { canAdmin, isSuperAdmin } = scopeData.activePermissions;
 	const { isClosed } = discussionData;
@@ -115,12 +109,6 @@ const ManageTools = (props: Props) => {
 			{renderArchiveButton()}
 			{renderSortMenu()}
 			{isSuperAdmin && <DiscussionReanchor discussionData={discussionData} />}
-			{isSuperAdmin && discussionData.userId && (
-				<SpamStatusMenu
-					userId={discussionData.userId}
-					onStatusChanged={onSpamStatusChanged}
-				/>
-			)}
 		</div>
 	);
 };
diff --git a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
index ea6a126457..7311487ccd 100644
--- a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
+++ b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
@@ -1,4 +1,10 @@
-import type { Callback, SpamStatus } from 'types';
+import type {
+	Callback,
+	PubPageData,
+	PubPageDiscussion,
+	PubPageThreadComment,
+	SpamStatus,
+} from 'types';
 
 import React, { useCallback, useState } from 'react';
 
@@ -16,9 +22,9 @@ import { getPartsOfFullName } from 'utils/names';
 import './threadComment.scss';
 
 type Props = {
-	discussionData: any;
-	threadCommentData: any;
-	pubData: any;
+	discussionData: PubPageDiscussion;
+	threadCommentData: PubPageThreadComment;
+	pubData: PubPageData;
 	updateLocalData: (...args: any[]) => any;
 	isPreview?: boolean;
 };
@@ -59,7 +65,7 @@ const ThreadComment = (props: Props) => {
 							...discussion,
 							thread: {
 								...discussion.thread,
-								comments: discussion.thread.comments.map((comment) => {
+								comments: discussion.thread.comments?.map((comment) => {
 									if (comment.id === threadCommentData.id) {
 										return { ...comment, ...updatedThreadCommentData };
 									}
@@ -76,21 +82,21 @@ const ThreadComment = (props: Props) => {
 
 	const handleSpamStatusChanged = useCallback(
 		(status: SpamStatus | null) => {
-			const isNowSpam = status === 'confirmed-spam';
 			const targetUserId = threadCommentData.userId;
 			updateLocalData('pub', {
 				discussions: pubData.discussions.map((discussion) => ({
 					...discussion,
-					...(discussion.userId === targetUserId && {
-						isAuthorSpam: isNowSpam || undefined,
-					}),
 					thread: {
 						...discussion.thread,
-						comments: discussion.thread.comments.map((comment) => {
-							if (comment.userId === targetUserId) {
-								return { ...comment, isAuthorSpam: isNowSpam || undefined };
-							}
-							return comment;
+						comments: discussion.thread.comments?.map((comment) => {
+							if (comment.userId !== targetUserId) return comment;
+							return {
+								...comment,
+								author: {
+									...comment.author,
+									spamTag: status ? { ...comment.author?.spamTag, status } : null,
+								},
+							};
 						}),
 					},
 				})),
@@ -104,16 +110,20 @@ const ThreadComment = (props: Props) => {
 		updateLocalData('pub', {
 			discussions: pubData.discussions.map((discussion) => ({
 				...discussion,
-				...(discussion.userId === targetUserId && {
-					isAuthorFlagged: true,
-				}),
 				thread: {
 					...discussion.thread,
-					comments: discussion.thread.comments.map((comment) => {
-						if (comment.userId === targetUserId) {
-							return { ...comment, isAuthorFlagged: true };
-						}
-						return comment;
+					comments: discussion.thread.comments?.map((comment) => {
+						if (comment.userId !== targetUserId) return comment;
+						return {
+							...comment,
+							author: {
+								...comment.author,
+								communityModerationReports: [
+									...(comment.author?.communityModerationReports ?? []),
+									{ id: 'optimistic', status: 'active' as const },
+								],
+							},
+						};
 					}),
 				},
 			})),
@@ -121,7 +131,9 @@ const ThreadComment = (props: Props) => {
 	}, [threadCommentData.userId, pubData.discussions, updateLocalData]);
 
 	const handleRetractFlag = useCallback(async () => {
-		const reportIds: string[] | undefined = threadCommentData.moderationReportIds;
+		const reportIds = threadCommentData.author?.communityModerationReports
+			?.filter((r) => r.status === 'active')
+			?.map((r) => r.id);
 		if (!reportIds?.length) return;
 		setIsRetracting(true);
 		try {
@@ -136,21 +148,17 @@ const ThreadComment = (props: Props) => {
 			updateLocalData('pub', {
 				discussions: pubData.discussions.map((discussion) => ({
 					...discussion,
-					...(discussion.userId === targetUserId && {
-						isAuthorFlagged: undefined,
-						moderationReportIds: undefined,
-					}),
 					thread: {
 						...discussion.thread,
-						comments: discussion.thread.comments.map((comment) => {
-							if (comment.userId === targetUserId) {
-								return {
-									...comment,
-									isAuthorFlagged: undefined,
-									moderationReportIds: undefined,
-								};
-							}
-							return comment;
+						comments: discussion.thread.comments?.map((comment) => {
+							if (comment.userId !== targetUserId) return comment;
+							return {
+								...comment,
+								author: {
+									...comment.author,
+									communityModerationReports: [],
+								},
+							};
 						}),
 					},
 				})),
@@ -176,8 +184,10 @@ const ThreadComment = (props: Props) => {
 		);
 	};
 	const commenterName = discussionData.commenter?.name ?? threadCommentData.commenter?.name;
-	const isAuthorSpam = !!threadCommentData.isAuthorSpam;
-	const isAuthorFlagged = !!threadCommentData.isAuthorFlagged;
+	const isAuthorSpam = threadCommentData.author?.spamTag?.status === 'confirmed-spam';
+	const isAuthorFlagged = threadCommentData.author?.communityModerationReports?.some(
+		(report) => report.status === 'active',
+	);
 	const showFlagButton =
 		!isPreview &&
 		canAdminCommunity &&
@@ -200,7 +210,7 @@ const ThreadComment = (props: Props) => {
 					width={18}
 					initials={
 						threadCommentData.author
-							? threadCommentData.author.intials
+							? threadCommentData.author.initials
 							: commenterName
 								? getPartsOfFullName(commenterName).initials
 								: '?'
@@ -265,22 +275,28 @@ const ThreadComment = (props: Props) => {
 								minimal
 								small
 								onClick={() => setIsFlagDialogOpen(true)}
-							/>
+								className="flag-button"
+							>
+								Flag
+							</Button>
 						)}
 						{showUnflagButton && (
 							<Button
 								icon={<Icon icon="flag" iconSize={12} />}
-								text="Unflag"
 								minimal
 								small
 								loading={isRetracting}
 								onClick={handleRetractFlag}
-							/>
+								className="flag-button"
+							>
+								Unflag
+							</Button>
 						)}
 						{!isPreview && isSuperAdmin && threadCommentData.userId && (
 							<SpamStatusMenu
 								userId={threadCommentData.userId}
 								onStatusChanged={handleSpamStatusChanged}
+								currentStatus={threadCommentData.author?.spamTag?.status}
 							/>
 						)}
 					</span>
@@ -352,7 +368,7 @@ const ThreadComment = (props: Props) => {
 					onClose={() => setIsFlagDialogOpen(false)}
 					userId={threadCommentData.userId}
 					communityId={communityData.id}
-					discussionId={discussionData.id}
+					threadCommentId={threadCommentData.id}
 					userName={threadCommentData.author?.fullName}
 					onFlagged={handleFlagged}
 				/>
diff --git a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/discussion.scss b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/discussion.scss
index 82af59b299..dfb9e5041c 100644
--- a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/discussion.scss
+++ b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/discussion.scss
@@ -4,98 +4,98 @@ $bp: vendor.$bp-namespace;
 
 @import 'styles/variables.scss';
 .discussion-component {
-	position: relative;
-	z-index: 1;
-	background: white;
-	padding: 1em 0em;
-	font-size: 14px;
-	text-align: left;
-	&.is-author-spam {
-		opacity: 0.9;
-		border-left: 3px solid #d9534f;
-		padding-left: calc(1em - 3px);
-		background: rgba(217, 83, 79, 0.03);
-	}
-	.spam-badge {
-		display: inline-block;
-		font-size: 10px;
-		font-weight: 600;
-		line-height: 1;
-		padding: 2px 5px;
-		margin-left: 6px;
-		background: #d9534f;
-		color: white;
-		border-radius: 2px;
-		vertical-align: middle;
-		text-transform: uppercase;
-		letter-spacing: 0.5px;
-	}
-	.discussion-spam-banner {
-		margin-bottom: 0.75em;
-		padding: 0.4em 0.6em;
-		font-size: 12px;
-		background: #fcf3cd;
-		color: #856404;
-		border-radius: 2px;
-		border-left: 3px solid #ffc107;
-	}
-	.collapse-button {
-		position: absolute;
-		top: 0;
-		right: 0;
-		.#{$bp}-icon {
-			transform: rotate(45deg);
-		}
-	}
-	.manage-tools-component {
-		margin-bottom: 1em;
-		direction: ltr;
-	}
-	.anchor-text {
-		padding: 0.25em;
-		background: #f0f0f7;
-		font-family: $body-font;
-		margin: -0.25em 0em 1em;
-		color: #888;
-		line-height: 1.3;
-		.exact {
-			color: #000;
-		}
-	}
-	.item-header {
-		display: flex;
-		align-items: flex-start;
-		line-height: 1em;
-		margin-bottom: 0.25em;
-		font-size: 13px;
-		direction: ltr;
+  position: relative;
+  z-index: 1;
+  background: white;
+  padding: 1em 0em;
+  font-size: 14px;
+  text-align: left;
+  &.is-author-spam {
+    opacity: 0.9;
+    border-left: 3px solid #d9534f;
+    padding-left: calc(1em - 3px);
+    background: rgba(217, 83, 79, 0.03);
+  }
+  .spam-badge {
+    display: inline-block;
+    font-size: 10px;
+    font-weight: 600;
+    line-height: 1;
+    padding: 2px 5px;
+    margin-left: 6px;
+    background: #d9534f;
+    color: white;
+    border-radius: 2px;
+    vertical-align: middle;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+  }
+  .discussion-spam-banner {
+    margin-bottom: 0.75em;
+    padding: 0.4em 0.6em;
+    font-size: 12px;
+    background: #fcf3cd;
+    color: #856404;
+    border-radius: 2px;
+    border-left: 3px solid #ffc107;
+  }
+  .collapse-button {
+    position: absolute;
+    top: 0;
+    right: 0;
+    .#{$bp}-icon {
+      transform: rotate(45deg);
+    }
+  }
+  .manage-tools-component {
+    margin-bottom: 1em;
+    direction: ltr;
+  }
+  .anchor-text {
+    padding: 0.25em;
+    background: #f0f0f7;
+    font-family: $body-font;
+    margin: -0.25em 0em 1em;
+    color: #888;
+    line-height: 1.3;
+    .exact {
+      color: #000;
+    }
+  }
+  .item-header {
+    display: flex;
+    align-items: center;
+    line-height: 1em;
+    margin-bottom: 0.25em;
+    font-size: 13px;
+    direction: ltr;
 
-		.name {
-			font-weight: 600;
-			margin-right: 1em;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			min-height: 17px;
-			flex: 0 0 auto;
-		}
-		.time {
-			margin-right: 1em;
-			color: #888;
-			flex: 1 1 auto;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			min-height: 17px;
-		}
-		.actions {
-			white-space: nowrap;
-		}
-		.#{$bp}-button {
-			min-height: 17px;
-		}
-	}
-	.overflow-listing:not(:last-child) {
-		margin-bottom: 1.5em;
-	}
+    .name {
+      font-weight: 600;
+      margin-right: 1em;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      min-height: 17px;
+      flex: 0 0 auto;
+    }
+    .time {
+      margin-right: 1em;
+      color: #888;
+      flex: 1 1 auto;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      min-height: 17px;
+    }
+    .actions {
+      white-space: nowrap;
+    }
+    .#{$bp}-button {
+      min-height: 17px;
+    }
+  }
+  .overflow-listing:not(:last-child) {
+    margin-bottom: 1.5em;
+  }
 }
diff --git a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/threadComment.scss b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/threadComment.scss
index c3d44b58a5..dfb1bdaf19 100644
--- a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/threadComment.scss
+++ b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/threadComment.scss
@@ -3,6 +3,7 @@
 .thread-comment-component {
 	display: flex;
 	direction: ltr;
+	position: relative;
 
 	&:not(:last-child):not(.input) {
 		margin-bottom: 1em;
@@ -12,18 +13,39 @@
 		.discussion-body-wrapper {
 			opacity: 0.85;
 		}
-		border-left: 3px solid #d9534f;
-		padding-left: 0.5em;
+		&::before {
+			content: '';
+			display: block;
+			width: 3px;
+			height: 100%;
+			background: #d9534f;
+			position: absolute;
+			left: -8px;
+		}
 		background: rgba(217, 83, 79, 0.03);
 	}
 	&.is-flagged {
 		.discussion-body-wrapper {
 			opacity: 0.9;
 		}
-		border-left: 3px solid #e8a317;
-		padding-left: 0.5em;
+		&::before {
+			content: '';
+			display: block;
+			width: 3px;
+			height: 100%;
+			background: #e8a317;
+			position: absolute;
+			left: -8px;
+		}
 		background: rgba(232, 163, 23, 0.03);
 	}
+	.spam-button, .flag-button {
+		font-size: 13px;
+		display: inline-flex;
+		padding: 0.25em 0em;
+		align-items: center;
+		gap: 2px;
+	}
 	.spam-badge {
 		display: inline-block;
 		font-size: 10px;
diff --git a/client/containers/SuperAdminDashboard/UserSpam/UserSpamEntry.tsx b/client/containers/SuperAdminDashboard/UserSpam/UserSpamEntry.tsx
index 6afe2963f5..fa6683b5f8 100644
--- a/client/containers/SuperAdminDashboard/UserSpam/UserSpamEntry.tsx
+++ b/client/containers/SuperAdminDashboard/UserSpam/UserSpamEntry.tsx
@@ -403,22 +403,18 @@ const UserSpamEntry = (props: Props) => {
 										</span>
 									</div>
 								)}
-								{report.flaggedByName && (
+								{report.actorName && (
 									<div className="flag-detail-row">
 										<span className="flag-detail-label">Flagged by</span>
-										<span>{report.flaggedByName}</span>
+										<span>{report.actorName}</span>
 									</div>
 								)}
-								{report.sourceDiscussionUrl && (
+								{report.sourceCommentText && (
 									<div className="flag-detail-row">
-										<span className="flag-detail-label">Source</span>
-										<a
-											href={report.sourceDiscussionUrl}
-											target="_blank"
-											rel="noopener noreferrer"
-										>
-											{report.sourceDiscussionTitle || 'View discussion'}
-										</a>
+										<span className="flag-detail-label">Source comment</span>
+										<span className="flag-detail-note">
+											{report.sourceCommentText}
+										</span>
 									</div>
 								)}
 								<div className="flag-detail-row">
diff --git a/infra/docker-compose.dev.yml b/infra/docker-compose.dev.yml
index b206c5bdfc..f9206e09c2 100644
--- a/infra/docker-compose.dev.yml
+++ b/infra/docker-compose.dev.yml
@@ -14,6 +14,8 @@ services:
                 - >
                     curl -f http://localhost:3000
             interval: 10s
+            retries: 5
+            start_period: 30s
             timeout: 3s
         environment:
             IS_DUQDUQ: ""
diff --git a/server/communityModerationReport/__tests__/api.test.ts b/server/communityModerationReport/__tests__/api.test.ts
index ee5d60a295..d8b93c7c0b 100644
--- a/server/communityModerationReport/__tests__/api.test.ts
+++ b/server/communityModerationReport/__tests__/api.test.ts
@@ -3,12 +3,12 @@ import { vi } from 'vitest';
 import { CommunityModerationReport, SpamTag, User } from 'server/models';
 import { login, modelize, setup, teardown } from 'stubstub';
 
-vi.mock('server/utils/slack', () => ({
+vi.mock('server/spamTag/notifications/slack', () => ({
 	postToSlackAboutCommunityFlag: vi.fn(),
 	postToSlackAboutNewUserSpamTag: vi.fn(),
 }));
 
-vi.mock('server/utils/email', () => ({
+vi.mock('server/spamTag/notifications/email', () => ({
 	sendNewSpamTagDevEmail: vi.fn(),
 	sendCommunityFlagDevEmail: vi.fn(),
 	sendCommunityFlagResolvedEmail: vi.fn(),
diff --git a/server/communityModerationReport/api.ts b/server/communityModerationReport/api.ts
index e68450a0f6..4d74dcc7b3 100644
--- a/server/communityModerationReport/api.ts
+++ b/server/communityModerationReport/api.ts
@@ -1,5 +1,6 @@
 import { Router } from 'express';
 
+import { Community, User } from 'server/models';
 import { notify } from 'server/spamTag/notifications';
 import { canManipulateSpamTags } from 'server/spamTag/permissions';
 import { upsertSpamTag } from 'server/spamTag/userQueries';
@@ -9,9 +10,9 @@ import { wrap } from 'server/wrap';
 
 import {
 	createReport,
-	getActiveReportsByFlaggedBy,
 	getAllActiveReports,
 	getReportById,
+	getReportByIdAndActor,
 	getReportsForCommunity,
 	updateReportStatus,
 } from './queries';
@@ -21,39 +22,47 @@ export const router = Router();
 router.post(
 	'/api/communityModerationReports',
 	wrap(async (req, res) => {
-		const { userId, communityId, reason, reasonText, sourceDiscussionId } = req.body;
-		const flaggedById = req.user?.id;
-		if (!flaggedById || !userId || !communityId || !reason) {
+		const { userId, communityId, reason, reasonText, sourceThreadCommentId } = req.body;
+		const actorId = req.user?.id;
+		if (!actorId || !userId || !communityId || !reason) {
 			return res.status(400).send({ error: 'Missing required fields' });
 		}
 
-		const scopeData = await getScope({ communityId, loginId: flaggedById });
+		const scopeData = await getScope({ communityId, loginId: actorId });
 		if (!scopeData.activePermissions.canAdmin) {
 			throw new ForbiddenError();
 		}
 
-		const { spamTag } = await upsertSpamTag({ userId });
+		const [flaggedUser, actor, community, { spamTag }] = await Promise.all([
+			User.findByPk(userId, { attributes: ['id', 'email', 'fullName', 'slug'] }),
+			User.findByPk(actorId, { attributes: ['id', 'email', 'fullName', 'slug'] }),
+			Community.findByPk(communityId, { attributes: ['subdomain'] }),
+			upsertSpamTag({ userId }),
+		]);
 
 		const report = await createReport({
 			userId,
 			communityId,
-			flaggedById,
+			actorId,
 			reason,
 			reasonText,
-			sourceDiscussionId,
+			sourceThreadCommentId,
 			spamTagId: spamTag.id,
 		});
 
 		notify('community-flag', {
 			userId,
-			userEmail: '',
-			userName: '',
-			userSlug: '',
+			userEmail: flaggedUser?.email ?? '',
+			userName: flaggedUser?.fullName ?? '',
+			userSlug: flaggedUser?.slug ?? '',
 			communityId,
-			flaggedById,
+			communitySubdomain: community?.subdomain ?? '',
+			actorFullName: actor?.fullName ?? '',
+			actorSlug: actor?.slug ?? '',
+			actorEmail: actor?.email ?? '',
 			flagReason: reason,
 			flagReasonText: reasonText,
-			sourceDiscussionId,
+			sourceThreadCommentId,
 		}).catch((err) => console.error('Failed to send community flag notification', err));
 
 		return res.status(201).json(report);
@@ -65,17 +74,17 @@ router.put(
 	wrap(async (req, res) => {
 		const { status } = req.body;
 		const reportId = req.params.id;
-		const userId = req.user?.id;
-		if (!userId) throw new ForbiddenError();
+		const actorId = req.user?.id;
+		if (!actorId) throw new ForbiddenError();
 
 		if (status === 'retracted') {
-			const ownReport = await getActiveReportsByFlaggedBy(reportId, userId);
+			const ownReport = await getReportByIdAndActor(reportId, actorId);
 			if (!ownReport) {
 				const existing = await getReportById(reportId);
 				if (!existing) throw new NotFoundError();
 				const scopeData = await getScope({
 					communityId: existing.communityId,
-					loginId: userId,
+					loginId: actorId,
 				});
 				if (!scopeData.activePermissions.canAdmin) {
 					throw new ForbiddenError();
@@ -86,13 +95,17 @@ router.put(
 
 			const retractedReport = await getReportById(reportId);
 			if (retractedReport) {
+				const reqUser = req.user as any;
 				notify('community-flag-retracted', {
 					userId: retractedReport.userId,
-					userEmail: '',
+					userEmail: retractedReport.user?.email ?? '',
 					userName: retractedReport.user?.fullName ?? '',
 					userSlug: retractedReport.user?.slug ?? '',
 					communityId: retractedReport.communityId,
-					flaggedById: userId,
+					communitySubdomain: retractedReport.community?.subdomain ?? '',
+					actorFullName: reqUser?.fullName ?? '',
+					actorSlug: reqUser?.slug ?? '',
+					actorEmail: reqUser?.email ?? '',
 				}).catch((err) =>
 					console.error('Failed to send flag retraction notification', err),
 				);
@@ -101,7 +114,7 @@ router.put(
 			return res.status(200).json(updated);
 		}
 
-		const isSuperAdmin = await canManipulateSpamTags({ userId });
+		const isSuperAdmin = await canManipulateSpamTags({ userId: actorId });
 		if (!isSuperAdmin) {
 			throw new ForbiddenError();
 		}
diff --git a/server/communityModerationReport/model.ts b/server/communityModerationReport/model.ts
index f86d432f53..940edbb2da 100644
--- a/server/communityModerationReport/model.ts
+++ b/server/communityModerationReport/model.ts
@@ -14,7 +14,7 @@ import {
 	Table,
 } from 'sequelize-typescript';
 
-import { Community, Discussion, SpamTag, User } from '../models';
+import { Community, SpamTag, ThreadComment, User } from '../models';
 
 export type ModerationReportReason =
 	| 'spam-content'
@@ -49,7 +49,7 @@ export class CommunityModerationReport extends Model<
 
 	@AllowNull(false)
 	@Column(DataType.UUID)
-	declare flaggedById: string;
+	declare actorId: string;
 
 	@AllowNull(false)
 	@Column(
@@ -61,7 +61,7 @@ export class CommunityModerationReport extends Model<
 	declare reasonText: string | null;
 
 	@Column(DataType.UUID)
-	declare sourceDiscussionId: string | null;
+	declare sourceThreadCommentId: string | null;
 
 	@Column(DataType.UUID)
 	declare spamTagId: string | null;
@@ -77,16 +77,17 @@ export class CommunityModerationReport extends Model<
 	@BelongsTo(() => Community, { onDelete: 'CASCADE', as: 'community', foreignKey: 'communityId' })
 	declare community?: Community;
 
-	@BelongsTo(() => User, { onDelete: 'CASCADE', as: 'flaggedBy', foreignKey: 'flaggedById' })
-	declare flaggedBy?: User;
+	@BelongsTo(() => User, { onDelete: 'CASCADE', as: 'actor', foreignKey: 'actorId' })
+	declare actor?: User;
 
-	@BelongsTo(() => Discussion, {
+	@BelongsTo(() => ThreadComment, {
 		onDelete: 'SET NULL',
-		as: 'sourceDiscussion',
-		foreignKey: 'sourceDiscussionId',
+		as: 'sourceThreadComment',
+		foreignKey: 'sourceThreadCommentId',
 	})
-	declare sourceDiscussion?: Discussion;
+	declare sourceThreadComment?: ThreadComment;
 
-	@BelongsTo(() => SpamTag, { onDelete: 'SET NULL', as: 'spamTag', foreignKey: 'spamTagId' })
+	// if the spam tag is deleted, delete the report
+	@BelongsTo(() => SpamTag, { onDelete: 'CASCADE', as: 'spamTag', foreignKey: 'spamTagId' })
 	declare spamTag?: SpamTag;
 }
diff --git a/server/communityModerationReport/queries.ts b/server/communityModerationReport/queries.ts
index 4649ab24bc..b77faaf0d7 100644
--- a/server/communityModerationReport/queries.ts
+++ b/server/communityModerationReport/queries.ts
@@ -1,27 +1,28 @@
 import type { ModerationReportReason, ModerationReportStatus } from 'types';
 
-import { Community, CommunityModerationReport, Discussion, SpamTag, User } from 'server/models';
+import { Community, CommunityModerationReport, SpamTag, ThreadComment, User } from 'server/models';
+import { contextFromUser, notify } from 'server/spamTag/notifications';
 
 type CreateReportOptions = {
 	userId: string;
 	communityId: string;
-	flaggedById: string;
+	actorId: string;
 	reason: ModerationReportReason;
 	reasonText?: string | null;
-	sourceDiscussionId?: string | null;
+	sourceThreadCommentId?: string | null;
 	spamTagId?: string | null;
 };
 
 export const createReport = async (options: CreateReportOptions) => {
-	const { userId, communityId, flaggedById, reason, reasonText, sourceDiscussionId, spamTagId } =
+	const { userId, communityId, actorId, reason, reasonText, sourceThreadCommentId, spamTagId } =
 		options;
 	const report = await CommunityModerationReport.create({
 		userId,
 		communityId,
-		flaggedById,
+		actorId,
 		reason,
 		reasonText: reasonText ?? null,
-		sourceDiscussionId: sourceDiscussionId ?? null,
+		sourceThreadCommentId: sourceThreadCommentId ?? null,
 		spamTagId: spamTagId ?? null,
 	});
 	return report.toJSON();
@@ -43,14 +44,6 @@ export const getActiveReportsForUserInCommunity = async (
 	});
 };
 
-export const getReportedUserIdsForCommunity = async (communityId: string): Promise<Set<string>> => {
-	const reports = await CommunityModerationReport.findAll({
-		where: { communityId, status: 'active' },
-		attributes: ['userId'],
-	});
-	return new Set(reports.map((r) => r.userId));
-};
-
 export const isUserReportedInCommunity = async (
 	userId: string,
 	communityId: string,
@@ -67,8 +60,8 @@ export const getReportsForCommunity = async (communityId: string) => {
 		order: [['createdAt', 'DESC']],
 		include: [
 			{ model: User, as: 'user', attributes: ['id', 'fullName', 'slug', 'email'] },
-			{ model: User, as: 'flaggedBy', attributes: ['id', 'fullName', 'slug'] },
-			{ model: Discussion, as: 'sourceDiscussion', attributes: ['id', 'title'] },
+			{ model: User, as: 'actor', attributes: ['id', 'fullName', 'slug'] },
+			{ model: ThreadComment, as: 'sourceThreadComment', attributes: ['id', 'text'] },
 			{ model: SpamTag, as: 'spamTag', attributes: ['id', 'status'] },
 		],
 	});
@@ -80,9 +73,9 @@ export const getAllActiveReports = async () => {
 		order: [['createdAt', 'DESC']],
 		include: [
 			{ model: User, as: 'user', attributes: ['id', 'fullName', 'slug', 'email'] },
-			{ model: User, as: 'flaggedBy', attributes: ['id', 'fullName', 'slug'] },
+			{ model: User, as: 'actor', attributes: ['id', 'fullName', 'slug'] },
 			{ model: Community, as: 'community', attributes: ['id', 'subdomain'] },
-			{ model: Discussion, as: 'sourceDiscussion', attributes: ['id', 'title'] },
+			{ model: ThreadComment, as: 'sourceThreadComment', attributes: ['id', 'text'] },
 			{ model: SpamTag, as: 'spamTag', attributes: ['id', 'status'] },
 		],
 	});
@@ -92,7 +85,7 @@ export const getReportById = async (reportId: string) => {
 	return CommunityModerationReport.findByPk(reportId, {
 		include: [
 			{ model: User, as: 'user', attributes: ['id', 'fullName', 'slug', 'email'] },
-			{ model: User, as: 'flaggedBy', attributes: ['id', 'fullName', 'slug'] },
+			{ model: User, as: 'actor', attributes: ['id', 'fullName', 'slug'] },
 			{ model: Community, as: 'community', attributes: ['id', 'subdomain'] },
 			{ model: SpamTag, as: 'spamTag', attributes: ['id', 'status'] },
 		],
@@ -105,12 +98,12 @@ export const getActiveReportCountForUser = async (userId: string): Promise<numbe
 	});
 };
 
-export const getActiveReportsByFlaggedBy = async (
+export const getReportByIdAndActor = async (
 	reportId: string,
-	flaggedById: string,
+	actorId: string,
 ): Promise<CommunityModerationReport | null> => {
 	return CommunityModerationReport.findOne({
-		where: { id: reportId, flaggedById },
+		where: { id: reportId, actorId },
 	});
 };
 
@@ -125,25 +118,44 @@ export const getActiveReportIdsForUserInCommunity = async (
 	return reports.map((r) => r.id);
 };
 
-type ReportedUserMapEntry = {
-	reportIds: string[];
-};
-
-export const getReportedUserMapForCommunity = async (
-	communityId: string,
-): Promise<Map<string, ReportedUserMapEntry>> => {
+export const notifyReportersOfCommunityFlagResolution = async (
+	userId: string,
+	reportedUser: {
+		id: string;
+		email?: string | null;
+		fullName?: string | null;
+		slug: string;
+		avatar?: string | null;
+	},
+	resolution: string,
+) => {
 	const reports = await CommunityModerationReport.findAll({
-		where: { communityId, status: 'active' },
-		attributes: ['id', 'userId'],
+		where: { userId, status: 'active' },
+		attributes: ['actorId', 'communityId'],
 	});
-	const map = new Map<string, ReportedUserMapEntry>();
-	for (const r of reports) {
-		const existing = map.get(r.userId);
-		if (existing) {
-			existing.reportIds.push(r.id);
-		} else {
-			map.set(r.userId, { reportIds: [r.id] });
-		}
-	}
-	return map;
+	if (reports.length === 0) return;
+
+	const actorIds = [...new Set(reports.map((r) => r.actorId))];
+	const actors = await User.findAll({
+		where: { id: actorIds },
+		attributes: ['id', 'email', 'fullName', 'slug'],
+	});
+	const actorMap = new Map(actors.map((u) => [u.id, u]));
+
+	await Promise.all(
+		reports.map((report) => {
+			const actor = actorMap.get(report.actorId);
+			if (!actor?.email) return Promise.resolve();
+			return notify(
+				'community-flag-resolved',
+				contextFromUser(reportedUser, {
+					communityId: report.communityId,
+					actorFullName: actor.fullName ?? '',
+					actorSlug: actor.slug ?? '',
+					actorEmail: actor.email,
+					resolution,
+				}),
+			);
+		}),
+	);
 };
diff --git a/server/spamTag/api.ts b/server/spamTag/api.ts
index 422bd3c5e5..dea16f681b 100644
--- a/server/spamTag/api.ts
+++ b/server/spamTag/api.ts
@@ -2,6 +2,7 @@ import type { UserSpamTagFields } from 'types';
 
 import { Router } from 'express';
 
+import { notifyReportersOfCommunityFlagResolution } from 'server/communityModerationReport/queries';
 import { CommunityModerationReport, User } from 'server/models';
 import { ForbiddenError } from 'server/utils/errors';
 import { wrap } from 'server/wrap';
@@ -14,47 +15,6 @@ import { canManipulateSpamTags } from './permissions';
 import { getRecentDiscussionsForUser, queryUsersForSpamManagement } from './userDashboard';
 import { getSpamTagForUser, removeSpamTagFromUser, upsertSpamTag } from './userQueries';
 
-const notifyReportersOfResolution = async (
-	userId: string,
-	reportedUser: {
-		id: string;
-		email?: string | null;
-		fullName?: string | null;
-		slug: string;
-		avatar?: string | null;
-	},
-	resolution: string,
-) => {
-	const reports = await CommunityModerationReport.findAll({
-		where: { userId, status: 'active' },
-		attributes: ['flaggedById', 'communityId'],
-	});
-	if (reports.length === 0) return;
-
-	const flaggedByIds = [...new Set(reports.map((r) => r.flaggedById))];
-	const reporters = await User.findAll({
-		where: { id: flaggedByIds },
-		attributes: ['id', 'email', 'fullName'],
-	});
-	const reporterMap = new Map(reporters.map((u) => [u.id, u]));
-
-	await Promise.all(
-		reports.map((report) => {
-			const reporter = reporterMap.get(report.flaggedById);
-			if (!reporter?.email) return Promise.resolve();
-			return notify(
-				'community-flag-resolved',
-				contextFromUser(reportedUser, {
-					communityId: report.communityId,
-					flaggedByEmail: reporter.email,
-					flaggedByName: reporter.fullName ?? '',
-					resolution,
-				}),
-			);
-		}),
-	);
-};
-
 export const router = Router();
 
 router.put(
@@ -107,7 +67,7 @@ router.put(
 			status === 'confirmed-spam'
 				? 'The user has been confirmed as spam and banned.'
 				: 'The user has been reviewed and confirmed as not spam.';
-		notifyReportersOfResolution(userId, user, resolution).catch((err) =>
+		notifyReportersOfCommunityFlagResolution(userId, user, resolution).catch((err) =>
 			console.error('Failed to notify reporters of resolution', err),
 		);
 
diff --git a/server/utils/email/spam.ts b/server/spamTag/notifications/email.ts
similarity index 67%
rename from server/utils/email/spam.ts
rename to server/spamTag/notifications/email.ts
index 4576bf4189..29cf6ada0e 100644
--- a/server/utils/email/spam.ts
+++ b/server/spamTag/notifications/email.ts
@@ -1,8 +1,11 @@
+import type { ModerationReportReason, UserSpamTagFields } from 'types';
+
 import stripIndent from 'strip-indent';
 
+import { sendEmail } from 'server/utils/email/reset';
 import { getSuperAdminTabUrl } from 'utils/superAdmin';
 
-import { sendEmail } from './reset';
+import { buildReasonText, getSpamDashUrl } from './shared';
 
 export const DEV_TEAM_EMAIL = 'other@tefkah.com';
 
@@ -13,7 +16,7 @@ export const sendSpamBanEmail = ({ toEmail, userName }: { toEmail: string; userN
 		text: stripIndent(`
 			Hello${userName ? ` ${userName}` : ''},
 
-			Your activity on PubPub has been flagged as spam. Your account has been restricted.
+			Your activity on PubPub has been flagged as being in violation of our Acceptable Use Policy (https://www.pubpub.org/legal/aup). Your account has been banned. You are no longer able to log in and use the platform.
 
 			If you believe this is an error, please contact us at hello@pubpub.org.
 
@@ -47,17 +50,22 @@ export const sendSpamLiftedEmail = ({
 export const sendNewSpamTagDevEmail = ({
 	userEmail,
 	userName,
+	reason,
 }: {
 	userEmail: string;
 	userName: string;
+	reason?: UserSpamTagFields;
 }) => {
 	const reviewUrl = `https://pubpub.org${getSuperAdminTabUrl('spamUsers')}?q=${encodeURIComponent(userEmail)}`;
+	const reasonText = buildReasonText(reason);
 	return sendEmail({
 		to: [DEV_TEAM_EMAIL],
 		subject: `New spam tag: ${userName} (${userEmail})`,
 		text: stripIndent(`
 			A new spam tag has been created for ${userName} (${userEmail}).
 
+			${reasonText ? `Reason(s): ${reasonText}` : ''}
+
 			Review: ${reviewUrl}
 
 			-- PubPub Spam System
@@ -68,16 +76,24 @@ export const sendNewSpamTagDevEmail = ({
 export const sendBanDevEmail = ({
 	userEmail,
 	userName,
+	actorName,
+	reason,
 }: {
 	userEmail: string;
 	userName: string;
+	actorName?: string;
+	reason?: UserSpamTagFields;
 }) => {
-	const reviewUrl = `https://pubpub.org${getSuperAdminTabUrl('spamUsers')}?q=${encodeURIComponent(userEmail)}`;
+	const reviewUrl = getSpamDashUrl(userName);
+	const reasonText = buildReasonText(reason);
+	const byText = actorName ? ` by ${actorName}` : '';
 	return sendEmail({
 		to: [DEV_TEAM_EMAIL],
 		subject: `User banned: ${userName} (${userEmail})`,
 		text: stripIndent(`
-			${userName} (${userEmail}) has been banned.
+			${userName} (${userEmail}) has been banned${byText}.
+
+			${reasonText ? `Reason(s): ${reasonText}` : ''}
 
 			Review: ${reviewUrl}
 
@@ -108,22 +124,30 @@ export const sendLiftDevEmail = ({
 };
 
 export const sendCommunityFlagDevEmail = ({
-	userEmail,
 	userName,
-	communityId,
+	userSlug,
+	actorFullName,
+	actorSlug,
+	communitySubdomain,
 	flagReason,
+	flagReasonText,
 }: {
-	userEmail: string;
 	userName: string;
-	communityId: string;
-	flagReason: string;
+	userSlug: string;
+	actorFullName: string;
+	actorSlug: string;
+	communitySubdomain: string;
+	flagReason: ModerationReportReason;
+	flagReasonText?: string | null;
 }) => {
-	const reviewUrl = `https://pubpub.org${getSuperAdminTabUrl('spamUsers')}?q=${encodeURIComponent(userEmail || userName)}`;
+	const reviewUrl = `https://pubpub.org${getSuperAdminTabUrl('spamUsers')}?q=${encodeURIComponent(userName)}`;
 	return sendEmail({
 		to: [DEV_TEAM_EMAIL],
 		subject: `Community flag: ${userName || 'Unknown'} flagged for ${flagReason}`,
 		text: stripIndent(`
-			A community admin has flagged ${userName} (${userEmail}) for "${flagReason}" in community ${communityId}.
+			A community admin (${actorFullName} (https://pubpub.org/user/${actorSlug})) has flagged ${userName} (https://pubpub.org/user/${userSlug}) for "${flagReason}" in community https://${communitySubdomain}.pubpub.org.
+
+			${flagReasonText ? `Reason: ${flagReasonText}` : ''}
 
 			Review: ${reviewUrl}
 
@@ -134,12 +158,12 @@ export const sendCommunityFlagDevEmail = ({
 
 export const sendCommunityFlagResolvedEmail = ({
 	toEmail,
-	flaggedByName,
+	actorName,
 	userName,
 	resolution,
 }: {
 	toEmail: string;
-	flaggedByName: string;
+	actorName: string;
 	userName: string;
 	resolution: string;
 }) => {
@@ -147,7 +171,7 @@ export const sendCommunityFlagResolvedEmail = ({
 		to: [toEmail],
 		subject: `Update on your report of ${userName} on PubPub`,
 		text: stripIndent(`
-			Hello${flaggedByName ? ` ${flaggedByName}` : ''},
+			Hello${actorName ? ` ${actorName}` : ''},
 
 			Thank you for flagging ${userName} in your community. We have reviewed the report and the outcome is: ${resolution}.
 
diff --git a/server/spamTag/notifications.ts b/server/spamTag/notifications/index.ts
similarity index 65%
rename from server/spamTag/notifications.ts
rename to server/spamTag/notifications/index.ts
index 7ce9f47c9f..90248e4442 100644
--- a/server/spamTag/notifications.ts
+++ b/server/spamTag/notifications/index.ts
@@ -8,14 +8,15 @@ import {
 	sendNewSpamTagDevEmail,
 	sendSpamBanEmail,
 	sendSpamLiftedEmail,
-} from 'server/utils/email';
+} from './email';
 import {
 	postToSlackAboutCommunityFlag,
+	postToSlackAboutCommunityFlagRetracted,
 	postToSlackAboutNewUserSpamTag,
 	postToSlackAboutSuspiciousUpload,
 	postToSlackAboutUserBan,
 	postToSlackAboutUserLifted,
-} from 'server/utils/slack';
+} from './slack';
 
 export type SpamEvent =
 	| 'new-spam-tag'
@@ -44,7 +45,7 @@ type SuspiciousUploadContext = SharedContext & {
 	uploadKey: string;
 };
 
-type HoneypotBanContext = SharedContext & {};
+type HoneypotBanContext = SharedContext;
 
 type ManualBanContext = SharedContext & {
 	spamFields?: UserSpamTagFields;
@@ -59,43 +60,29 @@ type SpamLiftedContext = SharedContext & {
 
 type CommunityFlagContext = SharedContext & {
 	communityId: string;
-	sourceDiscussionId?: string | null;
-	flaggedById: string;
+	communitySubdomain: string;
+	sourceThreadCommentId?: string | null;
+	actorFullName: string;
+	actorSlug: string;
+	actorEmail: string;
 	flagReason: ModerationReportReason;
 	flagReasonText?: string | null;
 };
 
 type CommunityFlagRetractedContext = SharedContext & {
 	communityId: string;
-	flaggedById: string;
+	communitySubdomain: string;
+	actorFullName: string;
+	actorSlug: string;
+	actorEmail: string;
 };
 
 type CommunityFlagResolvedContext = SharedContext & {
 	communityId: string;
-	flaggedByEmail?: string;
-	flaggedByName?: string;
-	resolution?: string;
-};
-
-export type SpamNotificationContext = {
-	userId: string;
-	userEmail: string;
-	userName: string;
-	userSlug: string;
-	userAvatar?: string | null;
-	spamScore?: number | null;
-	spamFields?: UserSpamTagFields;
-	previousStatus?: SpamStatus | null;
-	actorName?: string;
-	uploadKey?: string;
-	communityId?: string;
-	sourceDiscussionId?: string | null;
-	flaggedById?: string;
-	flagReason?: ModerationReportReason;
-	flagReasonText?: string | null;
-	flaggedByEmail?: string;
-	flaggedByName?: string;
-	resolution?: string;
+	actorFullName: string;
+	actorSlug: string;
+	actorEmail: string;
+	resolution: string;
 };
 
 type Handler<T extends SharedContext> = (ctx: T) => Promise<void>;
@@ -120,16 +107,19 @@ const handlers = {
 				userSlug: ctx.userSlug,
 				spamScore: ctx.spamScore ?? null,
 			}),
-		(ctx) => sendNewSpamTagDevEmail({ userEmail: ctx.userEmail, userName: ctx.userName }),
+		(ctx) =>
+			sendNewSpamTagDevEmail({
+				userEmail: ctx.userEmail,
+				userName: ctx.userName,
+				reason: ctx.spamFields,
+			}),
 	],
 	'suspicious-upload': [
 		(ctx) =>
-			postToSlackAboutSuspiciousUpload(
-				ctx.userId,
-				ctx.userEmail,
-				ctx.userName,
-				ctx.uploadKey,
-			),
+			postToSlackAboutSuspiciousUpload({
+				userName: ctx.userName,
+				uploadKey: ctx.uploadKey,
+			}),
 	],
 	'honeypot-ban': [(ctx) => sendSpamBanEmail({ toEmail: ctx.userEmail, userName: ctx.userName })],
 	'manual-ban': [
@@ -143,17 +133,18 @@ const handlers = {
 				actorName: ctx.actorName,
 			}),
 		(ctx) => sendSpamBanEmail({ toEmail: ctx.userEmail, userName: ctx.userName }),
-		(ctx) => sendBanDevEmail({ userEmail: ctx.userEmail, userName: ctx.userName }),
+		(ctx) =>
+			sendBanDevEmail({
+				userEmail: ctx.userEmail,
+				userName: ctx.userName,
+				actorName: ctx.actorName,
+				reason: ctx.spamFields,
+			}),
 	],
 	'spam-lifted': [
 		async (ctx) => {
-			if (!ctx.previousStatus || ctx.previousStatus === 'unreviewed') {
-				console.log(
-					'spam-lifted: not notifying manual marking of unreviewed user as not-spam',
-				);
-				return;
-			}
-			return Promise.all([
+			if (!ctx.previousStatus || ctx.previousStatus === 'unreviewed') return;
+			await Promise.all([
 				postToSlackAboutUserLifted({
 					userId: ctx.userId,
 					userName: ctx.userName,
@@ -168,45 +159,49 @@ const handlers = {
 	'community-flag': [
 		(ctx) =>
 			postToSlackAboutCommunityFlag({
-				userId: ctx.userId,
-				communityId: ctx.communityId,
-				flaggedById: ctx.flaggedById,
+				userName: ctx.userName,
+				userSlug: ctx.userSlug,
+				actorName: ctx.actorFullName,
+				communitySubdomain: ctx.communitySubdomain,
 				reason: ctx.flagReason,
 				reasonText: ctx.flagReasonText,
-				sourceDiscussionId: ctx.sourceDiscussionId,
 			}),
 		(ctx) =>
 			sendCommunityFlagDevEmail({
-				userEmail: ctx.userEmail,
 				userName: ctx.userName,
-				communityId: ctx.communityId,
+				userSlug: ctx.userSlug,
+				actorFullName: ctx.actorFullName,
+				actorSlug: ctx.actorSlug,
+				communitySubdomain: ctx.communitySubdomain,
 				flagReason: ctx.flagReason,
+				flagReasonText: ctx.flagReasonText,
 			}),
 	],
 	'community-flag-retracted': [
 		(ctx) =>
-			postToSlackAboutCommunityFlag({
-				userId: ctx.userId,
-				communityId: ctx.communityId,
-				flaggedById: ctx.flaggedById,
+			postToSlackAboutCommunityFlagRetracted({
+				userName: ctx.userName,
+				userSlug: ctx.userSlug,
+				actorName: ctx.actorFullName,
+				communitySubdomain: ctx.communitySubdomain,
 				reason: 'other',
-				reasonText: 'Flag retracted by community admin',
+				reasonText: `Flag retracted by ${ctx.actorFullName}`,
 			}),
 	],
 	'community-flag-resolved': [
 		async (ctx) => {
-			if (!ctx.flaggedByEmail) return;
+			if (!ctx.actorEmail) return;
 			await sendCommunityFlagResolvedEmail({
-				toEmail: ctx.flaggedByEmail,
-				flaggedByName: ctx.flaggedByName ?? '',
+				toEmail: ctx.actorEmail,
+				actorName: ctx.actorFullName,
 				userName: ctx.userName,
-				resolution: ctx.resolution ?? 'reviewed',
+				resolution: ctx.resolution,
 			});
 		},
 	],
 } satisfies { [K in keyof Contexts]: Handler<Contexts[K]>[] };
 
-export const notify = async (event: SpamEvent, ctx: SpamNotificationContext): Promise<void> => {
+export const notify = async <T extends SpamEvent>(event: T, ctx: Contexts[T]): Promise<void> => {
 	const results = await Promise.allSettled(handlers[event].map((h) => h(ctx)));
 	for (const result of results) {
 		if (result.status === 'rejected') {
@@ -215,7 +210,7 @@ export const notify = async (event: SpamEvent, ctx: SpamNotificationContext): Pr
 	}
 };
 
-export const contextFromUser = (
+export const contextFromUser = <const T extends object = {}>(
 	user: {
 		id: string;
 		email?: string | null;
@@ -223,12 +218,15 @@ export const contextFromUser = (
 		slug: string;
 		avatar?: string | null;
 	},
-	extra?: Partial<SpamNotificationContext>,
-): SpamNotificationContext => ({
-	userId: user.id,
-	userEmail: user.email ?? '',
-	userName: user.fullName ?? '',
-	userSlug: user.slug ?? '',
-	userAvatar: user.avatar,
-	...extra,
-});
+	extra?: T,
+) => {
+	const base: SharedContext = {
+		userId: user.id,
+		userEmail: user.email ?? '',
+		userName: user.fullName ?? '',
+		userSlug: user.slug ?? '',
+		userAvatar: user.avatar,
+	};
+	if (!extra) return base as SharedContext & T;
+	return { ...base, ...extra };
+};
diff --git a/server/spamTag/notifications/shared.ts b/server/spamTag/notifications/shared.ts
new file mode 100644
index 0000000000..7e4572d1b3
--- /dev/null
+++ b/server/spamTag/notifications/shared.ts
@@ -0,0 +1,52 @@
+import type { UserSpamTagFields } from 'types/spam';
+
+import { getSuperAdminTabUrl } from 'utils/superAdmin';
+
+export const getUserProfileUrl = (userSlug: string) => `https://www.pubpub.org/user/${userSlug}`;
+
+export const getSpamDashUrl = (userName: string) =>
+	`https://pubpub.org${getSuperAdminTabUrl('spamUsers')}?q=${encodeURIComponent(userName)}`;
+
+export const buildReasonText = (reason?: UserSpamTagFields): string => {
+	if (!reason) return '';
+	if (reason.manuallyMarkedBy?.length) {
+		const last = reason.manuallyMarkedBy[reason.manuallyMarkedBy.length - 1];
+		return `Manually marked by ${last.userName}`;
+	}
+	if (reason.suspiciousFiles?.length) return 'Uploading suspicious files';
+	if (reason.suspiciousComments?.length) return 'Posting suspicious comments';
+	if (reason.honeypotTriggers?.length) {
+		const last = reason.honeypotTriggers[reason.honeypotTriggers.length - 1];
+		const parts: string[] = [last.honeypot];
+		if (last.context?.communitySubdomain)
+			parts.push(`community: ${last.context.communitySubdomain}`);
+		if (last.context?.pubSlug) parts.push(`pub: ${last.context.pubSlug}`);
+		return `Honeypot triggered (${parts.join(', ')})`;
+	}
+	return '';
+};
+
+export const buildHoneypotContextLine = (reason?: UserSpamTagFields): string | null => {
+	if (!reason?.honeypotTriggers?.length) return null;
+	const last = reason.honeypotTriggers[reason.honeypotTriggers.length - 1];
+	if (!last.context) return null;
+	const parts: string[] = [];
+	if (last.context.communitySubdomain) {
+		const communityUrl = `https://${last.context.communitySubdomain}.pubpub.org`;
+		parts.push(`Community: <${communityUrl}|${last.context.communitySubdomain}>`);
+	}
+	if (last.context.pubSlug && last.context.communitySubdomain) {
+		const pubUrl = `https://${last.context.communitySubdomain}.pubpub.org/pub/${last.context.pubSlug}`;
+		parts.push(`Pub: <${pubUrl}|${last.context.pubSlug}>`);
+	} else if (last.context.pubSlug) {
+		parts.push(`Pub: ${last.context.pubSlug}`);
+	}
+	if (last.context.content) {
+		const truncated =
+			last.context.content.length > 200
+				? last.context.content.slice(0, 200) + '...'
+				: last.context.content;
+		parts.push(`Content: ${truncated}`);
+	}
+	return parts.length > 0 ? parts.join('  |  ') : null;
+};
diff --git a/server/spamTag/notifications/slack.ts b/server/spamTag/notifications/slack.ts
new file mode 100644
index 0000000000..baab1ad4f6
--- /dev/null
+++ b/server/spamTag/notifications/slack.ts
@@ -0,0 +1,280 @@
+import type { ModerationReportReason, UserSpamTagFields } from 'types';
+
+import { postToSlack } from 'server/utils/slack';
+
+import {
+	buildHoneypotContextLine,
+	buildReasonText,
+	getSpamDashUrl,
+	getUserProfileUrl,
+} from './shared';
+
+type SuspiciousUploadSlackOptions = {
+	userName: string;
+	uploadKey: string;
+};
+
+export const postToSlackAboutSuspiciousUpload = async (opts: SuspiciousUploadSlackOptions) => {
+	if (process.env.NODE_ENV === 'test') return;
+	const { userName, uploadKey } = opts;
+	const dashUrl = getSpamDashUrl(userName);
+	await postToSlack({
+		icon_emoji: ':warning:',
+		attachments: [
+			{
+				fallback: `Suspicious upload by ${userName}: ${uploadKey}`,
+				pretext: 'Suspicious upload detected (scam keywords in filename)',
+				color: 'warning',
+				fields: [
+					{ title: 'User', value: userName },
+					{ title: 'Object key', value: uploadKey },
+				],
+				actions: [
+					{
+						type: 'button',
+						text: 'View in Spam Users Dashboard',
+						url: dashUrl,
+					},
+				],
+			},
+		],
+	});
+};
+
+type UserBanSlackOptions = {
+	userId: string;
+	userName: string;
+	userSlug: string;
+	userAvatar?: string | null;
+	reason?: UserSpamTagFields;
+	actorName?: string;
+};
+
+export const postToSlackAboutUserBan = async (opts: UserBanSlackOptions) => {
+	if (process.env.NODE_ENV === 'test') return;
+	const { userName, userSlug, userAvatar, reason, actorName } = opts;
+	const profileUrl = getUserProfileUrl(userSlug);
+	const dashUrl = getSpamDashUrl(userName);
+	const reasonText = buildReasonText(reason);
+	const byText = actorName ? ` by ${actorName}` : '';
+	const reasonSuffix = reasonText ? ` -- ${reasonText}` : '';
+	const headline = `*<${profileUrl}|${userName}>* banned${byText}${reasonSuffix}`;
+	const fallback = `${userName} banned${byText}${reasonSuffix}`;
+
+	const headerSection: Record<string, any> = {
+		type: 'section',
+		text: { type: 'mrkdwn', text: headline },
+	};
+	if (userAvatar) {
+		headerSection.accessory = {
+			type: 'image',
+			image_url: userAvatar,
+			alt_text: userName,
+		};
+	}
+
+	const blocks: Record<string, any>[] = [headerSection];
+
+	const honeypotLine = buildHoneypotContextLine(reason);
+	if (honeypotLine) {
+		blocks.push({
+			type: 'context',
+			elements: [{ type: 'mrkdwn', text: honeypotLine }],
+		});
+	}
+
+	blocks.push({
+		type: 'actions',
+		elements: [
+			{ type: 'button', text: { type: 'plain_text', text: 'Profile' }, url: profileUrl },
+			{ type: 'button', text: { type: 'plain_text', text: 'Spam Dashboard' }, url: dashUrl },
+		],
+	});
+
+	await postToSlack({
+		icon_emoji: ':no_entry:',
+		text: fallback,
+		attachments: [{ fallback, color: 'danger', blocks }],
+	});
+};
+
+type UserLiftedSlackOptions = {
+	userId: string;
+	userName: string;
+	userSlug: string;
+	actorName?: string;
+};
+
+export const postToSlackAboutUserLifted = async (opts: UserLiftedSlackOptions) => {
+	if (process.env.NODE_ENV === 'test') return;
+	const { userName, userSlug, actorName } = opts;
+	const profileUrl = getUserProfileUrl(userSlug);
+	const byText = actorName ? ` by ${actorName}` : '';
+	const headline = `*<${profileUrl}|${userName}>* restriction lifted${byText}`;
+	const fallback = `${userName} restriction lifted${byText}`;
+	await postToSlack({
+		icon_emoji: ':white_check_mark:',
+		text: fallback,
+		attachments: [
+			{
+				fallback,
+				color: '#5cb85c',
+				blocks: [
+					{ type: 'section', text: { type: 'mrkdwn', text: headline } },
+					{
+						type: 'actions',
+						elements: [
+							{
+								type: 'button',
+								text: { type: 'plain_text', text: 'Profile' },
+								url: profileUrl,
+							},
+						],
+					},
+				],
+			},
+		],
+	});
+};
+
+type NewSpamTagSlackOptions = {
+	userId: string;
+	userName: string;
+	userSlug: string;
+	spamScore: number | null;
+};
+
+export const postToSlackAboutNewUserSpamTag = async (opts: NewSpamTagSlackOptions) => {
+	if (process.env.NODE_ENV === 'test') return;
+	const { userName, userSlug, spamScore } = opts;
+	const profileUrl = getUserProfileUrl(userSlug);
+	const dashUrl = getSpamDashUrl(userName);
+	const scorePart = spamScore != null ? ` (score: ${spamScore})` : '';
+	const headline = `New spam tag for *<${profileUrl}|${userName}>*${scorePart}`;
+	const fallback = `New spam tag: ${userName}${scorePart}`;
+	await postToSlack({
+		icon_emoji: ':mag:',
+		text: fallback,
+		attachments: [
+			{
+				fallback,
+				color: '#f0ad4e',
+				blocks: [
+					{ type: 'section', text: { type: 'mrkdwn', text: headline } },
+					{
+						type: 'actions',
+						elements: [
+							{
+								type: 'button',
+								text: { type: 'plain_text', text: 'Profile' },
+								url: profileUrl,
+							},
+							{
+								type: 'button',
+								text: { type: 'plain_text', text: 'Review in Dashboard' },
+								url: dashUrl,
+							},
+						],
+					},
+				],
+			},
+		],
+	});
+};
+
+type CommunityFlagSlackOptions = {
+	userName: string;
+	userSlug: string;
+	actorName: string;
+	communitySubdomain: string;
+	reason: ModerationReportReason;
+	reasonText?: string | null;
+};
+
+export const postToSlackAboutCommunityFlag = async (opts: CommunityFlagSlackOptions) => {
+	if (process.env.NODE_ENV === 'test') return;
+	const { userName, userSlug, actorName, communitySubdomain, reason, reasonText } = opts;
+	const profileUrl = getUserProfileUrl(userSlug);
+	const dashUrl = getSpamDashUrl(userName);
+
+	const reasonLabel = reason.replace(/-/g, ' ');
+	const extraReason = reasonText ? `: ${reasonText}` : '';
+
+	const headline =
+		`*<${profileUrl}|${userName}>* flagged by ${actorName} in *${communitySubdomain}*` +
+		`\nReason: ${reasonLabel}${extraReason}`;
+	const fallback = `${userName} flagged by ${actorName} in ${communitySubdomain} for ${reasonLabel}`;
+
+	await postToSlack({
+		icon_emoji: ':triangular_flag_on_post:',
+		text: fallback,
+		attachments: [
+			{
+				fallback,
+				color: '#e67e22',
+				blocks: [
+					{ type: 'section', text: { type: 'mrkdwn', text: headline } },
+					{
+						type: 'actions',
+						elements: [
+							{
+								type: 'button',
+								text: { type: 'plain_text', text: 'User Profile' },
+								url: profileUrl,
+							},
+							{
+								type: 'button',
+								text: { type: 'plain_text', text: 'Spam Dashboard' },
+								url: dashUrl,
+							},
+						],
+					},
+				],
+			},
+		],
+	});
+};
+
+export const postToSlackAboutCommunityFlagRetracted = async (opts: CommunityFlagSlackOptions) => {
+	if (process.env.NODE_ENV === 'test') return;
+	const { userName, userSlug, actorName, communitySubdomain, reason, reasonText } = opts;
+	const profileUrl = getUserProfileUrl(userSlug);
+	const dashUrl = getSpamDashUrl(userName);
+
+	const reasonLabel = reason.replace(/-/g, ' ');
+	const extraReason = reasonText ? `: ${reasonText}` : '';
+
+	const headline =
+		`*<${profileUrl}|${userName}>* flagged by ${actorName} in *${communitySubdomain}*` +
+		`\nReason: ${reasonLabel}${extraReason}`;
+	const fallback = `${userName} flag retracted by ${actorName} in ${communitySubdomain}`;
+
+	await postToSlack({
+		icon_emoji: ':triangular_flag_on_post:',
+		text: fallback,
+		attachments: [
+			{
+				fallback,
+				color: '#95a5a6',
+				blocks: [
+					{ type: 'section', text: { type: 'mrkdwn', text: headline } },
+					{
+						type: 'actions',
+						elements: [
+							{
+								type: 'button',
+								text: { type: 'plain_text', text: 'User Profile' },
+								url: profileUrl,
+							},
+							{
+								type: 'button',
+								text: { type: 'plain_text', text: 'Spam Dashboard' },
+								url: dashUrl,
+							},
+						],
+					},
+				],
+			},
+		],
+	});
+};
diff --git a/server/spamTag/userDashboard.ts b/server/spamTag/userDashboard.ts
index 6754715eed..c545fa8bb1 100644
--- a/server/spamTag/userDashboard.ts
+++ b/server/spamTag/userDashboard.ts
@@ -265,39 +265,31 @@ const getCommunityReportsForUserIds = async (
 		attributes: ['userId', 'reason', 'reasonText', 'status', 'createdAt'],
 		include: [
 			{ model: Community, as: 'community', attributes: ['subdomain'] },
-			{ model: User, as: 'flaggedBy', attributes: ['fullName'] },
 			{
-				model: Discussion,
-				as: 'sourceDiscussion',
-				attributes: ['title'],
-				include: [
-					{
-						model: Pub,
-						as: 'pub',
-						attributes: ['slug'],
-						include: [{ model: Community, as: 'community', attributes: ['subdomain'] }],
-					},
-				],
+				model: User,
+				as: 'actor',
+				attributes: ['id', 'fullName', 'slug'],
+			},
+			{
+				model: ThreadComment,
+				as: 'sourceThreadComment',
+				attributes: ['id', 'text'],
 			},
 		],
 	});
+
 	const map = new Map<string, types.SpamUserCommunityReport[]>();
 	for (const r of reports) {
 		const raw = r as any;
-		const subdomain = raw['sourceDiscussion.pub.community.subdomain'] as string | undefined;
-		const pubSlug = raw['sourceDiscussion.pub.slug'] as string | undefined;
-		const discussionTitle = raw['sourceDiscussion.title'] as string | undefined;
-		const sourceUrl =
-			subdomain && pubSlug ? `https://${subdomain}.pubpub.org/pub/${pubSlug}` : null;
+		const commentText = raw['sourceThreadComment.text'] as string | undefined;
 		const entry: types.SpamUserCommunityReport = {
 			communitySubdomain: raw['community.subdomain'] ?? 'unknown',
 			reason: raw.reason,
 			reasonText: raw.reasonText ?? null,
 			status: raw.status,
 			createdAt: raw.createdAt,
-			flaggedByName: raw['flaggedBy.fullName'] ?? null,
-			sourceDiscussionTitle: discussionTitle || null,
-			sourceDiscussionUrl: sourceUrl,
+			actorName: raw['actor.fullName'] ?? null,
+			sourceCommentText: commentText || null,
 		};
 		const existing = map.get(raw.userId);
 		if (existing) {
diff --git a/server/user/model.ts b/server/user/model.ts
index 0950968daa..c93a41a0b3 100644
--- a/server/user/model.ts
+++ b/server/user/model.ts
@@ -28,6 +28,7 @@ import {
 } from 'sequelize-typescript';
 
 import {
+	CommunityModerationReport,
 	Discussion,
 	PubAttribution,
 	SpamTag,
@@ -254,6 +255,12 @@ export class User extends ModelWithPassport<InferAttributes<User>, InferCreation
 	@HasMany(() => Discussion, { onDelete: 'CASCADE', as: 'discussions', foreignKey: 'userId' })
 	declare discussions?: Discussion[];
 
+	@HasMany(() => CommunityModerationReport, {
+		as: 'communityModerationReports',
+		foreignKey: 'userId',
+	})
+	declare communityModerationReports?: CommunityModerationReport[];
+
 	@HasOne(() => UserNotificationPreferences, {
 		onDelete: 'CASCADE',
 		as: 'userNotificationPreferences',
diff --git a/server/utils/email/index.ts b/server/utils/email/index.ts
index 1f4dfc9c7c..10bee7d3ce 100644
--- a/server/utils/email/index.ts
+++ b/server/utils/email/index.ts
@@ -2,4 +2,3 @@ export * from './communitySpam';
 export * from './digest';
 export * from './reset';
 export * from './signup';
-export * from './spam';
diff --git a/server/utils/queryHelpers/discussionsSanitize.ts b/server/utils/queryHelpers/discussionsSanitize.ts
index a4ca576e12..ddb34b2537 100644
--- a/server/utils/queryHelpers/discussionsSanitize.ts
+++ b/server/utils/queryHelpers/discussionsSanitize.ts
@@ -1,85 +1,39 @@
+import type { DefinitelyHas, Discussion } from 'types';
+
 import { sanitizeOnVisibility } from './util';
 
-const isAuthorSpam = (author: { spamTag?: { status?: string } } | null) => {
-	return author?.spamTag?.status === 'confirmed-spam';
-};
+type AuthorWithModeration =
+	| {
+			spamTag?: { status?: string } | null;
+			communityModerationReports?: { status?: string }[];
+	  }
+	| null
+	| undefined;
 
-const isAuthorFlagged = (author: { id?: string } | null, flaggedUserIds?: Set<string>) => {
-	if (!flaggedUserIds || !author?.id) return false;
-	return flaggedUserIds.has(author.id);
-};
+const isAuthorSpam = (author: AuthorWithModeration) => author?.spamTag?.status === 'confirmed-spam';
 
-const isHidden = (
-	author: { id?: string; spamTag?: { status?: string } } | null,
-	flaggedUserIds?: Set<string>,
-) => isAuthorSpam(author) || isAuthorFlagged(author, flaggedUserIds);
+const isAuthorFlagged = (author: AuthorWithModeration) =>
+	(author?.communityModerationReports?.length ?? 0) > 0;
 
-type ReportedUserMapEntry = { reportIds: string[] };
-
-type SanitizeOptions = {
-	flaggedUserIds?: Set<string>;
-	reportedUserMap?: Map<string, ReportedUserMapEntry>;
-};
-
-const getReportIds = (
-	authorId: string | undefined,
-	reportedUserMap?: Map<string, ReportedUserMapEntry>,
-): string[] | undefined => {
-	if (!reportedUserMap || !authorId) return undefined;
-	return reportedUserMap.get(authorId)?.reportIds;
-};
+const isHidden = (author: AuthorWithModeration) => isAuthorSpam(author) || isAuthorFlagged(author);
 
 export default (
-	discussions: any[],
+	discussions: DefinitelyHas<Discussion, 'visibility'>[],
 	activePermissions: any,
 	loginId: string | null,
-	options?: SanitizeOptions,
 ) => {
 	const { canAdmin } = activePermissions;
-	const { flaggedUserIds, reportedUserMap } = options ?? {};
 	const afterVisibility = sanitizeOnVisibility(discussions, activePermissions, loginId);
 
 	return afterVisibility
-		.filter((discussion) => {
-			if (!isHidden(discussion.author, flaggedUserIds)) return true;
-			return canAdmin;
-		})
-		.map((discussion) => {
-			const spam = isAuthorSpam(discussion.author);
-			const flagged = isAuthorFlagged(discussion.author, flaggedUserIds);
-			const reportIds = flagged
-				? getReportIds(discussion.author?.id, reportedUserMap)
-				: undefined;
-
-			const comments = (discussion.thread?.comments ?? [])
-				.filter((comment) => {
-					if (!isHidden(comment.author, flaggedUserIds)) return true;
-					return canAdmin;
-				})
-				.map((comment) => {
-					const commentSpam = isAuthorSpam(comment.author);
-					const commentFlagged = isAuthorFlagged(comment.author, flaggedUserIds);
-					if (!commentSpam && !commentFlagged) return comment;
-					const commentReportIds = commentFlagged
-						? getReportIds(comment.author?.id, reportedUserMap)
-						: undefined;
-					return {
-						...comment,
-						...(commentSpam && { isAuthorSpam: true }),
-						...(commentFlagged && !commentSpam && { isAuthorFlagged: true }),
-						...(commentReportIds && { moderationReportIds: commentReportIds }),
-					};
-				});
-
-			return {
-				...discussion,
-				...(spam && { isAuthorSpam: true }),
-				...(flagged && !spam && { isAuthorFlagged: true }),
-				...(reportIds && { moderationReportIds: reportIds }),
-				thread: {
-					...discussion.thread,
-					comments,
-				},
-			};
-		});
+		.filter((discussion) => !isHidden(discussion.author) || canAdmin)
+		.map((discussion) => ({
+			...discussion,
+			thread: {
+				...discussion.thread,
+				comments: (discussion.thread?.comments ?? []).filter(
+					(comment) => !isHidden(comment.author) || canAdmin,
+				),
+			},
+		}));
 };
diff --git a/server/utils/queryHelpers/pubGet.ts b/server/utils/queryHelpers/pubGet.ts
index f274f1002f..8c63af17a3 100644
--- a/server/utils/queryHelpers/pubGet.ts
+++ b/server/utils/queryHelpers/pubGet.ts
@@ -1,10 +1,6 @@
 import type * as types from 'types';
 import type { InitialData, PubGetOptions, SanitizedPubData } from 'types';
 
-import {
-	getReportedUserIdsForCommunity,
-	getReportedUserMapForCommunity,
-} from 'server/communityModerationReport/queries';
 import { fetchFacetsForScope } from 'server/facets';
 import { Pub } from 'server/models';
 import { expect } from 'utils/assert';
@@ -83,21 +79,15 @@ export const getPubForRequest = async (options: GetPubForRequestOptions) => {
 	const communityId = initialData.communityData.id;
 	const { log, end } = createLogger('getPubForRequest');
 
-	const [pubData, flaggedUserIds, reportedUserMap] = await Promise.all([
-		log('getPub', getPub({ slug, communityId }, pubGetOptions)),
-		log('getReportedUsers', getReportedUserIdsForCommunity(communityId)),
-		log('getReportedUserMap', getReportedUserMapForCommunity(communityId)),
-	]);
+	const pubData = await log(
+		'getPub',
+		getPub({ slug, communityId }, { ...pubGetOptions, communityId }),
+	);
 
 	const sanitized = await log(
 		'sanitizePub',
 		new Promise<null | SanitizedPubData>((resolve) => {
-			resolve(
-				sanitizePub(pubData, initialData, releaseNumber, {
-					flaggedUserIds,
-					reportedUserMap,
-				}),
-			);
+			resolve(sanitizePub(pubData, initialData, releaseNumber));
 		}),
 	);
 
diff --git a/server/utils/queryHelpers/pubOptions.ts b/server/utils/queryHelpers/pubOptions.ts
index 698d79df2b..97e392ff98 100644
--- a/server/utils/queryHelpers/pubOptions.ts
+++ b/server/utils/queryHelpers/pubOptions.ts
@@ -28,12 +28,13 @@ import {
 } from 'server/models';
 
 import { getPubEdgeIncludes } from './pubEdgeOptions';
-import { baseAuthor, baseThread, baseVisibility } from './util';
+import { authorIncludes, baseVisibility, threadIncludes } from './util';
 
 export default (options: PubGetOptions) => {
 	const {
 		isAuth,
 		isPreview,
+		communityId,
 		getCollections,
 		getMembers,
 		getCommunity,
@@ -72,8 +73,8 @@ export default (options: PubGetOptions) => {
 	let collectionPubs: any = [];
 	let community: any = [];
 	let anchors = [{ model: DiscussionAnchor, as: 'anchors' }];
-	let author = baseAuthor;
-	let thread = baseThread;
+	let author = authorIncludes(communityId);
+	let thread = threadIncludes(communityId);
 	if (isPreview) {
 		pubAttributes = [
 			'id',
diff --git a/server/utils/queryHelpers/pubSanitize.ts b/server/utils/queryHelpers/pubSanitize.ts
index bfd0cb183e..c8e812590f 100644
--- a/server/utils/queryHelpers/pubSanitize.ts
+++ b/server/utils/queryHelpers/pubSanitize.ts
@@ -1,4 +1,4 @@
-import type { Discussion, SanitizedPubData } from 'types';
+import type { DefinitelyHas, Discussion, SanitizedPubData } from 'types';
 
 import ensureUserForAttribution from 'utils/ensureUserForAttribution';
 
@@ -20,7 +20,8 @@ const sanitizeHashes = (pubData, activePermissions) => {
 const filterDiscussionsByDraftOrRelease = (discussions: Discussion[], isRelease: boolean) => {
 	const shownVisibilityAccess = isRelease ? 'public' : 'members';
 	return discussions.filter(
-		(discussion) => discussion.visibility?.access === shownVisibilityAccess,
+		(discussion): discussion is DefinitelyHas<Discussion, 'visibility'> =>
+			discussion.visibility?.access === shownVisibilityAccess,
 	);
 };
 
@@ -33,18 +34,10 @@ const getFilteredExports = (pubData, isRelease) => {
 	return exports.filter((exp) => releaseHistoryKeys.has(exp.historyKey));
 };
 
-type ReportedUserMapEntry = { reportIds: string[] };
-
-type SanitizeOptions = {
-	flaggedUserIds?: Set<string>;
-	reportedUserMap?: Map<string, ReportedUserMapEntry>;
-};
-
 export default (
 	pubData,
 	initialData,
 	releaseNumber: number | null = null,
-	options?: SanitizeOptions,
 ): null | SanitizedPubData => {
 	const { loginData, scopeData } = initialData;
 	const { activePermissions } = scopeData;
@@ -98,10 +91,6 @@ export default (
 			filterDiscussionsByDraftOrRelease(pubData.discussions, isRelease),
 			activePermissions,
 			loginData.id,
-			{
-				flaggedUserIds: options?.flaggedUserIds,
-				reportedUserMap: options?.reportedUserMap,
-			},
 		);
 	const reviews =
 		pubData.reviews && sanitizeReviews(pubData.reviews, activePermissions, loginData.id);
diff --git a/server/utils/queryHelpers/reviewGet.ts b/server/utils/queryHelpers/reviewGet.ts
index ba142f59f5..4ddd8f42c0 100644
--- a/server/utils/queryHelpers/reviewGet.ts
+++ b/server/utils/queryHelpers/reviewGet.ts
@@ -1,6 +1,6 @@
 import { Pub, Reviewer, ReviewNew } from 'server/models';
 
-import { baseAuthor, baseThread, baseVisibility } from './util';
+import { authorIncludes, baseVisibility, threadIncludes } from './util';
 
 export default async (pubSlug: string, reviewNumber: number, communityId: string) => {
 	const sanitizedSlug = pubSlug.toLowerCase();
@@ -17,9 +17,9 @@ export default async (pubSlug: string, reviewNumber: number, communityId: string
 			pubId: pubData.id,
 		},
 		include: [
-			...baseAuthor,
+			...authorIncludes(communityId),
 			...baseVisibility,
-			...baseThread,
+			...threadIncludes(communityId),
 			{ model: Reviewer, as: 'reviewers' },
 		],
 	});
diff --git a/server/utils/queryHelpers/util.ts b/server/utils/queryHelpers/util.ts
index 108a8e7288..d9a7e4aa7c 100644
--- a/server/utils/queryHelpers/util.ts
+++ b/server/utils/queryHelpers/util.ts
@@ -1,5 +1,6 @@
 import {
 	Commenter,
+	CommunityModerationReport,
 	includeUserModel,
 	SpamTag,
 	Thread,
@@ -30,7 +31,13 @@ export const ensureSerialized = (item: any) => {
 	return item;
 };
 
-export const sanitizeOnVisibility = (objectsWithVisibility, activePermissions, loginId) => {
+export const sanitizeOnVisibility = <
+	T extends { visibility: { access: string | null; users?: { id: string }[] } },
+>(
+	objectsWithVisibility: T[],
+	activePermissions: any,
+	loginId: string | null,
+) => {
 	const { canView, canAdmin } = activePermissions;
 	return objectsWithVisibility.filter((item) => {
 		if (item.visibility.access === 'public') {
@@ -42,7 +49,7 @@ export const sanitizeOnVisibility = (objectsWithVisibility, activePermissions, l
 		if (item.visibility.access === 'private') {
 			return (
 				canAdmin ||
-				item.visibility.users.find((user) => {
+				item.visibility.users?.find((user) => {
 					return user.id === loginId;
 				})
 			);
@@ -51,13 +58,25 @@ export const sanitizeOnVisibility = (objectsWithVisibility, activePermissions, l
 	});
 };
 
-const authorWithSpamTag = () => ({
+const authorWithModeration = (communityId?: string) => ({
 	...includeUserModel({ as: 'author' }),
-	include: [{ model: SpamTag, as: 'spamTag' }],
+	include: [
+		{ model: SpamTag, as: 'spamTag' },
+		...(communityId
+			? [
+					{
+						model: CommunityModerationReport,
+						as: 'communityModerationReports',
+						where: { communityId, status: 'active' },
+						required: false,
+					},
+				]
+			: []),
+	],
 });
 
-export const baseAuthor = [authorWithSpamTag()];
-export const baseThread = [
+export const authorIncludes = (communityId?: string) => [authorWithModeration(communityId)];
+export const threadIncludes = (communityId?: string) => [
 	{
 		model: Thread,
 		as: 'thread',
@@ -65,7 +84,7 @@ export const baseThread = [
 			{
 				model: ThreadComment,
 				as: 'comments',
-				include: [authorWithSpamTag(), { model: Commenter, as: 'commenter' }],
+				include: [authorWithModeration(communityId), { model: Commenter, as: 'commenter' }],
 			},
 			{
 				model: ThreadEvent,
diff --git a/server/utils/slack.ts b/server/utils/slack.ts
index 94bd16ae46..aeadbd2a92 100644
--- a/server/utils/slack.ts
+++ b/server/utils/slack.ts
@@ -1,6 +1,4 @@
-import type { ModerationReportReason, SpamStatus, UserSpamTagFields } from 'types';
-
-import fetch from 'node-fetch';
+import type { SpamStatus } from 'types';
 
 import { isDangerousSpamScore } from 'server/spamTag/communityScore';
 import { isProd } from 'utils/environment';
@@ -192,299 +190,3 @@ export const postToSlackAboutNewCommunity = async (opts: NewCommunitySlackOption
 		],
 	});
 };
-
-export const postToSlackAboutSuspiciousUpload = async (
-	userId: string,
-	userEmail: string,
-	userName: string,
-	key: string,
-) => {
-	if (process.env.NODE_ENV === 'test') return;
-	const dashUrl = getSpamDashUrl(userName);
-	await postToSlack({
-		icon_emoji: ':warning:',
-		attachments: [
-			{
-				fallback: `Suspicious upload by ${userName}: ${key}`,
-				pretext: 'Suspicious upload detected (scam keywords in filename)',
-				color: 'warning',
-				fields: [
-					{ title: 'User', value: userName },
-					{ title: 'Object key', value: key },
-				],
-				actions: [
-					{
-						type: 'button',
-						text: 'View in Spam Users Dashboard',
-						url: dashUrl,
-					},
-				],
-			},
-		],
-	});
-};
-
-const getUserProfileUrl = (userSlug: string) => `https://www.pubpub.org/user/${userSlug}`;
-
-const getSpamDashUrl = (userName: string) =>
-	`https://pubpub.org${getSuperAdminTabUrl('spamUsers')}?q=${encodeURIComponent(userName)}`;
-
-const buildReasonText = (reason?: UserSpamTagFields): string => {
-	if (!reason) return '';
-	if (reason.manuallyMarkedBy?.length) {
-		const last = reason.manuallyMarkedBy[reason.manuallyMarkedBy.length - 1];
-		return `Manually marked by ${last.userName}`;
-	}
-	if (reason.suspiciousFiles?.length) return 'Uploading suspicious files';
-	if (reason.suspiciousComments?.length) return 'Posting suspicious comments';
-	if (reason.honeypotTriggers?.length) {
-		const last = reason.honeypotTriggers[reason.honeypotTriggers.length - 1];
-		const parts: string[] = [last.honeypot];
-		if (last.context?.communitySubdomain)
-			parts.push(`community: ${last.context.communitySubdomain}`);
-		if (last.context?.pubSlug) parts.push(`pub: ${last.context.pubSlug}`);
-		return `Honeypot triggered (${parts.join(', ')})`;
-	}
-	return '';
-};
-
-const buildHoneypotContextLine = (reason?: UserSpamTagFields): string | null => {
-	if (!reason?.honeypotTriggers?.length) return null;
-	const last = reason.honeypotTriggers[reason.honeypotTriggers.length - 1];
-	if (!last.context) return null;
-	const parts: string[] = [];
-	if (last.context.communitySubdomain) {
-		const communityUrl = `https://${last.context.communitySubdomain}.pubpub.org`;
-		parts.push(`Community: <${communityUrl}|${last.context.communitySubdomain}>`);
-	}
-	if (last.context.pubSlug && last.context.communitySubdomain) {
-		const pubUrl = `https://${last.context.communitySubdomain}.pubpub.org/pub/${last.context.pubSlug}`;
-		parts.push(`Pub: <${pubUrl}|${last.context.pubSlug}>`);
-	} else if (last.context.pubSlug) {
-		parts.push(`Pub: ${last.context.pubSlug}`);
-	}
-	if (last.context.content) {
-		const truncated =
-			last.context.content.length > 200
-				? last.context.content.slice(0, 200) + '...'
-				: last.context.content;
-		parts.push(`Content: ${truncated}`);
-	}
-	return parts.length > 0 ? parts.join('  |  ') : null;
-};
-
-type UserBanSlackOptions = {
-	userId: string;
-	userName: string;
-	userSlug: string;
-	userAvatar?: string | null;
-	reason?: UserSpamTagFields;
-	actorName?: string;
-};
-
-export const postToSlackAboutUserBan = async (opts: UserBanSlackOptions) => {
-	if (process.env.NODE_ENV === 'test') return;
-	const { userName, userSlug, userAvatar, reason, actorName } = opts;
-	const profileUrl = getUserProfileUrl(userSlug);
-	const dashUrl = getSpamDashUrl(userName);
-	const reasonText = buildReasonText(reason);
-	const byText = actorName ? ` by ${actorName}` : '';
-	const reasonSuffix = reasonText ? ` -- ${reasonText}` : '';
-	const headline = `*<${profileUrl}|${userName}>* banned${byText}${reasonSuffix}`;
-	const fallback = `${userName} banned${byText}${reasonSuffix}`;
-
-	const headerSection: Record<string, any> = {
-		type: 'section',
-		text: { type: 'mrkdwn', text: headline },
-	};
-	if (userAvatar) {
-		headerSection.accessory = {
-			type: 'image',
-			image_url: userAvatar,
-			alt_text: userName,
-		};
-	}
-
-	const blocks: Record<string, any>[] = [headerSection];
-
-	const honeypotLine = buildHoneypotContextLine(reason);
-	if (honeypotLine) {
-		blocks.push({
-			type: 'context',
-			elements: [{ type: 'mrkdwn', text: honeypotLine }],
-		});
-	}
-
-	blocks.push({
-		type: 'actions',
-		elements: [
-			{ type: 'button', text: { type: 'plain_text', text: 'Profile' }, url: profileUrl },
-			{ type: 'button', text: { type: 'plain_text', text: 'Spam Dashboard' }, url: dashUrl },
-		],
-	});
-
-	await postToSlack({
-		icon_emoji: ':no_entry:',
-		text: fallback,
-		attachments: [{ fallback, color: 'danger', blocks }],
-	});
-};
-
-type UserLiftedSlackOptions = {
-	userId: string;
-	userName: string;
-	userSlug: string;
-	actorName?: string;
-};
-
-export const postToSlackAboutUserLifted = async (opts: UserLiftedSlackOptions) => {
-	if (process.env.NODE_ENV === 'test') return;
-	const { userName, userSlug, actorName } = opts;
-	const profileUrl = getUserProfileUrl(userSlug);
-	const byText = actorName ? ` by ${actorName}` : '';
-	const headline = `*<${profileUrl}|${userName}>* restriction lifted${byText}`;
-	const fallback = `${userName} restriction lifted${byText}`;
-	await postToSlack({
-		icon_emoji: ':white_check_mark:',
-		text: fallback,
-		attachments: [
-			{
-				fallback,
-				color: '#5cb85c',
-				blocks: [
-					{ type: 'section', text: { type: 'mrkdwn', text: headline } },
-					{
-						type: 'actions',
-						elements: [
-							{
-								type: 'button',
-								text: { type: 'plain_text', text: 'Profile' },
-								url: profileUrl,
-							},
-						],
-					},
-				],
-			},
-		],
-	});
-};
-
-type NewSpamTagSlackOptions = {
-	userId: string;
-	userName: string;
-	userSlug: string;
-	spamScore: number | null;
-};
-
-export const postToSlackAboutNewUserSpamTag = async (opts: NewSpamTagSlackOptions) => {
-	if (process.env.NODE_ENV === 'test') return;
-	const { userName, userSlug, spamScore } = opts;
-	const profileUrl = getUserProfileUrl(userSlug);
-	const dashUrl = getSpamDashUrl(userName);
-	const scorePart = spamScore != null ? ` (score: ${spamScore})` : '';
-	const headline = `New spam tag for *<${profileUrl}|${userName}>*${scorePart}`;
-	const fallback = `New spam tag: ${userName}${scorePart}`;
-	await postToSlack({
-		icon_emoji: ':mag:',
-		text: fallback,
-		attachments: [
-			{
-				fallback,
-				color: '#f0ad4e',
-				blocks: [
-					{ type: 'section', text: { type: 'mrkdwn', text: headline } },
-					{
-						type: 'actions',
-						elements: [
-							{
-								type: 'button',
-								text: { type: 'plain_text', text: 'Profile' },
-								url: profileUrl,
-							},
-							{
-								type: 'button',
-								text: { type: 'plain_text', text: 'Review in Dashboard' },
-								url: dashUrl,
-							},
-						],
-					},
-				],
-			},
-		],
-	});
-};
-
-type CommunityFlagSlackOptions = {
-	userId: string;
-	flaggedById: string;
-	communityId: string;
-	reason: ModerationReportReason;
-	reasonText?: string | null;
-	sourceDiscussionId?: string | null;
-};
-
-export const postToSlackAboutCommunityFlag = async (opts: CommunityFlagSlackOptions) => {
-	if (process.env.NODE_ENV === 'test') return;
-	const { User, Community, Discussion, Pub } = await import('server/models');
-	const [user, flagger, community, discussion] = await Promise.all([
-		User.findByPk(opts.userId, { attributes: ['fullName', 'slug'] }),
-		User.findByPk(opts.flaggedById, { attributes: ['fullName', 'slug'] }),
-		Community.findByPk(opts.communityId, { attributes: ['subdomain'] }),
-		opts.sourceDiscussionId
-			? Discussion.findByPk(opts.sourceDiscussionId, {
-					attributes: ['id', 'title', 'pubId'],
-					include: [{ model: Pub, as: 'pub', attributes: ['slug'] }],
-				})
-			: null,
-	]);
-	const userName = user?.fullName ?? 'Unknown user';
-	const userSlug = user?.slug ?? '';
-	const flaggerName = flagger?.fullName ?? 'Unknown admin';
-	const subdomain = community?.subdomain ?? 'unknown';
-	const profileUrl = getUserProfileUrl(userSlug);
-	const dashUrl = getSpamDashUrl(userName);
-
-	const reasonLabel = opts.reason.replace(/-/g, ' ');
-	const extraReason = opts.reasonText ? `: ${opts.reasonText}` : '';
-	let discussionLink = '';
-	if (discussion) {
-		const pub = (discussion as any).pub;
-		if (pub?.slug) {
-			discussionLink = `\nDiscussion: https://${subdomain}.pubpub.org/pub/${pub.slug}`;
-		}
-	}
-
-	const headline =
-		`*<${profileUrl}|${userName}>* flagged by ${flaggerName} in *${subdomain}*` +
-		`\nReason: ${reasonLabel}${extraReason}${discussionLink}`;
-	const fallback = `${userName} flagged by ${flaggerName} in ${subdomain} for ${reasonLabel}`;
-
-	await postToSlack({
-		icon_emoji: ':triangular_flag_on_post:',
-		text: fallback,
-		attachments: [
-			{
-				fallback,
-				color: '#e67e22',
-				blocks: [
-					{ type: 'section', text: { type: 'mrkdwn', text: headline } },
-					{
-						type: 'actions',
-						elements: [
-							{
-								type: 'button',
-								text: { type: 'plain_text', text: 'User Profile' },
-								url: profileUrl,
-							},
-							{
-								type: 'button',
-								text: { type: 'plain_text', text: 'Spam Dashboard' },
-								url: dashUrl,
-							},
-						],
-					},
-				],
-			},
-		],
-	});
-};
diff --git a/types/pub.ts b/types/pub.ts
index 601c94bb7c..56e031a0ab 100644
--- a/types/pub.ts
+++ b/types/pub.ts
@@ -17,7 +17,7 @@ import type { SerializedModel } from './serializedModel';
 import type { Submission, SubmissionStatus } from './submission';
 import type { Thread, ThreadComment } from './thread';
 import type { UserSubscription } from './userSubscription';
-import type { DefinitelyHas, Maybe } from './util';
+import type { DefinitelyHas, Maybe, Prettify } from './util';
 
 export type Draft = SerializedModel<DraftModel>;
 export type Doc = SerializedModel<DocModel>;
@@ -48,12 +48,15 @@ export type PubDocInfo = {
 	};
 };
 
-export type PubPageDiscussion = DefinitelyHas<Discussion, 'anchors'> & {
-	isAuthorSpam?: boolean;
-	thread: Thread & {
-		comments: (DefinitelyHas<ThreadComment, 'author'> & { isAuthorSpam?: boolean })[];
-	};
-};
+export type PubPageThreadComment = DefinitelyHas<ThreadComment, 'author'>;
+
+export type PubPageDiscussion = Prettify<
+	DefinitelyHas<Omit<Discussion, 'thread'>, 'anchors'> & {
+		thread: Prettify<{
+			[K in keyof Thread]: K extends 'comments' ? PubPageThreadComment[] : Thread[K];
+		}>;
+	}
+>;
 
 export type PubPageData = DefinitelyHas<Omit<Pub, 'discussions'>, 'collectionPubs'> &
 	PubDocInfo & {
diff --git a/types/pubQuery.ts b/types/pubQuery.ts
index 3ed7631d6a..2ab9e0befb 100644
--- a/types/pubQuery.ts
+++ b/types/pubQuery.ts
@@ -36,6 +36,7 @@ export type PubEdgeIncludesOptions = {
 export type PubGetOptions = {
 	isAuth?: boolean;
 	isPreview?: boolean;
+	communityId?: string;
 	// get collection pubs for pub
 	getCollections?:
 		| boolean
diff --git a/types/spam.ts b/types/spam.ts
index a280703d80..8e1012e646 100644
--- a/types/spam.ts
+++ b/types/spam.ts
@@ -54,9 +54,8 @@ export type SpamUserCommunityReport = {
 	reasonText: string | null;
 	status: string;
 	createdAt: string;
-	flaggedByName: string | null;
-	sourceDiscussionTitle: string | null;
-	sourceDiscussionUrl: string | null;
+	actorName: string | null;
+	sourceCommentText: string | null;
 };
 
 export type SpamUserQuery = {
@@ -129,16 +128,16 @@ export type SerializedCommunityModerationReport = {
 	id: string;
 	userId: string;
 	communityId: string;
-	flaggedById: string;
+	actorId: string;
 	reason: ModerationReportReason;
 	reasonText: string | null;
-	sourceDiscussionId: string | null;
+	sourceThreadCommentId: string | null;
 	spamTagId: string | null;
 	status: ModerationReportStatus;
 	createdAt: string;
 	updatedAt: string;
 	user?: { fullName: string; slug: string; email?: string };
-	flaggedBy?: { fullName: string; slug: string };
+	actor?: { fullName: string; slug: string };
 	community?: { subdomain: string };
 };
 

From 92dccd603ddf4889e5d0d4cc4603bb253272cc66 Mon Sep 17 00:00:00 2001
From: "Thomas F. K. Jorna" <hello@tefkah.com>
Date: Thu, 5 Mar 2026 18:01:56 +0100
Subject: [PATCH 06/10] fix: prettier

---
 .../Discussion/ThreadComment.tsx              |   9 +-
 .../UserSpam/UserSpamEntry.tsx                | 113 +++---
 .../UserSpam/userSpamEntry.scss               | 381 ++++++++++--------
 server/spamTag/api.ts                         |   4 +-
 server/spamTag/userDashboard.ts               |  31 +-
 server/thread/model.ts                        |  18 +-
 server/threadComment/model.ts                 |   5 +-
 .../utils/queryHelpers/discussionsSanitize.ts |  10 +-
 types/spam.ts                                 |   4 +
 9 files changed, 344 insertions(+), 231 deletions(-)

diff --git a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
index 7311487ccd..6f021b945e 100644
--- a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
+++ b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
@@ -185,9 +185,12 @@ const ThreadComment = (props: Props) => {
 	};
 	const commenterName = discussionData.commenter?.name ?? threadCommentData.commenter?.name;
 	const isAuthorSpam = threadCommentData.author?.spamTag?.status === 'confirmed-spam';
-	const isAuthorFlagged = threadCommentData.author?.communityModerationReports?.some(
-		(report) => report.status === 'active',
-	);
+	const isAuthorCleared = threadCommentData.author?.spamTag?.status === 'confirmed-not-spam';
+	const isAuthorFlagged =
+		!isAuthorCleared &&
+		threadCommentData.author?.communityModerationReports?.some(
+			(report) => report.status === 'active',
+		);
 	const showFlagButton =
 		!isPreview &&
 		canAdminCommunity &&
diff --git a/client/containers/SuperAdminDashboard/UserSpam/UserSpamEntry.tsx b/client/containers/SuperAdminDashboard/UserSpam/UserSpamEntry.tsx
index fa6683b5f8..c8d7bbc419 100644
--- a/client/containers/SuperAdminDashboard/UserSpam/UserSpamEntry.tsx
+++ b/client/containers/SuperAdminDashboard/UserSpam/UserSpamEntry.tsx
@@ -379,56 +379,75 @@ const UserSpamEntry = (props: Props) => {
 		if (!communityReports?.length) return null;
 		return (
 			<div className="community-reports">
-				{communityReports.map((report, index) => (
-					<Popover
-						// biome-ignore lint/suspicious/noArrayIndexKey: stable list
-						key={index}
-						aria-label="Flag details"
-						placement="bottom-start"
-						content={
-							<div className="flag-detail-popover">
-								<div className="flag-detail-row">
-									<span className="flag-detail-label">Community</span>
-									<span>{report.communitySubdomain}</span>
-								</div>
-								<div className="flag-detail-row">
-									<span className="flag-detail-label">Reason</span>
-									<span>{report.reason}</span>
-								</div>
-								{report.reasonText && (
-									<div className="flag-detail-row">
-										<span className="flag-detail-label">Note</span>
-										<span className="flag-detail-note">
-											{report.reasonText}
-										</span>
-									</div>
-								)}
-								{report.actorName && (
-									<div className="flag-detail-row">
-										<span className="flag-detail-label">Flagged by</span>
-										<span>{report.actorName}</span>
-									</div>
-								)}
-								{report.sourceCommentText && (
-									<div className="flag-detail-row">
-										<span className="flag-detail-label">Source comment</span>
-										<span className="flag-detail-note">
-											{report.sourceCommentText}
+				{communityReports.map((report, index) => {
+					return (
+						<Popover
+							aria-label="Flag details"
+							placement="bottom"
+							content={
+								<div className="flag-detail-popover">
+									<div className="flag-detail-header">
+										<Tag intent="warning" minimal>
+											{report.reason}
+										</Tag>
+										<span className="flag-detail-meta">
+											{report.actorName && (
+												<>
+													reported by{' '}
+													<a
+														href={`/user/${report.actorSlug}`}
+														target="_blank"
+														rel="noopener noreferrer"
+													>
+														{report.actorName}
+													</a>
+												</>
+											)}{' '}
+											{formatDate(report.createdAt)}
 										</span>
 									</div>
-								)}
-								<div className="flag-detail-row">
-									<span className="flag-detail-label">Date</span>
-									<span>{formatDate(report.createdAt)}</span>
+									{report.reasonText && (
+										<div className="flag-detail-note">{report.reasonText}</div>
+									)}
+									{report.sourceCommentText && (
+										<div className="flag-detail-comment">
+											<span className="flag-detail-comment-label">
+												Flagged comment
+											</span>
+											<blockquote>
+												{report.sourceCommentText.length > 300
+													? `${report.sourceCommentText.slice(0, 300)}...`
+													: report.sourceCommentText}
+											</blockquote>
+											<p className="flag-detail-comment-context">
+												On{' '}
+												<a
+													href={`https://${report.communitySubdomain}.pubpub.org/pub/${report.sourceCommentPubSlug}`}
+													target="_blank"
+													rel="noopener noreferrer"
+												>
+													{report.sourceCommentPubTitle}
+												</a>{' '}
+												in{' '}
+												<a
+													href={`https://${report.communitySubdomain}`}
+													target="_blank"
+													rel="noopener noreferrer"
+												>
+													{report.communityTitle}
+												</a>
+											</p>
+										</div>
+									)}
 								</div>
-							</div>
-						}
-					>
-						<Tag intent="warning" minimal icon="flag" interactive>
-							{report.communitySubdomain}: {report.reason}
-						</Tag>
-					</Popover>
-				))}
+							}
+						>
+							<Button minimal small icon="flag" intent="warning">
+								{report.communitySubdomain}: {report.reason}
+							</Button>
+						</Popover>
+					);
+				})}
 			</div>
 		);
 	};
diff --git a/client/containers/SuperAdminDashboard/UserSpam/userSpamEntry.scss b/client/containers/SuperAdminDashboard/UserSpam/userSpamEntry.scss
index 7898517c7d..819190f881 100644
--- a/client/containers/SuperAdminDashboard/UserSpam/userSpamEntry.scss
+++ b/client/containers/SuperAdminDashboard/UserSpam/userSpamEntry.scss
@@ -1,181 +1,218 @@
 .user-spam-entry-component {
-	border-radius: 2px;
-	border: 1px solid #eee;
-	padding: 10px;
-	overflow: hidden;
-
-	& > *:not(:last-child) {
-		margin-bottom: 6px;
-	}
-
-	.title {
-		font-size: 16px;
-		font-weight: 500;
-		display: flex;
-		flex-wrap: wrap;
-		gap: 8px;
-		align-items: baseline;
-
-		.name {
-			font-weight: 600;
-		}
-		.email {
-			color: #666;
-			font-size: 14px;
-		}
-		.slug {
-			color: #888;
-			font-size: 14px;
-		}
-	}
-
-	.fields-report {
-		details > summary {
-			user-select: none;
-		}
-		pre {
-			background: #eee;
-			padding: 5px;
-		}
-	}
-
-	.details {
-		display: flex;
-		justify-content: space-between;
-		align-items: end;
-		flex-wrap: wrap;
-		gap: 6px;
-
-		> .tags {
-			display: flex;
-			flex-wrap: wrap;
-			gap: 4px;
-			min-width: 0;
-			flex: 1;
-		}
-
-		> .actions {
-			flex-shrink: 0;
-		}
-	}
-
-	.affiliation {
-		display: flex;
-		flex-wrap: wrap;
-		align-items: center;
-		gap: 2px;
-		font-size: 13px;
-		color: #555;
-
-		.affiliation-part {
-			display: inline-flex;
-			align-items: center;
-
-			a {
-				color: inherit;
-				text-decoration: underline;
-				text-decoration-color: #ccc;
-				&:hover {
-					text-decoration-color: #999;
-				}
-			}
-		}
-
-		.inline-discussions-btn {
-			font-size: 13px;
-			min-height: 0;
-			padding: 0 2px;
-			text-decoration: underline;
-			text-decoration-color: #ccc;
-			&:hover {
-				text-decoration-color: #999;
-			}
-		}
-	}
-
-	.community-reports {
-		display: flex;
-		flex-wrap: wrap;
-		gap: 4px;
-	}
+  border-radius: 2px;
+  border: 1px solid #eee;
+  padding: 10px;
+  overflow: hidden;
+
+  & > *:not(:last-child) {
+    margin-bottom: 6px;
+  }
+
+  .title {
+    font-size: 16px;
+    font-weight: 500;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    align-items: baseline;
+
+    .name {
+      font-weight: 600;
+    }
+    .email {
+      color: #666;
+      font-size: 14px;
+    }
+    .slug {
+      color: #888;
+      font-size: 14px;
+    }
+  }
+
+  .fields-report {
+    details > summary {
+      user-select: none;
+    }
+    pre {
+      background: #eee;
+      padding: 5px;
+    }
+  }
+
+  .details {
+    display: flex;
+    justify-content: space-between;
+    align-items: end;
+    flex-wrap: wrap;
+    gap: 6px;
+
+    > .tags {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 4px;
+      min-width: 0;
+      flex: 1;
+    }
+
+    > .actions {
+      flex-shrink: 0;
+    }
+  }
+
+  .affiliation {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 2px;
+    font-size: 13px;
+    color: #555;
+
+    .affiliation-part {
+      display: inline-flex;
+      align-items: center;
+
+      a {
+        color: inherit;
+        text-decoration: underline;
+        text-decoration-color: #ccc;
+        &:hover {
+          text-decoration-color: #999;
+        }
+      }
+    }
+
+    .inline-discussions-btn {
+      font-size: 13px;
+      min-height: 0;
+      padding: 0 2px;
+      text-decoration: underline;
+      text-decoration-color: #ccc;
+      &:hover {
+        text-decoration-color: #999;
+      }
+    }
+  }
+
+  .community-reports {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 4px;
+  }
 }
 
 // portal-rendered popover content (outside component tree)
 .discussions-popover-content {
-	padding: 8px 12px;
-	background: white;
-	border-radius: 4px;
-	box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
-	min-width: 320px;
-	max-width: 500px;
-
-	.discussion-item {
-		padding: 6px 10px;
-		border-left: 2px solid #ddd;
-		margin: 4px 0;
-
-		.discussion-header {
-			display: flex;
-			align-items: center;
-			gap: 6px;
-			font-size: 13px;
-
-			a {
-				font-weight: 500;
-			}
-		}
-
-		.discussion-date {
-			color: #888;
-			font-size: 12px;
-		}
-
-		.discussion-preview {
-			font-size: 12px;
-			color: #555;
-			margin-top: 3px;
-			white-space: pre-wrap;
-			max-height: 60px;
-			overflow: hidden;
-		}
-	}
-
-	.no-discussions {
-		padding: 6px 10px;
-		color: #888;
-		font-size: 13px;
-		font-style: italic;
-	}
+  padding: 8px 12px;
+  background: white;
+  border-radius: 4px;
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
+  min-width: 320px;
+  max-width: 500px;
+
+  .discussion-item {
+    padding: 6px 10px;
+    border-left: 2px solid #ddd;
+    margin: 4px 0;
+
+    .discussion-header {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      font-size: 13px;
+
+      a {
+        font-weight: 500;
+      }
+    }
+
+    .discussion-date {
+      color: #888;
+      font-size: 12px;
+    }
+
+    .discussion-preview {
+      font-size: 12px;
+      color: #555;
+      margin-top: 3px;
+      white-space: pre-wrap;
+      max-height: 60px;
+      overflow: hidden;
+    }
+  }
+
+  .no-discussions {
+    padding: 6px 10px;
+    color: #888;
+    font-size: 13px;
+    font-style: italic;
+  }
 }
 
 .flag-detail-popover {
-	padding: 10px 12px;
-	background: white;
-	border-radius: 4px;
-	box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
-	min-width: 220px;
-	max-width: 360px;
-	display: flex;
-	flex-direction: column;
-	gap: 6px;
-
-	.flag-detail-row {
-		display: flex;
-		gap: 8px;
-		font-size: 13px;
-		line-height: 1.4;
-
-		.flag-detail-label {
-			font-weight: 600;
-			color: #555;
-			min-width: 70px;
-			flex-shrink: 0;
-		}
-
-		.flag-detail-note {
-			color: #333;
-			white-space: pre-wrap;
-			word-break: break-word;
-		}
-	}
+  padding: 10px 14px;
+  background: white;
+  border-radius: 4px;
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15);
+  min-width: 240px;
+  max-width: 400px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+
+  .flag-detail-header {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-size: 13px;
+
+    .flag-detail-meta {
+      color: #888;
+      font-size: 12px;
+      margin-left: auto;
+      white-space: nowrap;
+    }
+  }
+
+  .flag-detail-note {
+    font-size: 13px;
+    color: #444;
+    line-height: 1.4;
+    white-space: pre-wrap;
+    word-break: break-word;
+  }
+
+  .flag-detail-comment-context {
+    font-size: 12px;
+    color: #888;
+    margin-top: 4px;
+    white-space: pre-wrap;
+    word-break: break-word;
+  }
+
+  .flag-detail-comment {
+    border-top: 1px solid #eee;
+    padding-top: 8px;
+
+    .flag-detail-comment-label {
+      display: block;
+      font-size: 11px;
+      font-weight: 600;
+      text-transform: uppercase;
+      letter-spacing: 0.03em;
+      color: #888;
+      margin-bottom: 4px;
+    }
+
+    blockquote {
+      margin: 0;
+      padding: 6px 10px;
+      border-left: 3px solid #d4a017;
+      background: #faf8f0;
+      font-size: 12px;
+      line-height: 1.5;
+      color: #333;
+      white-space: pre-wrap;
+      word-break: break-word;
+    }
+  }
 }
diff --git a/server/spamTag/api.ts b/server/spamTag/api.ts
index dea16f681b..71a23402cf 100644
--- a/server/spamTag/api.ts
+++ b/server/spamTag/api.ts
@@ -65,8 +65,8 @@ router.put(
 		// notify community admins who filed reports about this user
 		const resolution =
 			status === 'confirmed-spam'
-				? 'The user has been confirmed as spam and banned.'
-				: 'The user has been reviewed and confirmed as not spam.';
+				? 'The user has been confirmed to violate our Terms of Service and Acceptable Use Policy, and has been banned.'
+				: 'The user has been reviewed and confirmed as not violating our Terms of Service and Acceptable Use Policy. They have not been banned, and their discussions are now visible again.';
 		notifyReportersOfCommunityFlagResolution(userId, user, resolution).catch((err) =>
 			console.error('Failed to notify reporters of resolution', err),
 		);
diff --git a/server/spamTag/userDashboard.ts b/server/spamTag/userDashboard.ts
index c545fa8bb1..0df0c681cd 100644
--- a/server/spamTag/userDashboard.ts
+++ b/server/spamTag/userDashboard.ts
@@ -264,7 +264,7 @@ const getCommunityReportsForUserIds = async (
 		where: { userId: { [Op.in]: userIds }, status: 'active' },
 		attributes: ['userId', 'reason', 'reasonText', 'status', 'createdAt'],
 		include: [
-			{ model: Community, as: 'community', attributes: ['subdomain'] },
+			{ model: Community, as: 'community', attributes: ['subdomain', 'title'] },
 			{
 				model: User,
 				as: 'actor',
@@ -274,6 +274,27 @@ const getCommunityReportsForUserIds = async (
 				model: ThreadComment,
 				as: 'sourceThreadComment',
 				attributes: ['id', 'text'],
+				include: [
+					{
+						model: Thread,
+						as: 'thread',
+						attributes: ['id'],
+						include: [
+							{
+								model: Discussion,
+								as: 'discussion',
+								attributes: ['id'],
+								include: [
+									{
+										model: Pub,
+										as: 'pub',
+										attributes: ['slug', 'title'],
+									},
+								],
+							},
+						],
+					},
+				],
 			},
 		],
 	});
@@ -283,13 +304,17 @@ const getCommunityReportsForUserIds = async (
 		const raw = r as any;
 		const commentText = raw['sourceThreadComment.text'] as string | undefined;
 		const entry: types.SpamUserCommunityReport = {
+			communityTitle: raw['community.title'] ?? null,
 			communitySubdomain: raw['community.subdomain'] ?? 'unknown',
 			reason: raw.reason,
 			reasonText: raw.reasonText ?? null,
 			status: raw.status,
 			createdAt: raw.createdAt,
 			actorName: raw['actor.fullName'] ?? null,
+			actorSlug: raw['actor.slug'] ?? null,
 			sourceCommentText: commentText || null,
+			sourceCommentPubSlug: raw['sourceThreadComment.thread.discussion.pub.slug'] ?? null,
+			sourceCommentPubTitle: raw['sourceThreadComment.thread.discussion.pub.title'] ?? null,
 		};
 		const existing = map.get(raw.userId);
 		if (existing) {
@@ -301,6 +326,10 @@ const getCommunityReportsForUserIds = async (
 	return map;
 };
 
+/**
+ * for searching by community in the user dashboard
+ * not really the same as what we usually call "CommunityAffiliation", which only looks at membership and pub attribution
+ */
 const getAffiliationForUserIds = async (
 	userIds: string[],
 ): Promise<Map<string, types.SpamUserAffiliation>> => {
diff --git a/server/thread/model.ts b/server/thread/model.ts
index f921e82e40..a0f7e8ae74 100644
--- a/server/thread/model.ts
+++ b/server/thread/model.ts
@@ -2,9 +2,18 @@ import type { CreationOptional, InferAttributes, InferCreationAttributes } from
 
 import type { SerializedModel } from 'types';
 
-import { Column, DataType, Default, HasMany, Model, PrimaryKey, Table } from 'sequelize-typescript';
-
-import { ThreadComment, ThreadEvent } from '../models';
+import {
+	Column,
+	DataType,
+	Default,
+	HasMany,
+	HasOne,
+	Model,
+	PrimaryKey,
+	Table,
+} from 'sequelize-typescript';
+
+import { Discussion, ThreadComment, ThreadEvent } from '../models';
 
 @Table
 export class Thread extends Model<InferAttributes<Thread>, InferCreationAttributes<Thread>> {
@@ -23,4 +32,7 @@ export class Thread extends Model<InferAttributes<Thread>, InferCreationAttribut
 
 	@HasMany(() => ThreadEvent, { onDelete: 'CASCADE', as: 'events', foreignKey: 'threadId' })
 	declare events?: ThreadEvent[];
+
+	@HasOne(() => Discussion, { onDelete: 'CASCADE', as: 'discussion', foreignKey: 'threadId' })
+	declare discussion?: Discussion;
 }
diff --git a/server/threadComment/model.ts b/server/threadComment/model.ts
index f4a9d41c22..d1aa26e43e 100644
--- a/server/threadComment/model.ts
+++ b/server/threadComment/model.ts
@@ -14,7 +14,7 @@ import {
 	Table,
 } from 'sequelize-typescript';
 
-import { Commenter, User } from '../models';
+import { Commenter, Thread, User } from '../models';
 
 @Table
 export class ThreadComment extends Model<
@@ -52,4 +52,7 @@ export class ThreadComment extends Model<
 
 	@BelongsTo(() => Commenter, { onDelete: 'CASCADE', as: 'commenter', foreignKey: 'commenterId' })
 	declare commenter?: Commenter;
+
+	@BelongsTo(() => Thread, { as: 'thread', foreignKey: 'threadId' })
+	declare thread?: Thread;
 }
diff --git a/server/utils/queryHelpers/discussionsSanitize.ts b/server/utils/queryHelpers/discussionsSanitize.ts
index ddb34b2537..a719ced0e1 100644
--- a/server/utils/queryHelpers/discussionsSanitize.ts
+++ b/server/utils/queryHelpers/discussionsSanitize.ts
@@ -10,12 +10,18 @@ type AuthorWithModeration =
 	| null
 	| undefined;
 
-const isAuthorSpam = (author: AuthorWithModeration) => author?.spamTag?.status === 'confirmed-spam';
+const isAuthorSpam = (author: AuthorWithModeration) =>
+	author?.spamTag?.status === 'confirmed-spam';
+
+const isAuthorCleared = (author: AuthorWithModeration) =>
+	author?.spamTag?.status === 'confirmed-not-spam';
 
 const isAuthorFlagged = (author: AuthorWithModeration) =>
 	(author?.communityModerationReports?.length ?? 0) > 0;
 
-const isHidden = (author: AuthorWithModeration) => isAuthorSpam(author) || isAuthorFlagged(author);
+// cleared users should remain visible even if they have active community reports
+const isHidden = (author: AuthorWithModeration) =>
+	isAuthorSpam(author) || (isAuthorFlagged(author) && !isAuthorCleared(author));
 
 export default (
 	discussions: DefinitelyHas<Discussion, 'visibility'>[],
diff --git a/types/spam.ts b/types/spam.ts
index 8e1012e646..be509aa4e7 100644
--- a/types/spam.ts
+++ b/types/spam.ts
@@ -50,12 +50,16 @@ export type SpamUserAffiliation = {
 
 export type SpamUserCommunityReport = {
 	communitySubdomain: string;
+	communityTitle: string | null;
 	reason: string;
 	reasonText: string | null;
 	status: string;
 	createdAt: string;
 	actorName: string | null;
+	actorSlug: string | null;
 	sourceCommentText: string | null;
+	sourceCommentPubSlug: string | null;
+	sourceCommentPubTitle: string | null;
 };
 
 export type SpamUserQuery = {

From c0404a5b8ffad65f17205e70ffc8b2ac4d195dcb Mon Sep 17 00:00:00 2001
From: "Thomas F. K. Jorna" <hello@tefkah.com>
Date: Thu, 5 Mar 2026 18:02:11 +0100
Subject: [PATCH 07/10] chore: fmt

---
 server/utils/queryHelpers/discussionsSanitize.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/utils/queryHelpers/discussionsSanitize.ts b/server/utils/queryHelpers/discussionsSanitize.ts
index a719ced0e1..f62a468d88 100644
--- a/server/utils/queryHelpers/discussionsSanitize.ts
+++ b/server/utils/queryHelpers/discussionsSanitize.ts
@@ -10,8 +10,7 @@ type AuthorWithModeration =
 	| null
 	| undefined;
 
-const isAuthorSpam = (author: AuthorWithModeration) =>
-	author?.spamTag?.status === 'confirmed-spam';
+const isAuthorSpam = (author: AuthorWithModeration) => author?.spamTag?.status === 'confirmed-spam';
 
 const isAuthorCleared = (author: AuthorWithModeration) =>
 	author?.spamTag?.status === 'confirmed-not-spam';

From 500c6cd761d2b555227b078d4f0c07a5438bb217 Mon Sep 17 00:00:00 2001
From: "Thomas F. K. Jorna" <hello@tefkah.com>
Date: Mon, 9 Mar 2026 17:33:51 +0100
Subject: [PATCH 08/10] feat: add activityitems and list of reported members

---
 .../DashboardMembers/DashboardMembers.tsx     | 104 ++++++++++++++++--
 .../DashboardMembers/dashboardMembers.scss    |  29 +++++
 .../Discussion/ThreadComment.tsx              |   9 +-
 client/utils/activity/renderers/index.ts      |   8 +-
 client/utils/activity/renderers/member.tsx    |  36 +++++-
 server/activityItem/__tests__/fetch.test.ts   |  29 +++++
 server/activityItem/fetch.ts                  |   8 +-
 server/activityItem/queries.ts                |  21 ++++
 .../__tests__/api.test.ts                     |  29 +++++
 server/communityModerationReport/api.ts       |  69 +++++-------
 server/communityModerationReport/hooks.ts     |  13 +++
 server/communityModerationReport/model.ts     |   4 +-
 server/communityModerationReport/queries.ts   |  15 +++
 server/discussion/api.ts                      |   2 -
 server/discussion/permissions.ts              |   6 +-
 server/hooks.ts                               |   1 +
 server/middleware/communityModerationGuard.ts |  51 +++++++++
 server/routes/dashboardActivity.tsx           |   2 +
 server/routes/dashboardMembers.tsx            |  13 ++-
 server/server.ts                              |   2 +
 .../utils/queryHelpers/discussionsSanitize.ts |   7 +-
 server/utils/rateLimiter.ts                   |  44 ++++++++
 types/activity/communityModerationReport.ts   |  13 +++
 types/activity/index.ts                       |   3 +
 types/spam.ts                                 |   2 +-
 utils/activity/titles/community.ts            |   2 +
 26 files changed, 448 insertions(+), 74 deletions(-)
 create mode 100644 server/communityModerationReport/hooks.ts
 create mode 100644 server/middleware/communityModerationGuard.ts
 create mode 100644 server/utils/rateLimiter.ts
 create mode 100644 types/activity/communityModerationReport.ts

diff --git a/client/containers/DashboardMembers/DashboardMembers.tsx b/client/containers/DashboardMembers/DashboardMembers.tsx
index 1d2186d297..adb09a7d57 100644
--- a/client/containers/DashboardMembers/DashboardMembers.tsx
+++ b/client/containers/DashboardMembers/DashboardMembers.tsx
@@ -1,9 +1,11 @@
-import React from 'react';
+import React, { useCallback, useState } from 'react';
 
-import { Button, ControlGroup, Intent } from '@blueprintjs/core';
+import { Button, ControlGroup, Intent, Tab, Tabs } from '@blueprintjs/core';
 
+import { apiFetch } from 'client/utils/apiFetch';
 import { useMembersState } from 'client/utils/members/useMembers';
 import {
+	Avatar,
 	DashboardFrame,
 	InheritedMembersBlock,
 	MemberRow,
@@ -14,23 +16,88 @@ import { usePageContext } from 'utils/hooks';
 
 import './dashboardMembers.scss';
 
+type BannedUserReport = {
+	id: string;
+	reason: string;
+	reasonText?: string | null;
+	createdAt: string;
+	user: { id: string; fullName: string; slug: string; avatar?: string | null; initials: string };
+	actor: { id: string; fullName: string; slug: string };
+};
+
 type Props = {
 	membersData: any;
+	bannedUsersData: BannedUserReport[];
+};
+
+const BannedUsersTab = (props: { reports: BannedUserReport[] }) => {
+	const [reports, setReports] = useState(props.reports);
+	const [retractingIds, setRetractingIds] = useState<Set<string>>(new Set());
+
+	const handleUnban = useCallback(async (reportId: string) => {
+		setRetractingIds((prev) => new Set(prev).add(reportId));
+		try {
+			await apiFetch.put(`/api/communityModerationReports/${reportId}`, {
+				status: 'retracted',
+			});
+			setReports((prev) => prev.filter((r) => r.id !== reportId));
+		} finally {
+			setRetractingIds((prev) => {
+				const next = new Set(prev);
+				next.delete(reportId);
+				return next;
+			});
+		}
+	}, []);
+
+	if (!reports.length) {
+		return <i>No banned users.</i>;
+	}
+
+	return (
+		<div className="banned-users-list">
+			{reports.map((report) => (
+				<div key={report.id} className="banned-user-row">
+					<Avatar
+						width={30}
+						initials={report.user.initials}
+						avatar={report.user.avatar}
+					/>
+					<div className="banned-user-info">
+						<span className="banned-user-name">{report.user.fullName}</span>
+						<span className="banned-user-detail">
+							Flagged by {report.actor.fullName}
+							{report.reason ? ` (${report.reason})` : ''}
+						</span>
+					</div>
+					<Button
+						small
+						intent={Intent.WARNING}
+						text="Unban"
+						loading={retractingIds.has(report.id)}
+						onClick={() => handleUnban(report.id)}
+					/>
+				</div>
+			))}
+		</div>
+	);
 };
 
 const DashboardMembers = (props: Props) => {
-	const { membersData } = props;
+	const { membersData, bannedUsersData } = props;
 	const { membersByType, addMember, updateMember, removeMember } = useMembersState({
 		initialMembers: membersData.members,
 	});
 	const { scopeData } = usePageContext();
 	const {
 		elements: { activeTargetType, activeTargetName },
-		activePermissions: { canManage },
+		activePermissions: { canManage, canAdminCommunity },
 	} = scopeData;
 
 	const localMembers = membersByType[activeTargetType];
 	const showLocalEmptyState = !localMembers.length && !membersData.invitations.length;
+	const showBannedTab =
+		activeTargetType === 'community' && canAdminCommunity && bannedUsersData.length > 0;
 
 	const hasInheritedMembers =
 		(membersByType.collection.length && activeTargetType !== 'collection') ||
@@ -38,12 +105,8 @@ const DashboardMembers = (props: Props) => {
 		// @ts-expect-error FIXME: Organization aren't really a thing anymore
 		(membersByType.organization.length && activeTargetType !== 'organization');
 
-	return (
-		<DashboardFrame
-			className="dashboard-members-container"
-			title="Members"
-			details={`Invite and manage collaborators on this ${activeTargetName}.`}
-		>
+	const membersContent = (
+		<>
 			{canManage && (
 				<SettingsSection title="Add Member">
 					<ControlGroup className="add-member-controls">
@@ -115,6 +178,27 @@ const DashboardMembers = (props: Props) => {
 						)}
 				</SettingsSection>
 			)}
+		</>
+	);
+
+	return (
+		<DashboardFrame
+			className="dashboard-members-container"
+			title="Members"
+			details={`Invite and manage collaborators on this ${activeTargetName}.`}
+		>
+			{showBannedTab ? (
+				<Tabs id="dashboard-members-tabs">
+					<Tab id="members" title="Members" panel={membersContent} />
+					<Tab
+						id="banned"
+						title={`Banned Users (${bannedUsersData.length})`}
+						panel={<BannedUsersTab reports={bannedUsersData} />}
+					/>
+				</Tabs>
+			) : (
+				membersContent
+			)}
 		</DashboardFrame>
 	);
 };
diff --git a/client/containers/DashboardMembers/dashboardMembers.scss b/client/containers/DashboardMembers/dashboardMembers.scss
index 189c180fb9..46af4c3d6f 100644
--- a/client/containers/DashboardMembers/dashboardMembers.scss
+++ b/client/containers/DashboardMembers/dashboardMembers.scss
@@ -24,4 +24,33 @@
 			}
 		}
 	}
+
+	.banned-users-list {
+		.banned-user-row {
+			display: flex;
+			align-items: center;
+			gap: 12px;
+			padding: 10px 0;
+			border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+
+			&:last-child {
+				border-bottom: none;
+			}
+		}
+
+		.banned-user-info {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+		}
+
+		.banned-user-name {
+			font-weight: 600;
+		}
+
+		.banned-user-detail {
+			font-size: 12px;
+			color: #666;
+		}
+	}
 }
diff --git a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
index 6f021b945e..7311487ccd 100644
--- a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
+++ b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
@@ -185,12 +185,9 @@ const ThreadComment = (props: Props) => {
 	};
 	const commenterName = discussionData.commenter?.name ?? threadCommentData.commenter?.name;
 	const isAuthorSpam = threadCommentData.author?.spamTag?.status === 'confirmed-spam';
-	const isAuthorCleared = threadCommentData.author?.spamTag?.status === 'confirmed-not-spam';
-	const isAuthorFlagged =
-		!isAuthorCleared &&
-		threadCommentData.author?.communityModerationReports?.some(
-			(report) => report.status === 'active',
-		);
+	const isAuthorFlagged = threadCommentData.author?.communityModerationReports?.some(
+		(report) => report.status === 'active',
+	);
 	const showFlagButton =
 		!isPreview &&
 		canAdminCommunity &&
diff --git a/client/utils/activity/renderers/index.ts b/client/utils/activity/renderers/index.ts
index b1dfd0610c..3d7329dd10 100644
--- a/client/utils/activity/renderers/index.ts
+++ b/client/utils/activity/renderers/index.ts
@@ -9,7 +9,12 @@ import {
 } from './collection';
 import { renderCommunityCreated, renderCommunityUpdated } from './community';
 import { renderFacetInstanceUpdated } from './facet';
-import { renderMemberCreated, renderMemberRemoved, renderMemberUpdated } from './member';
+import {
+	renderCommunityModerationReportCreated,
+	renderMemberCreated,
+	renderMemberRemoved,
+	renderMemberUpdated,
+} from './member';
 import { renderPageCreated, renderPageRemoved, renderPageUpdated } from './page';
 import {
 	renderPubCreated,
@@ -50,5 +55,6 @@ export const activityItemRenderers: ActivityItemRenderers = {
 	'member-created': renderMemberCreated,
 	'member-updated': renderMemberUpdated,
 	'member-removed': renderMemberRemoved,
+	'community-moderation-report-created': renderCommunityModerationReportCreated,
 	'submission-status-updated': renderSubmissionUpdated,
 };
diff --git a/client/utils/activity/renderers/member.tsx b/client/utils/activity/renderers/member.tsx
index 09d29925c3..f9361e3d8b 100644
--- a/client/utils/activity/renderers/member.tsx
+++ b/client/utils/activity/renderers/member.tsx
@@ -1,4 +1,5 @@
 import type {
+	CommunityModerationReportCreatedActivityItem,
 	MemberCreatedActivityItem,
 	MemberRemovedActivityItem,
 	MemberUpdatedActivityItem,
@@ -6,7 +7,7 @@ import type {
 
 import React from 'react';
 
-import { memberTitle, scopeTitle } from 'utils/activity/titles';
+import { communityTitle, memberTitle, scopeTitle } from 'utils/activity/titles';
 
 import { itemRenderer } from './itemRenderer';
 
@@ -69,3 +70,36 @@ export const renderMemberRemoved = itemRenderer<MemberRemovedActivityItem, Title
 		);
 	},
 });
+
+const reportedUserTitle = (
+	item: CommunityModerationReportCreatedActivityItem,
+	context: Parameters<typeof memberTitle>[1],
+) => {
+	const userId = item.payload.userId;
+	if (userId) {
+		const user = context.associations.user[userId];
+		if (user) {
+			return { title: user.fullName, href: `/user/${user.slug}` };
+		}
+	}
+	return { title: 'unknown user' };
+};
+
+export const renderCommunityModerationReportCreated = itemRenderer<
+	CommunityModerationReportCreatedActivityItem,
+	'reportedUser' | 'community'
+>({
+	icon: 'flag',
+	titleRenderers: {
+		reportedUser: reportedUserTitle,
+		community: communityTitle,
+	},
+	message: ({ titles }) => {
+		const { actor, reportedUser, community } = titles;
+		return (
+			<>
+				{actor} flagged {reportedUser} in {community}
+			</>
+		);
+	},
+});
diff --git a/server/activityItem/__tests__/fetch.test.ts b/server/activityItem/__tests__/fetch.test.ts
index f43d6529bc..f65cb9fd53 100644
--- a/server/activityItem/__tests__/fetch.test.ts
+++ b/server/activityItem/__tests__/fetch.test.ts
@@ -10,6 +10,7 @@ import {
 	createCollectionPubActivityItem,
 	createCollectionUpdatedActivityItem,
 	createCommunityCreatedActivityItem,
+	createCommunityModerationReportCreatedActivityItem,
 	createCommunityUpdatedActivityItem,
 	createMemberCreatedActivityItem,
 	createMemberRemovedActivityItem,
@@ -157,6 +158,34 @@ describe('fetchActivityItems', () => {
 		expectAssociationIds(associations, { community: [community.id], user: [actor.id] });
 	});
 
+	it('fetches items for community-moderation-report-created', async () => {
+		const { actor, loudmouth, community } = models;
+		await createCommunityModerationReportCreatedActivityItem(
+			actor.id,
+			community.id,
+			loudmouth.id,
+		);
+		const {
+			activityItems: [reportItem],
+			associations,
+		} = await fetchActivityItems({
+			scope: { communityId: community.id },
+		});
+		expect(reportItem).toMatchObject({
+			kind: 'community-moderation-report-created',
+			actorId: actor.id,
+			communityId: community.id,
+			payload: {
+				userId: loudmouth.id,
+				community: { title: community.title },
+			},
+		});
+		expectAssociationIds(associations, {
+			community: [community.id],
+			user: [actor.id, loudmouth.id],
+		});
+	});
+
 	it('fetches items for member-created, member-updated, and member-removed across pub, collection, and community membership', async () => {
 		const { actor, pub, collection, community, pubMember, collectionMember, communityMember } =
 			models;
diff --git a/server/activityItem/fetch.ts b/server/activityItem/fetch.ts
index e24065d163..76899b2671 100644
--- a/server/activityItem/fetch.ts
+++ b/server/activityItem/fetch.ts
@@ -63,7 +63,11 @@ const memberItemKindFilter = (subFilter: null | SequelizeFilter = null) => {
 
 const filterDefinitions: Record<ActivityFilter, SequelizeFilter | SequelizeFilter[]> = {
 	community: [
-		itemKindFilter(['community-created', 'community-updated']),
+		itemKindFilter([
+			'community-created',
+			'community-updated',
+			'community-moderation-report-created',
+		]),
 		memberItemKindFilter({ pubId: null, collectionId: null }),
 	],
 	collection: {
@@ -230,6 +234,8 @@ const getActivityItemAssociationIds = (
 			item.kind === 'page-removed'
 		) {
 			page.add(item.payload.page.id);
+		} else if (item.kind === 'community-moderation-report-created') {
+			user.add(item.payload.userId);
 		}
 	});
 	return associationIds;
diff --git a/server/activityItem/queries.ts b/server/activityItem/queries.ts
index 128c80447c..d041cfb1f8 100644
--- a/server/activityItem/queries.ts
+++ b/server/activityItem/queries.ts
@@ -100,6 +100,27 @@ const buildMemberActivityItemParams = <
 	};
 };
 
+export const createCommunityModerationReportCreatedActivityItem = async (
+	actorId: null | string,
+	communityId: string,
+	reportedUserId: string,
+) => {
+	const community = expect(
+		await Community.findOne({ where: { id: communityId }, useMaster: true }),
+	);
+	return createActivityItem({
+		actorId,
+		kind: 'community-moderation-report-created' as const,
+		communityId,
+		payload: {
+			userId: reportedUserId,
+			community: {
+				title: community.title,
+			},
+		},
+	});
+};
+
 export const createCommunityCreatedActivityItem = async (
 	actorId: null | string,
 	communityId: string,
diff --git a/server/communityModerationReport/__tests__/api.test.ts b/server/communityModerationReport/__tests__/api.test.ts
index d8b93c7c0b..b9bc61f0f5 100644
--- a/server/communityModerationReport/__tests__/api.test.ts
+++ b/server/communityModerationReport/__tests__/api.test.ts
@@ -139,6 +139,35 @@ it('blocks a reported user from creating discussions in that community', async (
 		.expect(403);
 });
 
+it('rejects status updates other than retracted', async () => {
+	const { admin, community, targetUser } = models;
+	const agent = await login(admin);
+
+	const createRes = await agent
+		.post('/api/communityModerationReports')
+		.send({
+			userId: targetUser.id,
+			communityId: community.id,
+			reason: 'other',
+		})
+		.expect(201);
+
+	await agent
+		.put(`/api/communityModerationReports/${createRes.body.id}`)
+		.send({ status: 'dismissed' })
+		.expect(400);
+
+	await agent
+		.put(`/api/communityModerationReports/${createRes.body.id}`)
+		.send({ status: 'escalated' })
+		.expect(400);
+
+	await agent
+		.put(`/api/communityModerationReports/${createRes.body.id}`)
+		.send({ status: 'retracted' })
+		.expect(200);
+});
+
 it('retracting a report re-enables the user to create thread comments', async () => {
 	const { admin, community, targetUser, pub } = models;
 	const adminAgent = await login(admin);
diff --git a/server/communityModerationReport/api.ts b/server/communityModerationReport/api.ts
index 4d74dcc7b3..5a734def86 100644
--- a/server/communityModerationReport/api.ts
+++ b/server/communityModerationReport/api.ts
@@ -76,50 +76,41 @@ router.put(
 		const reportId = req.params.id;
 		const actorId = req.user?.id;
 		if (!actorId) throw new ForbiddenError();
+		if (status !== 'retracted') {
+			return res.status(400).json({ error: 'Only "retracted" is a valid status update' });
+		}
 
-		if (status === 'retracted') {
-			const ownReport = await getReportByIdAndActor(reportId, actorId);
-			if (!ownReport) {
-				const existing = await getReportById(reportId);
-				if (!existing) throw new NotFoundError();
-				const scopeData = await getScope({
-					communityId: existing.communityId,
-					loginId: actorId,
-				});
-				if (!scopeData.activePermissions.canAdmin) {
-					throw new ForbiddenError();
-				}
-			}
-			const updated = await updateReportStatus(reportId, 'retracted');
-			if (!updated) throw new NotFoundError();
-
-			const retractedReport = await getReportById(reportId);
-			if (retractedReport) {
-				const reqUser = req.user as any;
-				notify('community-flag-retracted', {
-					userId: retractedReport.userId,
-					userEmail: retractedReport.user?.email ?? '',
-					userName: retractedReport.user?.fullName ?? '',
-					userSlug: retractedReport.user?.slug ?? '',
-					communityId: retractedReport.communityId,
-					communitySubdomain: retractedReport.community?.subdomain ?? '',
-					actorFullName: reqUser?.fullName ?? '',
-					actorSlug: reqUser?.slug ?? '',
-					actorEmail: reqUser?.email ?? '',
-				}).catch((err) =>
-					console.error('Failed to send flag retraction notification', err),
-				);
+		const ownReport = await getReportByIdAndActor(reportId, actorId);
+		if (!ownReport) {
+			const existing = await getReportById(reportId);
+			if (!existing) throw new NotFoundError();
+			const scopeData = await getScope({
+				communityId: existing.communityId,
+				loginId: actorId,
+			});
+			if (!scopeData.activePermissions.canAdmin) {
+				throw new ForbiddenError();
 			}
-
-			return res.status(200).json(updated);
 		}
+		const updated = await updateReportStatus(reportId, 'retracted');
+		if (!updated) throw new NotFoundError();
 
-		const isSuperAdmin = await canManipulateSpamTags({ userId: actorId });
-		if (!isSuperAdmin) {
-			throw new ForbiddenError();
+		const retractedReport = await getReportById(reportId);
+		if (retractedReport) {
+			const reqUser = req.user as any;
+			notify('community-flag-retracted', {
+				userId: retractedReport.userId,
+				userEmail: retractedReport.user?.email ?? '',
+				userName: retractedReport.user?.fullName ?? '',
+				userSlug: retractedReport.user?.slug ?? '',
+				communityId: retractedReport.communityId,
+				communitySubdomain: retractedReport.community?.subdomain ?? '',
+				actorFullName: reqUser?.fullName ?? '',
+				actorSlug: reqUser?.slug ?? '',
+				actorEmail: reqUser?.email ?? '',
+			}).catch((err) => console.error('Failed to send flag retraction notification', err));
 		}
-		const updated = await updateReportStatus(reportId, status);
-		if (!updated) throw new NotFoundError();
+
 		return res.status(200).json(updated);
 	}),
 );
diff --git a/server/communityModerationReport/hooks.ts b/server/communityModerationReport/hooks.ts
new file mode 100644
index 0000000000..0e7162814a
--- /dev/null
+++ b/server/communityModerationReport/hooks.ts
@@ -0,0 +1,13 @@
+import { createCommunityModerationReportCreatedActivityItem } from 'server/activityItem/queries';
+import { CommunityModerationReport } from 'server/models';
+import { defer } from 'server/utils/deferred';
+
+CommunityModerationReport.afterCreate(async (report) => {
+	defer(async () => {
+		await createCommunityModerationReportCreatedActivityItem(
+			report.actorId,
+			report.communityId,
+			report.userId,
+		);
+	});
+});
diff --git a/server/communityModerationReport/model.ts b/server/communityModerationReport/model.ts
index 940edbb2da..817f293d76 100644
--- a/server/communityModerationReport/model.ts
+++ b/server/communityModerationReport/model.ts
@@ -23,7 +23,7 @@ export type ModerationReportReason =
 	| 'impersonation'
 	| 'other';
 
-export type ModerationReportStatus = 'active' | 'retracted' | 'dismissed' | 'escalated';
+export type ModerationReportStatus = 'active' | 'retracted';
 
 @Table({ tableName: 'CommunityModerationReports' })
 export class CommunityModerationReport extends Model<
@@ -68,7 +68,7 @@ export class CommunityModerationReport extends Model<
 
 	@AllowNull(false)
 	@Default('active')
-	@Column(DataType.ENUM('active', 'retracted', 'dismissed', 'escalated'))
+	@Column(DataType.ENUM('active', 'retracted'))
 	declare status: CreationOptional<ModerationReportStatus>;
 
 	@BelongsTo(() => User, { onDelete: 'CASCADE', as: 'user', foreignKey: 'userId' })
diff --git a/server/communityModerationReport/queries.ts b/server/communityModerationReport/queries.ts
index b77faaf0d7..734b0fb81a 100644
--- a/server/communityModerationReport/queries.ts
+++ b/server/communityModerationReport/queries.ts
@@ -67,6 +67,21 @@ export const getReportsForCommunity = async (communityId: string) => {
 	});
 };
 
+export const getActiveBannedUsersForCommunity = async (communityId: string) => {
+	return CommunityModerationReport.findAll({
+		where: { communityId, status: 'active' },
+		order: [['createdAt', 'DESC']],
+		include: [
+			{
+				model: User,
+				as: 'user',
+				attributes: ['id', 'fullName', 'slug', 'avatar', 'initials'],
+			},
+			{ model: User, as: 'actor', attributes: ['id', 'fullName', 'slug'] },
+		],
+	});
+};
+
 export const getAllActiveReports = async () => {
 	return CommunityModerationReport.findAll({
 		where: { status: 'active' },
diff --git a/server/discussion/api.ts b/server/discussion/api.ts
index 1e1f62d377..5d87722960 100644
--- a/server/discussion/api.ts
+++ b/server/discussion/api.ts
@@ -1,6 +1,5 @@
 import { Router } from 'express';
 
-import { isUserReportedInCommunity } from 'server/communityModerationReport/queries';
 import { verifyCaptchaPayload } from 'server/utils/captcha';
 import { BadRequestError, ForbiddenError } from 'server/utils/errors';
 import { handleHoneypotTriggered, isHoneypotFilled } from 'server/utils/honeypot';
@@ -34,7 +33,6 @@ router.post(
 		}
 
 		const canCreate = await getCreatePermission(requestIds);
-		console.log('canCreate', canCreate);
 		if (!canCreate) {
 			throw new ForbiddenError();
 		}
diff --git a/server/discussion/permissions.ts b/server/discussion/permissions.ts
index 3156b3ddd2..a295b2a03d 100644
--- a/server/discussion/permissions.ts
+++ b/server/discussion/permissions.ts
@@ -1,4 +1,3 @@
-import { isUserReportedInCommunity } from 'server/communityModerationReport/queries';
 import { getFeatureFlagForUserAndCommunity } from 'server/featureFlag/queries';
 import { Discussion, Pub } from 'server/models';
 import { getScope } from 'server/utils/queryHelpers';
@@ -18,20 +17,19 @@ export const getCreatePermission = async ({
 
 	const pub = await Pub.findOne({ where: { id: pubId } });
 	const hasAccessHash = pub?.commentHash === commentAccessHash;
-	const [scopeData, flagged] = await Promise.all([
+	const [scopeData] = await Promise.all([
 		getScope({
 			communityId,
 			pubId,
 			loginId: userId,
 			accessHash,
 		}),
-		isUserReportedInCommunity(userId, communityId),
 	]);
 
 	const { canView, canCreateDiscussions } = scopeData.activePermissions;
 	const nonMembersVisibility = visibilityAccess && visibilityAccess !== 'members';
 
-	return !flagged && (canView || (canCreateDiscussions && nonMembersVisibility) || hasAccessHash);
+	return canView || (canCreateDiscussions && nonMembersVisibility) || hasAccessHash;
 };
 
 export const getUpdatePermissions = async ({ discussionId, userId, pubId, communityId }) => {
diff --git a/server/hooks.ts b/server/hooks.ts
index 9a4d367d04..9cb74b0e93 100644
--- a/server/hooks.ts
+++ b/server/hooks.ts
@@ -2,6 +2,7 @@ import './activityItem/hooks';
 import './collection/hooks';
 import './collectionPub/hooks';
 import './community/hooks';
+import './communityModerationReport/hooks';
 import './member/hooks';
 import './page/hooks';
 import './pub/hooks';
diff --git a/server/middleware/communityModerationGuard.ts b/server/middleware/communityModerationGuard.ts
new file mode 100644
index 0000000000..cb5eca9502
--- /dev/null
+++ b/server/middleware/communityModerationGuard.ts
@@ -0,0 +1,51 @@
+import type { NextFunction, Request, Response } from 'express';
+
+import { isUserReportedInCommunity } from 'server/communityModerationReport/queries';
+import { findCommunityByHostname } from 'utils/ensureUserIsCommunityAdmin';
+
+const MUTATING_METHODS = new Set(['POST', 'PUT', 'DELETE', 'PATCH']);
+
+const EXEMPT_PATHS = new Set([
+	'/api/login',
+	'/api/logout',
+	'/api/password-reset',
+	'/api/signup',
+	'/api/health',
+]);
+
+const isExempt = (path: string) => {
+	if (EXEMPT_PATHS.has(path)) return true;
+	// community moderation endpoints must remain accessible so admins can retract flags
+	if (path.startsWith('/api/communityModerationReports')) return true;
+	// superadmin spam management must not be blocked
+	if (path.startsWith('/api/spamTags')) return true;
+	// read-like POSTs that don't mutate community content
+	if (path === '/api/activityItems') return true;
+	if (path === '/api/pubs/many') return true;
+	if (path === '/api/analytics/track') return true;
+	if (path === '/api/subscribe') return true;
+	return false;
+};
+
+export const communityModerationGuard = () => {
+	return async (req: Request, res: Response, next: NextFunction) => {
+		if (!MUTATING_METHODS.has(req.method)) return next();
+		if (!req.path.startsWith('/api')) return next();
+		if (isExempt(req.path)) return next();
+
+		const userId = req.user?.id;
+		if (!userId) return next();
+
+		const community = await findCommunityByHostname(req.hostname).catch(() => null);
+		if (!community) return next();
+
+		const reported = await isUserReportedInCommunity(userId, community.id);
+		if (!reported) return next();
+
+		return res.status(403).json({
+			error: 'communityBanned',
+			message:
+				'You have been flagged by the administrators of this community and cannot perform this action.',
+		});
+	};
+};
diff --git a/server/routes/dashboardActivity.tsx b/server/routes/dashboardActivity.tsx
index 584ff7b0d2..c4c675dfef 100644
--- a/server/routes/dashboardActivity.tsx
+++ b/server/routes/dashboardActivity.tsx
@@ -37,6 +37,8 @@ router.get(
 
 			const activityData = await fetchActivityItems({ scope, limit: 50 });
 
+			console.log('activityData', activityData);
+
 			return renderToNodeStream(
 				res,
 				<Html
diff --git a/server/routes/dashboardMembers.tsx b/server/routes/dashboardMembers.tsx
index 9c7da41d46..ad12162013 100644
--- a/server/routes/dashboardMembers.tsx
+++ b/server/routes/dashboardMembers.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 
 import { Router } from 'express';
 
+import { getActiveBannedUsersForCommunity } from 'server/communityModerationReport/queries';
 import Html from 'server/Html';
 import { handleErrors, NotFoundError } from 'server/utils/errors';
 import { getInitialData } from 'server/utils/initData';
@@ -29,12 +30,22 @@ router.get(
 				throw new NotFoundError();
 			}
 
+			const isCommunityScope =
+				initialData.scopeData.elements.activeTargetType === 'community';
+			const canAdmin = initialData.scopeData.activePermissions.canAdminCommunity;
+			const bannedUsersData =
+				isCommunityScope && canAdmin
+					? (await getActiveBannedUsersForCommunity(initialData.communityData.id)).map(
+							(r) => r.toJSON(),
+						)
+					: [];
+
 			return renderToNodeStream(
 				res,
 				<Html
 					chunkName="DashboardMembers"
 					initialData={initialData}
-					viewData={{ membersData }}
+					viewData={{ membersData, bannedUsersData }}
 					headerComponents={generateMetaComponents({
 						initialData,
 						title: `Members · ${initialData.scopeData.elements.activeTarget.title ?? initialData.communityData.title}`,
diff --git a/server/server.ts b/server/server.ts
index 3139694454..6f64bfdffe 100755
--- a/server/server.ts
+++ b/server/server.ts
@@ -35,6 +35,7 @@ if (process.env.NODE_ENV !== 'test') {
 	require('server/utils/serverModuleOverwrite');
 }
 
+import { communityModerationGuard } from './middleware/communityModerationGuard';
 import { deduplicateSlash } from './middleware/deduplicateSlash';
 import { blocklistMiddleware } from './utils/blocklist';
 
@@ -250,6 +251,7 @@ appRouter.use(authTokenMiddleware);
 appRouter.use(purgeMiddleware(schedulePurge));
 
 appRouter.use(readOnlyMiddleware());
+appRouter.use(communityModerationGuard());
 
 const { customScript: _, ...contractWithoutCustomScript } = contract;
 
diff --git a/server/utils/queryHelpers/discussionsSanitize.ts b/server/utils/queryHelpers/discussionsSanitize.ts
index f62a468d88..ddb34b2537 100644
--- a/server/utils/queryHelpers/discussionsSanitize.ts
+++ b/server/utils/queryHelpers/discussionsSanitize.ts
@@ -12,15 +12,10 @@ type AuthorWithModeration =
 
 const isAuthorSpam = (author: AuthorWithModeration) => author?.spamTag?.status === 'confirmed-spam';
 
-const isAuthorCleared = (author: AuthorWithModeration) =>
-	author?.spamTag?.status === 'confirmed-not-spam';
-
 const isAuthorFlagged = (author: AuthorWithModeration) =>
 	(author?.communityModerationReports?.length ?? 0) > 0;
 
-// cleared users should remain visible even if they have active community reports
-const isHidden = (author: AuthorWithModeration) =>
-	isAuthorSpam(author) || (isAuthorFlagged(author) && !isAuthorCleared(author));
+const isHidden = (author: AuthorWithModeration) => isAuthorSpam(author) || isAuthorFlagged(author);
 
 export default (
 	discussions: DefinitelyHas<Discussion, 'visibility'>[],
diff --git a/server/utils/rateLimiter.ts b/server/utils/rateLimiter.ts
new file mode 100644
index 0000000000..d9f4f30668
--- /dev/null
+++ b/server/utils/rateLimiter.ts
@@ -0,0 +1,44 @@
+import type { NextFunction, Request, Response } from 'express';
+
+type RateLimiterOptions = {
+	maxRequests: number;
+	windowMs: number;
+};
+
+// sliding window per-user rate limiter
+export const createPerUserRateLimiter = (opts: RateLimiterOptions) => {
+	const { maxRequests, windowMs } = opts;
+	const windows = new Map<string, number[]>();
+
+	const cleanup = () => {
+		const now = Date.now();
+		for (const [key, timestamps] of windows) {
+			const filtered = timestamps.filter((t) => now - t < windowMs);
+			if (filtered.length === 0) {
+				windows.delete(key);
+			} else {
+				windows.set(key, filtered);
+			}
+		}
+	};
+
+	const cleanupInterval = setInterval(cleanup, windowMs * 2);
+	cleanupInterval.unref();
+
+	return (req: Request, res: Response, next: NextFunction) => {
+		const userId = (req as any).user?.id;
+		if (!userId) return next();
+
+		const now = Date.now();
+		const timestamps = windows.get(userId) ?? [];
+		const recent = timestamps.filter((t) => now - t < windowMs);
+
+		if (recent.length >= maxRequests) {
+			return res.status(429).json({ error: 'Too many requests. Please try again later.' });
+		}
+
+		recent.push(now);
+		windows.set(userId, recent);
+		return next();
+	};
+};
diff --git a/types/activity/communityModerationReport.ts b/types/activity/communityModerationReport.ts
new file mode 100644
index 0000000000..6dc7120d60
--- /dev/null
+++ b/types/activity/communityModerationReport.ts
@@ -0,0 +1,13 @@
+import type { InsertableActivityItemBase } from './base';
+
+export type CommunityModerationReportCreatedActivityItem = InsertableActivityItemBase & {
+	kind: 'community-moderation-report-created';
+	payload: {
+		userId: string;
+		community: {
+			title: string;
+		};
+	};
+};
+
+export type CommunityModerationReportActivityItem = CommunityModerationReportCreatedActivityItem;
diff --git a/types/activity/index.ts b/types/activity/index.ts
index 90b12fa794..fa0b20e98f 100644
--- a/types/activity/index.ts
+++ b/types/activity/index.ts
@@ -5,6 +5,7 @@ import type { SerializedModel } from '../serializedModel';
 import type { ActivityAssociations } from './associations';
 import type { CollectionActivityItem } from './collection';
 import type { CommunityActivityItem } from './community';
+import type { CommunityModerationReportActivityItem } from './communityModerationReport';
 import type { FacetsActivityItem } from './facets';
 import type { MemberActivityItem } from './member';
 import type { PageActivityItem } from './page';
@@ -13,6 +14,7 @@ import type { SubmissionActivityItem } from './submission';
 
 export type * from './collection';
 export type * from './community';
+export type * from './communityModerationReport';
 export type * from './facets';
 export type * from './member';
 export type * from './page';
@@ -22,6 +24,7 @@ export type * from './submission';
 export type InsertableActivityItem =
 	| CommunityActivityItem
 	| CollectionActivityItem
+	| CommunityModerationReportActivityItem
 	| FacetsActivityItem
 	| PageActivityItem
 	| PubActivityItem
diff --git a/types/spam.ts b/types/spam.ts
index be509aa4e7..f7685c6127 100644
--- a/types/spam.ts
+++ b/types/spam.ts
@@ -123,7 +123,7 @@ export type ModerationReportReason =
 /** @deprecated use ModerationReportReason */
 export type UserCommunityFlagReason = ModerationReportReason;
 
-export type ModerationReportStatus = 'active' | 'retracted' | 'dismissed' | 'escalated';
+export type ModerationReportStatus = 'active' | 'retracted';
 
 /** @deprecated use ModerationReportStatus */
 export type UserCommunityFlagStatus = ModerationReportStatus;
diff --git a/utils/activity/titles/community.ts b/utils/activity/titles/community.ts
index 45928ad839..68d9588a1e 100644
--- a/utils/activity/titles/community.ts
+++ b/utils/activity/titles/community.ts
@@ -1,5 +1,6 @@
 import type {
 	CommunityCreatedActivityItem,
+	CommunityModerationReportCreatedActivityItem,
 	CommunityUpdatedActivityItem,
 	FacetsActivityItem,
 	MemberActivityItem,
@@ -13,6 +14,7 @@ import { getCommunityFromContext } from './util';
 
 type AcceptedItem =
 	| CommunityCreatedActivityItem
+	| CommunityModerationReportCreatedActivityItem
 	| CommunityUpdatedActivityItem
 	| MemberActivityItem
 	| FacetsActivityItem;

From e8a41d1ddbbc35dfb03fc34b22954357768916c3 Mon Sep 17 00:00:00 2001
From: "Thomas F. K. Jorna" <hello@tefkah.com>
Date: Mon, 9 Mar 2026 19:28:48 +0100
Subject: [PATCH 09/10] fix: some style improvements to everything

---
 .../FlagUserDialog/FlagUserDialog.tsx         | 61 +++++++-----
 .../DashboardActivity/ActivityFilters.tsx     | 21 +++-
 .../DashboardMembers/DashboardMembers.tsx     |  9 +-
 .../Discussion/ThreadComment.tsx              | 10 +-
 client/utils/activity/renderers/index.ts      |  8 +-
 client/utils/activity/renderers/member.tsx    | 36 +------
 .../utils/activity/renderers/moderation.tsx   | 99 +++++++++++++++++++
 server/activityItem/__tests__/fetch.test.ts   | 10 +-
 server/activityItem/api.ts                    | 12 ++-
 server/activityItem/fetch.ts                  | 40 ++++++--
 server/activityItem/queries.ts                | 93 ++++++++++++++---
 server/communityModerationReport/api.ts       |  6 ++
 server/communityModerationReport/hooks.ts     | 33 +++++--
 server/middleware/communityModerationGuard.ts |  2 +-
 server/routes/dashboardActivity.tsx           | 18 +++-
 server/spamTag/api.ts                         | 11 +++
 types/activity/communityModerationReport.ts   | 22 ++++-
 types/activity/filters.ts                     |  1 +
 utils/activity/titles/community.ts            |  2 +
 utils/activity/titles/pub.tsx                 |  1 +
 utils/moderationReasons.ts                    | 12 +++
 21 files changed, 386 insertions(+), 121 deletions(-)
 create mode 100644 client/utils/activity/renderers/moderation.tsx
 create mode 100644 utils/moderationReasons.ts

diff --git a/client/components/FlagUserDialog/FlagUserDialog.tsx b/client/components/FlagUserDialog/FlagUserDialog.tsx
index 66f0d10c8c..86a6d4ebdc 100644
--- a/client/components/FlagUserDialog/FlagUserDialog.tsx
+++ b/client/components/FlagUserDialog/FlagUserDialog.tsx
@@ -5,14 +5,11 @@ import React, { useCallback, useState } from 'react';
 import { Button, Callout, Classes, Dialog, HTMLSelect, Intent, TextArea } from '@blueprintjs/core';
 
 import { apiFetch } from 'client/utils/apiFetch';
+import { moderationReasonLabels } from 'utils/moderationReasons';
 
-const reasons: { value: ModerationReportReason; label: string }[] = [
-	{ value: 'spam-content', label: 'Spam content' },
-	{ value: 'hateful-language', label: 'Hateful language' },
-	{ value: 'harassment', label: 'Harassment' },
-	{ value: 'impersonation', label: 'Impersonation' },
-	{ value: 'other', label: 'Other' },
-];
+const reasons = (Object.entries(moderationReasonLabels) as [ModerationReportReason, string][]).map(
+	([value, label]) => ({ value, label }),
+);
 
 type Props = {
 	isOpen: boolean;
@@ -45,7 +42,7 @@ const FlagUserDialog = (props: Props) => {
 			onFlagged?.();
 			onClose();
 		} catch (err: any) {
-			setError(err?.message ?? 'Failed to flag user');
+			setError(err?.message ?? 'Failed to ban user');
 		} finally {
 			setIsLoading(false);
 		}
@@ -55,21 +52,27 @@ const FlagUserDialog = (props: Props) => {
 		<Dialog
 			isOpen={isOpen}
 			onClose={onClose}
-			title={`Flag user${userName ? `: ${userName}` : ''}`}
-			style={{ width: 480 }}
+			title={`Ban user${userName ? `: ${userName}` : ''}`}
+			style={{ width: 520 }}
 		>
 			<div className={Classes.DIALOG_BODY}>
-				<Callout intent={Intent.WARNING} style={{ marginBottom: 16 }}>
-					Flagging this user will hide all of their discussions and comments in your
-					community. They will not be able to create any new Pubs or discussions. They may
-					still be able to perform other actions if you have given them permissions
-					through memberships.
-					<br />
-					We aim to evaluate flagged users and will send you a follow-up via email to let
-					you know what actions we've taken.
+				<Callout intent={Intent.WARNING} style={{ marginBottom: 20 }}>
+					<p style={{ margin: '0 0 8px' }}>
+						<strong>This will ban the user from your community.</strong> They will not
+						be able to perform any actions, including creating Pubs, posting
+						discussions, or editing content.
+					</p>
+					<p style={{ margin: '0 0 8px' }}>
+						All of their existing discussions and comments will be hidden from other
+						users. You can reverse this action at any time from the Members settings.
+					</p>
+					<p style={{ margin: 0, fontSize: 13, opacity: 0.85 }}>
+						The user will <strong>not</strong> be notified of this action.
+					</p>
 				</Callout>
-				<div style={{ marginBottom: 12 }}>
-					<label htmlFor="flag-reason" style={{ fontWeight: 500, fontSize: 14 }}>
+
+				<div style={{ marginBottom: 14 }}>
+					<label htmlFor="flag-reason" style={{ fontWeight: 600, fontSize: 14 }}>
 						Reason
 					</label>
 					<HTMLSelect
@@ -86,20 +89,26 @@ const FlagUserDialog = (props: Props) => {
 						))}
 					</HTMLSelect>
 				</div>
-				<div>
-					<label htmlFor="flag-reason-text" style={{ fontWeight: 500, fontSize: 14 }}>
+
+				<div style={{ marginBottom: 8 }}>
+					<label htmlFor="flag-reason-text" style={{ fontWeight: 600, fontSize: 14 }}>
 						Details (optional)
 					</label>
+					<p style={{ margin: '2px 0 6px', fontSize: 13, color: '#666' }}>
+						This message will be sent to the PubPub team and helps us identify patterns
+						of abuse across the platform.
+					</p>
 					<TextArea
 						id="flag-reason-text"
 						value={reasonText}
 						onChange={(e) => setReasonText(e.target.value)}
 						fill
 						rows={3}
-						placeholder="Provide additional context..."
-						style={{ marginTop: 4 }}
+						placeholder="Provide additional context about why this user is being banned..."
+						style={{ marginTop: 0 }}
 					/>
 				</div>
+
 				{error && (
 					<div style={{ color: 'var(--pt-intent-danger)', marginTop: 8, fontSize: 13 }}>
 						{error}
@@ -110,8 +119,8 @@ const FlagUserDialog = (props: Props) => {
 				<div className={Classes.DIALOG_FOOTER_ACTIONS}>
 					<Button text="Cancel" onClick={onClose} disabled={isLoading} />
 					<Button
-						text="Flag user"
-						intent={Intent.WARNING}
+						text="Ban user"
+						intent={Intent.DANGER}
 						onClick={handleSubmit}
 						loading={isLoading}
 					/>
diff --git a/client/containers/DashboardActivity/ActivityFilters.tsx b/client/containers/DashboardActivity/ActivityFilters.tsx
index 2577909884..56cae81c74 100644
--- a/client/containers/DashboardActivity/ActivityFilters.tsx
+++ b/client/containers/DashboardActivity/ActivityFilters.tsx
@@ -6,6 +6,7 @@ import classNames from 'classnames';
 import { Checkbox } from 'reakit/Checkbox';
 
 import { Icon, type IconName } from 'components';
+import { usePageContext } from 'utils/hooks';
 
 import './activityFilters.scss';
 
@@ -26,6 +27,7 @@ const filterLabels: Record<ActivityFilter, FilterLabel> = {
 	pub: { label: 'Pubs', icon: 'pubDoc' },
 	page: { label: 'Pages', icon: 'page-layout' },
 	member: { label: 'Members', icon: 'people' },
+	moderation: { label: 'Moderation', icon: 'flag' },
 	review: { label: 'Reviews', icon: 'social-media' },
 	discussion: { label: 'Discussions', icon: 'chat' },
 	pubEdge: { label: 'Connections', icon: 'layout-auto' },
@@ -47,18 +49,29 @@ const filtersByScopeKind = {
 		'discussion',
 		'submission',
 	]),
+	communityAdmin: sortedFilters([
+		'community',
+		'collection',
+		'pub',
+		'page',
+		'member',
+		'moderation',
+		'review',
+		'discussion',
+		'submission',
+	]),
 	collection: sortedFilters(['pub', 'member', 'review', 'discussion', 'submission']),
 	pub: sortedFilters(['member', 'review', 'discussion', 'pubEdge', 'submission']),
 };
 
-const getFiltersForScope = (scope: ScopeId) => {
+const getFiltersForScope = (scope: ScopeId, canAdminCommunity: boolean) => {
 	if ('pubId' in scope && scope.pubId) {
 		return filtersByScopeKind.pub;
 	}
 	if ('collectionId' in scope && scope.collectionId) {
 		return filtersByScopeKind.collection;
 	}
-	return filtersByScopeKind.community;
+	return canAdminCommunity ? filtersByScopeKind.communityAdmin : filtersByScopeKind.community;
 };
 
 const toggleFilterInclusion = (currentFilters: ActivityFilter[], toggleFilter: ActivityFilter) => {
@@ -70,6 +83,8 @@ const toggleFilterInclusion = (currentFilters: ActivityFilter[], toggleFilter: A
 
 const ActivityFilters = (props: Props) => {
 	const { activeFilters, onUpdateActiveFilters, scope } = props;
+	const { scopeData } = usePageContext();
+	const { canAdminCommunity } = scopeData.activePermissions;
 
 	return (
 		<div
@@ -79,7 +94,7 @@ const ActivityFilters = (props: Props) => {
 			)}
 		>
 			<div className="label">Filter by</div>
-			{getFiltersForScope(scope).map((filter) => {
+			{getFiltersForScope(scope, canAdminCommunity).map((filter) => {
 				const { label, icon } = filterLabels[filter];
 				return (
 					<Checkbox
diff --git a/client/containers/DashboardMembers/DashboardMembers.tsx b/client/containers/DashboardMembers/DashboardMembers.tsx
index adb09a7d57..d94d3ac447 100644
--- a/client/containers/DashboardMembers/DashboardMembers.tsx
+++ b/client/containers/DashboardMembers/DashboardMembers.tsx
@@ -1,3 +1,5 @@
+import type { ModerationReportReason } from 'types';
+
 import React, { useCallback, useState } from 'react';
 
 import { Button, ControlGroup, Intent, Tab, Tabs } from '@blueprintjs/core';
@@ -13,6 +15,7 @@ import {
 	UserAutocomplete,
 } from 'components';
 import { usePageContext } from 'utils/hooks';
+import { getReasonLabel } from 'utils/moderationReasons';
 
 import './dashboardMembers.scss';
 
@@ -66,8 +69,10 @@ const BannedUsersTab = (props: { reports: BannedUserReport[] }) => {
 					<div className="banned-user-info">
 						<span className="banned-user-name">{report.user.fullName}</span>
 						<span className="banned-user-detail">
-							Flagged by {report.actor.fullName}
-							{report.reason ? ` (${report.reason})` : ''}
+							Banned by {report.actor.fullName}
+							{report.reason
+								? ` (${getReasonLabel(report.reason as ModerationReportReason)})`
+								: ''}
 						</span>
 					</div>
 					<Button
diff --git a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
index 7311487ccd..0fe4c1f24a 100644
--- a/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
+++ b/client/containers/Pub/PubDocument/PubDiscussions/Discussion/ThreadComment.tsx
@@ -226,7 +226,7 @@ const ThreadComment = (props: Props) => {
 							: (commenterName ?? 'anonymous')}
 						{isAuthorSpam && isPreview && <span className="spam-badge">Spam</span>}
 						{isAuthorFlagged && !isAuthorSpam && isPreview && (
-							<span className="flagged-badge">Flagged</span>
+							<span className="flagged-badge">Banned</span>
 						)}
 						{isPreview ? ': ' : ''}
 					</span>
@@ -277,7 +277,7 @@ const ThreadComment = (props: Props) => {
 								onClick={() => setIsFlagDialogOpen(true)}
 								className="flag-button"
 							>
-								Flag
+								Ban
 							</Button>
 						)}
 						{showUnflagButton && (
@@ -289,7 +289,7 @@ const ThreadComment = (props: Props) => {
 								onClick={handleRetractFlag}
 								className="flag-button"
 							>
-								Unflag
+								Unban
 							</Button>
 						)}
 						{!isPreview && isSuperAdmin && threadCommentData.userId && (
@@ -309,8 +309,8 @@ const ThreadComment = (props: Props) => {
 				)}
 				{!isPreview && isAuthorFlagged && !isAuthorSpam && (
 					<div className="thread-comment-flagged-banner">
-						This user has been flagged by a community admin. Only you and other admins
-						can see this content.
+						This user has been banned from this community. Only you and other admins can
+						see this content.
 					</div>
 				)}
 				{!isPreview && (
diff --git a/client/utils/activity/renderers/index.ts b/client/utils/activity/renderers/index.ts
index 3d7329dd10..d25724d09c 100644
--- a/client/utils/activity/renderers/index.ts
+++ b/client/utils/activity/renderers/index.ts
@@ -9,12 +9,11 @@ import {
 } from './collection';
 import { renderCommunityCreated, renderCommunityUpdated } from './community';
 import { renderFacetInstanceUpdated } from './facet';
+import { renderMemberCreated, renderMemberRemoved, renderMemberUpdated } from './member';
 import {
 	renderCommunityModerationReportCreated,
-	renderMemberCreated,
-	renderMemberRemoved,
-	renderMemberUpdated,
-} from './member';
+	renderCommunityModerationReportRetracted,
+} from './moderation';
 import { renderPageCreated, renderPageRemoved, renderPageUpdated } from './page';
 import {
 	renderPubCreated,
@@ -56,5 +55,6 @@ export const activityItemRenderers: ActivityItemRenderers = {
 	'member-updated': renderMemberUpdated,
 	'member-removed': renderMemberRemoved,
 	'community-moderation-report-created': renderCommunityModerationReportCreated,
+	'community-moderation-report-retracted': renderCommunityModerationReportRetracted,
 	'submission-status-updated': renderSubmissionUpdated,
 };
diff --git a/client/utils/activity/renderers/member.tsx b/client/utils/activity/renderers/member.tsx
index f9361e3d8b..09d29925c3 100644
--- a/client/utils/activity/renderers/member.tsx
+++ b/client/utils/activity/renderers/member.tsx
@@ -1,5 +1,4 @@
 import type {
-	CommunityModerationReportCreatedActivityItem,
 	MemberCreatedActivityItem,
 	MemberRemovedActivityItem,
 	MemberUpdatedActivityItem,
@@ -7,7 +6,7 @@ import type {
 
 import React from 'react';
 
-import { communityTitle, memberTitle, scopeTitle } from 'utils/activity/titles';
+import { memberTitle, scopeTitle } from 'utils/activity/titles';
 
 import { itemRenderer } from './itemRenderer';
 
@@ -70,36 +69,3 @@ export const renderMemberRemoved = itemRenderer<MemberRemovedActivityItem, Title
 		);
 	},
 });
-
-const reportedUserTitle = (
-	item: CommunityModerationReportCreatedActivityItem,
-	context: Parameters<typeof memberTitle>[1],
-) => {
-	const userId = item.payload.userId;
-	if (userId) {
-		const user = context.associations.user[userId];
-		if (user) {
-			return { title: user.fullName, href: `/user/${user.slug}` };
-		}
-	}
-	return { title: 'unknown user' };
-};
-
-export const renderCommunityModerationReportCreated = itemRenderer<
-	CommunityModerationReportCreatedActivityItem,
-	'reportedUser' | 'community'
->({
-	icon: 'flag',
-	titleRenderers: {
-		reportedUser: reportedUserTitle,
-		community: communityTitle,
-	},
-	message: ({ titles }) => {
-		const { actor, reportedUser, community } = titles;
-		return (
-			<>
-				{actor} flagged {reportedUser} in {community}
-			</>
-		);
-	},
-});
diff --git a/client/utils/activity/renderers/moderation.tsx b/client/utils/activity/renderers/moderation.tsx
new file mode 100644
index 0000000000..c9ae899ef8
--- /dev/null
+++ b/client/utils/activity/renderers/moderation.tsx
@@ -0,0 +1,99 @@
+import type {
+	CommunityModerationReportCreatedActivityItem,
+	CommunityModerationReportRetractedActivityItem,
+	ModerationReportReason,
+} from 'types';
+
+import type { ActivityRenderContext } from '../types';
+
+import React from 'react';
+
+import { communityTitle } from 'utils/activity/titles';
+import { getPubFromContext } from 'utils/activity/titles/util';
+import { getDashUrl } from 'utils/dashboard';
+import { getReasonLabel } from 'utils/moderationReasons';
+
+import { itemRenderer } from './itemRenderer';
+
+type ModerationReportItem =
+	| CommunityModerationReportCreatedActivityItem
+	| CommunityModerationReportRetractedActivityItem;
+
+const reportedUserTitle = (item: ModerationReportItem, context: ActivityRenderContext) => {
+	const userId = item.payload.userId;
+	if (!userId) return { title: 'unknown user' };
+	const user = context.associations.user[userId];
+	if (!user) return { title: 'unknown user' };
+	return { title: user.fullName, href: `/user/${user.slug}` };
+};
+
+const buildExcerpt = (options: { item: ModerationReportItem; context: ActivityRenderContext }) => {
+	const { item } = options;
+	const { reason, sourcePubId } = item.payload;
+	const parts: React.ReactNode[] = [];
+
+	if (reason) {
+		parts.push(
+			<span key="reason">
+				Reason: <strong>{getReasonLabel(reason as ModerationReportReason)}</strong>
+			</span>,
+		);
+	}
+
+	if (sourcePubId) {
+		const pub = getPubFromContext(sourcePubId, options.context);
+		if (pub) {
+			parts.push(
+				<span key="pub">
+					{' '}
+					&middot; Source:{' '}
+					<a href={getDashUrl({ pubSlug: pub.slug })}>
+						<em>{pub.title}</em>
+					</a>
+				</span>,
+			);
+		}
+	}
+
+	if (parts.length === 0) return null;
+	return <span>{parts}</span>;
+};
+
+export const renderCommunityModerationReportCreated = itemRenderer<
+	CommunityModerationReportCreatedActivityItem,
+	'reportedUser' | 'community'
+>({
+	icon: 'flag',
+	titleRenderers: {
+		reportedUser: reportedUserTitle,
+		community: communityTitle,
+	},
+	message: ({ titles }) => {
+		const { actor, reportedUser, community } = titles;
+		return (
+			<>
+				{actor} banned {reportedUser} from {community}
+			</>
+		);
+	},
+	excerpt: buildExcerpt,
+});
+
+export const renderCommunityModerationReportRetracted = itemRenderer<
+	CommunityModerationReportRetractedActivityItem,
+	'reportedUser' | 'community'
+>({
+	icon: 'flag',
+	titleRenderers: {
+		reportedUser: reportedUserTitle,
+		community: communityTitle,
+	},
+	message: ({ titles }) => {
+		const { actor, reportedUser, community } = titles;
+		return (
+			<>
+				{actor} unbanned {reportedUser} from {community}
+			</>
+		);
+	},
+});
diff --git a/server/activityItem/__tests__/fetch.test.ts b/server/activityItem/__tests__/fetch.test.ts
index f65cb9fd53..0fa93c1a97 100644
--- a/server/activityItem/__tests__/fetch.test.ts
+++ b/server/activityItem/__tests__/fetch.test.ts
@@ -160,11 +160,11 @@ describe('fetchActivityItems', () => {
 
 	it('fetches items for community-moderation-report-created', async () => {
 		const { actor, loudmouth, community } = models;
-		await createCommunityModerationReportCreatedActivityItem(
-			actor.id,
-			community.id,
-			loudmouth.id,
-		);
+		await createCommunityModerationReportCreatedActivityItem({
+			actorId: actor.id,
+			communityId: community.id,
+			reportedUserId: loudmouth.id,
+		});
 		const {
 			activityItems: [reportItem],
 			associations,
diff --git a/server/activityItem/api.ts b/server/activityItem/api.ts
index ad888ee297..199c3f2bf5 100644
--- a/server/activityItem/api.ts
+++ b/server/activityItem/api.ts
@@ -1,4 +1,4 @@
-import type { ActivityFilter, ScopeId } from 'types';
+import type { ActivityFilter, ActivityItemKind, ScopeId } from 'types';
 
 import { Router } from 'express';
 
@@ -10,6 +10,11 @@ import { fetchActivityItems } from './fetch';
 
 export const router = Router();
 
+const moderationKinds: ActivityItemKind[] = [
+	'community-moderation-report-created',
+	'community-moderation-report-retracted',
+];
+
 const unwrapRequest = (req) => {
 	const { body, user } = req;
 	const { scope, offset, filters, limit } = body;
@@ -27,14 +32,15 @@ export const activityItemRouter = Router().post(
 	wrap(async (req, res) => {
 		const { scope, offset, limit, userId, filters } = unwrapRequest(req);
 		const {
-			activePermissions: { canView },
+			activePermissions: { canView, canAdminCommunity },
 		} = await getScope({ loginId: userId, ...scope });
 
 		if (!canView) {
 			throw new ForbiddenError();
 		}
 
-		const result = await fetchActivityItems({ limit, offset, scope, filters });
+		const excludeKinds = canAdminCommunity ? undefined : moderationKinds;
+		const result = await fetchActivityItems({ limit, offset, scope, filters, excludeKinds });
 		res.status(200).json(result);
 	}),
 );
diff --git a/server/activityItem/fetch.ts b/server/activityItem/fetch.ts
index 76899b2671..94457d4556 100644
--- a/server/activityItem/fetch.ts
+++ b/server/activityItem/fetch.ts
@@ -44,6 +44,7 @@ type FetchActivityItemsOptions = {
 	filters?: ActivityFilter[];
 	limit?: number;
 	offset?: number;
+	excludeKinds?: types.ActivityItemKind[];
 };
 
 type SequelizeFilter = Partial<Record<keyof types.ActivityItem, any>>;
@@ -63,11 +64,7 @@ const memberItemKindFilter = (subFilter: null | SequelizeFilter = null) => {
 
 const filterDefinitions: Record<ActivityFilter, SequelizeFilter | SequelizeFilter[]> = {
 	community: [
-		itemKindFilter([
-			'community-created',
-			'community-updated',
-			'community-moderation-report-created',
-		]),
+		itemKindFilter(['community-created', 'community-updated']),
 		memberItemKindFilter({ pubId: null, collectionId: null }),
 	],
 	collection: {
@@ -78,6 +75,10 @@ const filterDefinitions: Record<ActivityFilter, SequelizeFilter | SequelizeFilte
 		pubId: { [Op.not]: null },
 	},
 	member: memberItemKindFilter(),
+	moderation: itemKindFilter([
+		'community-moderation-report-created',
+		'community-moderation-report-retracted',
+	]),
 	review: itemKindFilter([
 		'pub-review-created',
 		'pub-review-updated',
@@ -128,8 +129,11 @@ const applyFiltersToWhereQuery = (whereQuery: any, filters: ActivityFilter[]) =>
 	return whereQuery;
 };
 
-const fetchActivityItemModels = async (options: Required<FetchActivityItemsOptions>) => {
-	const { scope, limit, offset, since } = options;
+const fetchActivityItemModels = async (
+	options: Required<Omit<FetchActivityItemsOptions, 'excludeKinds'>> &
+		Pick<FetchActivityItemsOptions, 'excludeKinds'>,
+) => {
+	const { scope, limit, offset, since, excludeKinds } = options;
 	const whereQuery = {
 		...(since && {
 			timestamp: {
@@ -138,6 +142,9 @@ const fetchActivityItemModels = async (options: Required<FetchActivityItemsOptio
 		}),
 		communityId: scope.communityId,
 		...(await getWhereQueryForChildScopes(scope)),
+		...(excludeKinds?.length && {
+			kind: { [Op.notIn]: excludeKinds },
+		}),
 	};
 	const models = await ActivityItem.findAll({
 		...(limit && { limit }),
@@ -234,8 +241,14 @@ const getActivityItemAssociationIds = (
 			item.kind === 'page-removed'
 		) {
 			page.add(item.payload.page.id);
-		} else if (item.kind === 'community-moderation-report-created') {
+		} else if (
+			item.kind === 'community-moderation-report-created' ||
+			item.kind === 'community-moderation-report-retracted'
+		) {
 			user.add(item.payload.userId);
+			if (item.payload.sourcePubId) {
+				pub.add(item.payload.sourcePubId);
+			}
 		}
 	});
 	return associationIds;
@@ -327,8 +340,15 @@ export const fetchAssociationsForActivityItems = async (
 export const fetchActivityItems = async (
 	options: FetchActivityItemsOptions,
 ): Promise<ActivityItemsFetchResult> => {
-	const { offset = 0, limit = 0, scope, filters = [], since = '' } = options;
-	const activityItems = await fetchActivityItemModels({ since, offset, limit, scope, filters });
+	const { offset = 0, limit = 0, scope, filters = [], since = '', excludeKinds } = options;
+	const activityItems = await fetchActivityItemModels({
+		since,
+		offset,
+		limit,
+		scope,
+		filters,
+		excludeKinds,
+	});
 	const associations = await fetchAssociationsForActivityItems(activityItems, options.scope);
 
 	return { activityItems, associations, fetchedAllItems: activityItems.length < limit };
diff --git a/server/activityItem/queries.ts b/server/activityItem/queries.ts
index d041cfb1f8..3f2f46e12c 100644
--- a/server/activityItem/queries.ts
+++ b/server/activityItem/queries.ts
@@ -100,24 +100,89 @@ const buildMemberActivityItemParams = <
 	};
 };
 
+type ModerationReportActivityOptions = {
+	actorId: null | string;
+	communityId: string;
+	reportedUserId: string;
+	reason?: types.ModerationReportReason | null;
+	sourceThreadCommentId?: string | null;
+};
+
+const resolveModerationReportSource = async (sourceThreadCommentId?: string | null) => {
+	if (!sourceThreadCommentId) return {};
+	const comment = await ThreadComment.findOne({
+		where: { id: sourceThreadCommentId },
+		raw: true,
+		include: [
+			{
+				model: Thread,
+				as: 'thread',
+				attributes: ['id'],
+				include: [
+					{
+						model: Discussion,
+						as: 'discussion',
+						attributes: ['id'],
+						include: [
+							{
+								model: Pub,
+								as: 'pub',
+								attributes: ['slug', 'id', 'title'],
+							},
+						],
+					},
+				],
+			},
+		],
+		useMaster: true,
+	});
+	if (!comment) return { sourceThreadCommentId };
+
+	const pubId = comment['thread.discussion.pub.id'];
+	const pubTitle = comment['thread.discussion.pub.title'];
+
+	return {
+		sourceThreadCommentId,
+		sourcePubId: pubId,
+		sourcePubTitle: pubTitle,
+	};
+};
+
+const buildModerationPayload = async (options: ModerationReportActivityOptions) => {
+	const { communityId, reportedUserId, reason, sourceThreadCommentId } = options;
+	const [community, source] = await Promise.all([
+		Community.findOne({ where: { id: communityId }, useMaster: true }).then(expect),
+		resolveModerationReportSource(sourceThreadCommentId),
+	]);
+	return {
+		userId: reportedUserId,
+		community: { title: community.title },
+		reason: reason ?? null,
+		...source,
+	};
+};
+
 export const createCommunityModerationReportCreatedActivityItem = async (
-	actorId: null | string,
-	communityId: string,
-	reportedUserId: string,
+	options: ModerationReportActivityOptions,
 ) => {
-	const community = expect(
-		await Community.findOne({ where: { id: communityId }, useMaster: true }),
-	);
+	const payload = await buildModerationPayload(options);
 	return createActivityItem({
-		actorId,
+		actorId: options.actorId,
 		kind: 'community-moderation-report-created' as const,
-		communityId,
-		payload: {
-			userId: reportedUserId,
-			community: {
-				title: community.title,
-			},
-		},
+		communityId: options.communityId,
+		payload,
+	});
+};
+
+export const createCommunityModerationReportRetractedActivityItem = async (
+	options: ModerationReportActivityOptions,
+) => {
+	const payload = await buildModerationPayload(options);
+	return createActivityItem({
+		actorId: options.actorId,
+		kind: 'community-moderation-report-retracted' as const,
+		communityId: options.communityId,
+		payload,
 	});
 };
 
diff --git a/server/communityModerationReport/api.ts b/server/communityModerationReport/api.ts
index 5a734def86..534fad035f 100644
--- a/server/communityModerationReport/api.ts
+++ b/server/communityModerationReport/api.ts
@@ -4,6 +4,7 @@ import { Community, User } from 'server/models';
 import { notify } from 'server/spamTag/notifications';
 import { canManipulateSpamTags } from 'server/spamTag/permissions';
 import { upsertSpamTag } from 'server/spamTag/userQueries';
+import { isUserSuperAdmin } from 'server/user/queries';
 import { ForbiddenError, NotFoundError } from 'server/utils/errors';
 import { getScope } from 'server/utils/queryHelpers';
 import { wrap } from 'server/wrap';
@@ -33,6 +34,11 @@ router.post(
 			throw new ForbiddenError();
 		}
 
+		const targetIsSuperAdmin = await isUserSuperAdmin({ userId });
+		if (targetIsSuperAdmin) {
+			return res.status(403).json({ error: 'Cannot ban a platform administrator' });
+		}
+
 		const [flaggedUser, actor, community, { spamTag }] = await Promise.all([
 			User.findByPk(userId, { attributes: ['id', 'email', 'fullName', 'slug'] }),
 			User.findByPk(actorId, { attributes: ['id', 'email', 'fullName', 'slug'] }),
diff --git a/server/communityModerationReport/hooks.ts b/server/communityModerationReport/hooks.ts
index 0e7162814a..a8195eba78 100644
--- a/server/communityModerationReport/hooks.ts
+++ b/server/communityModerationReport/hooks.ts
@@ -1,13 +1,34 @@
-import { createCommunityModerationReportCreatedActivityItem } from 'server/activityItem/queries';
+import {
+	createCommunityModerationReportCreatedActivityItem,
+	createCommunityModerationReportRetractedActivityItem,
+} from 'server/activityItem/queries';
 import { CommunityModerationReport } from 'server/models';
 import { defer } from 'server/utils/deferred';
 
+const buildOptions = (report: CommunityModerationReport) => ({
+	actorId: report.actorId,
+	communityId: report.communityId,
+	reportedUserId: report.userId,
+	reason: report.reason,
+	sourceThreadCommentId: report.sourceThreadCommentId,
+});
+
 CommunityModerationReport.afterCreate(async (report) => {
 	defer(async () => {
-		await createCommunityModerationReportCreatedActivityItem(
-			report.actorId,
-			report.communityId,
-			report.userId,
-		);
+		await createCommunityModerationReportCreatedActivityItem(buildOptions(report));
 	});
 });
+
+CommunityModerationReport.afterUpdate(async (report) => {
+	const previousStatus = report.previous('status');
+	if (previousStatus === 'active' && report.status === 'retracted') {
+		defer(async () => {
+			await createCommunityModerationReportRetractedActivityItem(buildOptions(report));
+		});
+	}
+	if (previousStatus === 'retracted' && report.status === 'active') {
+		defer(async () => {
+			await createCommunityModerationReportCreatedActivityItem(buildOptions(report));
+		});
+	}
+});
diff --git a/server/middleware/communityModerationGuard.ts b/server/middleware/communityModerationGuard.ts
index cb5eca9502..e4afccc031 100644
--- a/server/middleware/communityModerationGuard.ts
+++ b/server/middleware/communityModerationGuard.ts
@@ -45,7 +45,7 @@ export const communityModerationGuard = () => {
 		return res.status(403).json({
 			error: 'communityBanned',
 			message:
-				'You have been flagged by the administrators of this community and cannot perform this action.',
+				'You have been banned by the administrators of this community and cannot perform this action.',
 		});
 	};
 };
diff --git a/server/routes/dashboardActivity.tsx b/server/routes/dashboardActivity.tsx
index c4c675dfef..4d9f178362 100644
--- a/server/routes/dashboardActivity.tsx
+++ b/server/routes/dashboardActivity.tsx
@@ -1,3 +1,5 @@
+import type { ActivityItemKind } from 'types';
+
 import React from 'react';
 
 import { Router } from 'express';
@@ -9,6 +11,11 @@ import { getInitialData } from 'server/utils/initData';
 import { hostIsValid } from 'server/utils/routes';
 import { generateMetaComponents, renderToNodeStream } from 'server/utils/ssr';
 
+const moderationKinds: ActivityItemKind[] = [
+	'community-moderation-report-created',
+	'community-moderation-report-retracted',
+];
+
 export const router = Router();
 
 router.get(
@@ -23,7 +30,7 @@ router.get(
 			const {
 				scopeData: {
 					scope,
-					activePermissions: { canView },
+					activePermissions: { canView, canAdminCommunity },
 				},
 			} = initialData;
 
@@ -35,9 +42,12 @@ router.get(
 				throw new ForbiddenError();
 			}
 
-			const activityData = await fetchActivityItems({ scope, limit: 50 });
-
-			console.log('activityData', activityData);
+			const excludeKinds = canAdminCommunity ? undefined : moderationKinds;
+			const activityData = await fetchActivityItems({
+				scope,
+				limit: 50,
+				excludeKinds,
+			});
 
 			return renderToNodeStream(
 				res,
diff --git a/server/spamTag/api.ts b/server/spamTag/api.ts
index 71a23402cf..5341570146 100644
--- a/server/spamTag/api.ts
+++ b/server/spamTag/api.ts
@@ -4,6 +4,7 @@ import { Router } from 'express';
 
 import { notifyReportersOfCommunityFlagResolution } from 'server/communityModerationReport/queries';
 import { CommunityModerationReport, User } from 'server/models';
+import { isUserSuperAdmin } from 'server/user/queries';
 import { ForbiddenError } from 'server/utils/errors';
 import { wrap } from 'server/wrap';
 import { expect } from 'utils/assert';
@@ -38,6 +39,16 @@ router.put(
 		if (!canUpdate) {
 			throw new ForbiddenError();
 		}
+
+		if (status === 'confirmed-spam') {
+			const targetIsSuperAdmin = await isUserSuperAdmin({ userId });
+			if (targetIsSuperAdmin) {
+				return res
+					.status(403)
+					.json({ error: 'Cannot mark a platform administrator as spam' });
+			}
+		}
+
 		const actorId = req.user?.id;
 		const actorName = (req.user as any)?.fullName ?? 'Unknown';
 		const fields =
diff --git a/types/activity/communityModerationReport.ts b/types/activity/communityModerationReport.ts
index 6dc7120d60..c93487bea8 100644
--- a/types/activity/communityModerationReport.ts
+++ b/types/activity/communityModerationReport.ts
@@ -1,13 +1,29 @@
+import type { ModerationReportReason } from '../spam';
 import type { InsertableActivityItemBase } from './base';
 
-export type CommunityModerationReportCreatedActivityItem = InsertableActivityItemBase & {
-	kind: 'community-moderation-report-created';
+type CommunityModerationReportActivityItemBase = InsertableActivityItemBase & {
 	payload: {
 		userId: string;
 		community: {
 			title: string;
 		};
+		reason?: ModerationReportReason | null;
+		sourceThreadCommentId?: string | null;
+		sourcePubId?: string | null;
+		sourcePubTitle?: string | null;
 	};
 };
 
-export type CommunityModerationReportActivityItem = CommunityModerationReportCreatedActivityItem;
+export type CommunityModerationReportCreatedActivityItem =
+	CommunityModerationReportActivityItemBase & {
+		kind: 'community-moderation-report-created';
+	};
+
+export type CommunityModerationReportRetractedActivityItem =
+	CommunityModerationReportActivityItemBase & {
+		kind: 'community-moderation-report-retracted';
+	};
+
+export type CommunityModerationReportActivityItem =
+	| CommunityModerationReportCreatedActivityItem
+	| CommunityModerationReportRetractedActivityItem;
diff --git a/types/activity/filters.ts b/types/activity/filters.ts
index 88e364fb69..357b27f93d 100644
--- a/types/activity/filters.ts
+++ b/types/activity/filters.ts
@@ -3,6 +3,7 @@ export type ActivityFilter =
 	| 'community'
 	| 'discussion'
 	| 'member'
+	| 'moderation'
 	| 'page'
 	| 'pub'
 	| 'pubEdge'
diff --git a/utils/activity/titles/community.ts b/utils/activity/titles/community.ts
index 68d9588a1e..04de2b7deb 100644
--- a/utils/activity/titles/community.ts
+++ b/utils/activity/titles/community.ts
@@ -1,6 +1,7 @@
 import type {
 	CommunityCreatedActivityItem,
 	CommunityModerationReportCreatedActivityItem,
+	CommunityModerationReportRetractedActivityItem,
 	CommunityUpdatedActivityItem,
 	FacetsActivityItem,
 	MemberActivityItem,
@@ -15,6 +16,7 @@ import { getCommunityFromContext } from './util';
 type AcceptedItem =
 	| CommunityCreatedActivityItem
 	| CommunityModerationReportCreatedActivityItem
+	| CommunityModerationReportRetractedActivityItem
 	| CommunityUpdatedActivityItem
 	| MemberActivityItem
 	| FacetsActivityItem;
diff --git a/utils/activity/titles/pub.tsx b/utils/activity/titles/pub.tsx
index e542d41446..31ee97bde1 100644
--- a/utils/activity/titles/pub.tsx
+++ b/utils/activity/titles/pub.tsx
@@ -2,6 +2,7 @@ import type { TitleRenderer } from 'client/utils/activity/types';
 import type {
 	CollectionPubCreatedActivityItem,
 	CollectionPubRemovedActivityItem,
+	CommunityModerationReportCreatedActivityItem,
 	FacetsActivityItem,
 	MemberActivityItem,
 	PubActivityItem,
diff --git a/utils/moderationReasons.ts b/utils/moderationReasons.ts
new file mode 100644
index 0000000000..7395defd34
--- /dev/null
+++ b/utils/moderationReasons.ts
@@ -0,0 +1,12 @@
+import type { ModerationReportReason } from 'types';
+
+export const moderationReasonLabels: Record<ModerationReportReason, string> = {
+	'spam-content': 'Spam',
+	'hateful-language': 'Hateful language',
+	harassment: 'Harassment',
+	impersonation: 'Impersonation',
+	other: 'Other',
+};
+
+export const getReasonLabel = (reason: ModerationReportReason): string =>
+	moderationReasonLabels[reason] ?? reason;

From 885ae76a367abd97b7b7896ed2b31e70a7ee0e24 Mon Sep 17 00:00:00 2001
From: "Thomas F. K. Jorna" <hello@tefkah.com>
Date: Mon, 9 Mar 2026 19:31:21 +0100
Subject: [PATCH 10/10] fix: email

---
 server/spamTag/notifications/email.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/spamTag/notifications/email.ts b/server/spamTag/notifications/email.ts
index 29cf6ada0e..e805f2a416 100644
--- a/server/spamTag/notifications/email.ts
+++ b/server/spamTag/notifications/email.ts
@@ -7,7 +7,7 @@ import { getSuperAdminTabUrl } from 'utils/superAdmin';
 
 import { buildReasonText, getSpamDashUrl } from './shared';
 
-export const DEV_TEAM_EMAIL = 'other@tefkah.com';
+export const DEV_TEAM_EMAIL = 'dev@pubpub.org';
 
 export const sendSpamBanEmail = ({ toEmail, userName }: { toEmail: string; userName: string }) => {
 	return sendEmail({