chore: 发布 Docker 镜像版本 1.1.7

Co-authored-by: Cursor <cursoragent@cursor.com>

Makefile

@@ -5,7 +5,7 @@ APP_NAME    := jiang13
 MAIN_PKG    := ./cmd/jiang13
 BUILD_DIR   := dist
 DEV_DATA_DIR := dist/data
-VERSION     := 1.1.5
+VERSION     := 1.1.7
 LDFLAGS     := -s -w -X main.version=$(VERSION)
 REGISTRY_IMAGE := hangzhang714128/jiang13-forum
 

README.md

@@ -20,6 +20,7 @@
 [快速开始](#-快速开始) ·
 [界面预览](#-界面预览) ·
 [功能亮点](#-功能亮点) ·
+[更新日志](docs/site-posts/changelog.md) ·
 [路线图](ROADMAP.md) ·
 [参与贡献](CONTRIBUTING.md)
 
@@ -172,6 +173,11 @@ make compose-up
 
 浏览器打开 `http://localhost:3000/register` 注册；**首个用户自动成为管理员**。
 
+版本变更与升级说明见 **[更新日志](docs/site-posts/changelog.md)**。Docker 与 Windows / Linux 单文件共用同一版本号。
+
+- Docker 标签：[hub.docker.com/r/hangzhang714128/jiang13-forum/tags](https://hub.docker.com/r/hangzhang714128/jiang13-forum/tags)
+- 预编译包：[Gitea Releases](https://git.iioio.com/freefire/jiang13-forum/releases)
+
 **拉取已构建镜像（Docker Hub）：**
 
 ```bash
@@ -206,15 +212,15 @@ docker run -d --name jiang13 \
 docker login
 .\build.bat -Target docker          # Windows
 # make docker                       # Linux/macOS
-docker push hangzhang714128/jiang13-forum:1.1.5
+docker push hangzhang714128/jiang13-forum:1.1.7
 docker push hangzhang714128/jiang13-forum:latest
 ```
 
 或直接构建：
 
 ```bash
-docker build --build-arg VERSION=1.1.5 -t hangzhang714128/jiang13-forum:1.1.5 -t hangzhang714128/jiang13-forum:latest .
+docker build --build-arg VERSION=1.1.7 -t hangzhang714128/jiang13-forum:1.1.7 -t hangzhang714128/jiang13-forum:latest .
-docker push hangzhang714128/jiang13-forum:1.1.5
+docker push hangzhang714128/jiang13-forum:1.1.7
 docker push hangzhang714128/jiang13-forum:latest
 ```
 
@@ -239,7 +245,29 @@ docker push hangzhang714128/jiang13-forum:latest
 
 ### 3. 直接启动（二进制）
 
-把二进制放到目标目录后直接运行（首次会在同目录生成 `app.ini`）：
+不想自己编译时，从 [Gitea Releases](https://git.iioio.com/freefire/jiang13-forum/releases) 下载与 Docker 同版本号的文件即可：
+
+| 文件 | 平台 |
+|------|------|
+| `jiang13-*-windows-amd64.exe` | Windows x64 |
+| `jiang13-*-linux-amd64` | Linux x64 |
+
+当前 **1.1.7：** [Windows](https://git.iioio.com/freefire/jiang13-forum/releases/download/v1.1.7/jiang13-1.1.7-windows-amd64.exe) · [Linux](https://git.iioio.com/freefire/jiang13-forum/releases/download/v1.1.7/jiang13-1.1.7-linux-amd64)
+
+把文件放到目标目录后直接运行（首次会在同目录生成 `app.ini`）：
+
+```bash
+# Windows
+.\jiang13-1.1.7-windows-amd64.exe
+# 或改名为 jiang13.exe 后：
+.\jiang13.exe
+
+# Linux
+chmod +x jiang13-1.1.7-linux-amd64
+./jiang13-1.1.7-linux-amd64
+```
+
+本地刚编译的产物在 `dist/`：
 
 ```bash
 # Windows

build.ps1

@@ -12,7 +12,7 @@ $AppName = 'jiang13'
 $MainPkg = './cmd/jiang13'
 $BuildDir = 'dist'
 $DevDataDir = 'dist/data'
-$Version = '1.1.5'
+$Version = '1.1.7'
 $RegistryImage = 'hangzhang714128/jiang13-forum'
 $Ldlags = "-s -w -X main.version=$Version"
 

cmd/jiang13/program.go

@@ -12,6 +12,7 @@ import (
 	"github.com/kardianos/service"
 
 	"git.iioio.com/freefire/jiang13-forum/config"
+	forumsvc "git.iioio.com/freefire/jiang13-forum/service"
 	"git.iioio.com/freefire/jiang13-forum/model"
 	"git.iioio.com/freefire/jiang13-forum/router"
 )
@@ -78,6 +79,9 @@ func (p *program) setup() error {
 	if err := model.InitDB(cfg.DBPath()); err != nil {
 		return fmt.Errorf("数据库初始化失败: %w", err)
 	}
+	if err := forumsvc.BackfillModerationNotifyRefs(); err != nil {
+		log.Printf("待审通知关联字段回填警告: %v", err)
+	}
 	if err := model.InitMonitorDB(cfg.MonitorDBPath()); err != nil {
 		return fmt.Errorf("监控库初始化失败: %w", err)
 	}

docs/site-posts/README.md

@@ -18,6 +18,16 @@
 
 把原先分篇的「上手 / 功能 / 部署」三帖 **删除**，避免与长文重复。
 
+## 自定义单页（推荐）
+
+站务帖之外，建议在后台 **单页管理** 发一篇更新日志，方便 Docker / Windows 用户对照版本：
+
+| 文件 | 标题 | slug | 操作 |
+| --- | --- | --- | --- |
+| [changelog.md](./changelog.md) | 更新日志 | `changelog` | 发布；页脚展示（可选侧栏导航） |
+
+访问路径：`/page/changelog`。
+
 ## 可选短文
 
 若站务区希望不止一篇，见 [optional.md](./optional.md)：

docs/site-posts/changelog.md

@@ -0,0 +1,160 @@
+# 更新日志
+
+> 建议标题：更新日志  
+> 建议 slug：`changelog`  
+> 建议路径：`/page/changelog`  
+> 建议操作：后台「单页管理」新建并发布；勾选「页脚展示」（可选「侧栏导航」）  
+> 复制正文时：从下方第一个 `---` **之后**开始粘贴（Markdown 模式）
+
+---
+
+Docker 镜像、Windows exe、Linux 单文件 **共用同一版本号**。有新版本时，以本页为准。
+
+**当前版本：1.1.7**（2026-09-02）
+
+## 去哪看新版本
+
+| 渠道 | 看什么 | 地址 |
+| --- | --- | --- |
+| 本页 | 版本号、变更说明、升级注意 | 本站 `/page/changelog` |
+| Docker | 镜像标签（`latest` 与 `1.1.x`） | [Docker Hub · Tags](https://hub.docker.com/r/hangzhang714128/jiang13-forum/tags) |
+| Windows / Linux | 预编译单文件（与 Docker 同版本） | [Gitea Releases](https://git.iioio.com/freefire/jiang13-forum/releases) |
+| 源码 | 提交记录与自行编译 | [Gitea 仓库](https://git.iioio.com/freefire/jiang13-forum) |
+
+**1.1.7 直接下载：**
+
+- Windows x64：[jiang13-1.1.7-windows-amd64.exe](https://git.iioio.com/freefire/jiang13-forum/releases/download/v1.1.7/jiang13-1.1.7-windows-amd64.exe)
+- Linux x64：[jiang13-1.1.7-linux-amd64](https://git.iioio.com/freefire/jiang13-forum/releases/download/v1.1.7/jiang13-1.1.7-linux-amd64)
+- 校验文件：[SHA256SUMS.txt](https://git.iioio.com/freefire/jiang13-forum/releases/download/v1.1.7/SHA256SUMS.txt)
+
+拉取指定版本镜像：
+
+```bash
+docker pull hangzhang714128/jiang13-forum:1.1.7
+# 或始终跟随最新
+docker pull hangzhang714128/jiang13-forum:latest
+```
+
+Windows：停掉正在跑的进程或服务，用新下载的 exe 覆盖原文件（可改名为 `jiang13.exe`），**不要动**旁边的 `data/` 与 `app.ini`，再启动即可。
+
+Linux：赋予执行权限后放到原目录覆盖，同样保留 `data/` 与 `app.ini`。
+
+## 升级注意
+
+- 一般只需换镜像或换 exe，数据目录向后兼容。
+- Docker 请继续挂载原来的 `/data` 卷，切勿新建空目录当「升级」。
+- 升级后若页面样式异常，强制刷新浏览器（Ctrl+F5）。程序也会在前端资源失效时自动硬刷新。
+
+---
+
+## 1.1.7 — 2026-09-02
+
+私信与开源展柜体验升级，待审通知的审核态更及时。
+
+**新增 / 调整**
+
+- 私信改为飞书风布局：缩略图表情/图片、按会话草稿、用户搜索发起会话
+- 主页「发私信」直达消息页对应会话
+- 开源展柜改为目录式 UI，空列表不再粘滞
+- 消息页体验重构；待审通知打开后实时回填审核态
+
+**修复**
+
+- 帖子详情右栏默认头像改为深绿底白字，与列表默认头像配色一致
+
+## 1.1.6 — 2026-09-01
+
+编辑器插入体验与首页默认 Feed 排序更合理。
+
+**新增 / 调整**
+
+- 链接对话框支持网址、链接文字与站内帖子/单页搜索；站内搜索收进「高级选项」，点选同步链接文字
+- 文章与评论共用统一图片插入选择器（上传 / 链接 / 已上传）
+- 链接是否新标签打开交由全站设置，对话框不再单独开关
+- 首页默认「最新」按发帖与最后评论的较晚时间混排，零回复新帖不再沉底
+- 单页详情右侧栏与帖子共用目录布局；三栏主滚动区统一细绿色滚动条
+
+**修复**
+
+- 帖子目录从正文同步派生，避免预取缓存竞态导致空树
+
+## 1.1.5 — 2026-09-01
+
+首页首屏与交互更稳，Feed 排序语义更清楚。  
+本版起同时提供 **Docker 镜像** 与 **Windows / Linux 预编译单文件**（Gitea Release `v1.1.5`）。
+
+**新增 / 调整**
+
+- 首页改为 Go SSR 与 React hydrate（注水）同构，打开首页不再先闪一层空壳再跳内容
+- Feed 排序改为：**新评论 / 新帖子 / 推荐帖**；推荐帖只出精华（featured）
+- 点击排序会强制刷新列表；软刷新时同步站点限额与品牌文案
+- 返回列表用缓存恢复滚动位置，不再重复请求
+
+**修复**
+
+- 发版后软刷新会检测入口壳；chunk（代码分片）404 时自动硬刷新，避免卡在旧页面
+- 软刷新齐套前保留旧画面，避免一点击就把内容卸光
+- 补齐 `/favicon.ico` 与页面 head 图标；拆除爬虫专用 HTML
+- 桌面端隐藏多余的导航汉堡按钮
+- 帖行评论数、列表「共 N 条」右对齐；排序栏数字紧跟标签
+- 手机端 SSR 顶栏 / 页脚与 React 一致，减少闪动
+
+## 1.1.4 — 2026-08-31
+
+网站监控的地理信息与口径更准确。
+
+- 补全 IP2Location（IP 地理位置库）中国城市中文名，同名城市按省消歧
+- 对齐监控概览「双通道」口径文案与诊断抽样说明
+
+## 1.1.3 — 2026-08-31
+
+管理后台可看站点访问情况。
+
+- 新增管理端 **网站监控**：浏览量写入独立 `monitor.db`，与主库分开
+
+## 1.1.2 — 2026-08-31
+
+可选接入官方社区展柜。
+
+- 可选社区上报，以及官方精选展柜（自建站可出现在官方社区列表中）
+
+## 1.1.1 — 2026-08-31
+
+- 评论管理操作收进「更多」菜单，管理员界面更干净
+
+## 1.1.0 — 2026-08-30
+
+一批社区功能与界面整理，版本号从 1.0 跨到 1.1。
+
+**新增**
+
+- 友链申请、独立友链页；页脚左右区域可分别开关
+- 自定义单页（后台「单页管理」，如本页）
+- 投票帖、悬赏帖、抽奖帖
+- 侧栏签到；右侧栏「最新注册」
+- 搜索重设计：筛选面板、结果页 chips（筛选标签）
+- 帖子管理收进右上角菜单；手机端评论输入默认折叠
+
+**优化**
+
+- 首页帖子列表密度与标题样式
+- 开源码桶展示加强，去掉 Feed 顶栏统计
+- 单页编辑、列表留白与友链申请体验
+- 开发与发行版共用 `dist/data` 数据目录，避免两套数据打架
+
+**修复**
+
+- 手机端搜索入口与底部 Sheet（抽屉面板）
+- 占位头像对比度；无头像用户不再误用游客灰底
+- 页面双指缩放锁死，正文原图与灯箱仍可 pinch（捏合）放大
+- 单页正文排版与帖子详情对齐
+
+## 1.0.0 — 2026-08-23
+
+首次发布 Docker 镜像 `hangzhang714128/jiang13-forum:1.0.0`。
+
+当时已包含论坛核心能力：板块与发帖、楼层评论、点赞收藏、私信、TipTap 富文本、贴纸、修订历史、管理后台、OIDC（开放身份连接）/ SSO（单点登录）、邮件验证码、Gitea 仓库同步、SQLite 单二进制部署，以及 Docker 一键运行。
+
+---
+
+之后发版时：Docker 推 `x.y.z` + `latest`，Gitea 打 tag `vx.y.z` 并挂上对应 exe / linux 文件，再把新版本写到本页最上方。

frontend/src/api/client.ts

@@ -419,6 +419,14 @@ export const api = {
     fd.append('image', file);
     return request<{ url: string }>('/api/uploads/image', { method: 'POST', body: fd, headers: {} });
   },
+  /** 当前用户历史上传的帖子图片 */
+  myPostImages: (params?: { page?: number; size?: number }) => {
+    const q = new URLSearchParams();
+    if (params?.page) q.set('page', String(params.page));
+    if (params?.size) q.set('size', String(params.size));
+    const qs = q.toString();
+    return request<MediaListResult>(`/api/uploads/images${qs ? `?${qs}` : ''}`);
+  },
   createPost: (data: {
     board_id: string; title: string; content: string; tags?: string; post_type?: string;
     poll_options?: string; bounty_points?: number; lottery_winner_count?: number;
@@ -656,6 +664,8 @@ export const api = {
   },
   markNotificationsRead: () =>
     request<{ message: string }>('/api/messages/notifications/read', { method: 'POST' }),
+  markMessageRead: (id: number) =>
+    request<{ message: string }>(`/api/messages/${id}/read`, { method: 'POST' }),
   sendMessage: (body: { to_user_id: number; subject?: string; content: string }) =>
     request<{ message: PrivateMessage }>('/api/messages', {
       method: 'POST', body: JSON.stringify(body),

frontend/src/api/types.ts

@@ -224,7 +224,7 @@ export interface FeedSortTab {
 }
 
 export const DEFAULT_FEED_SORT_TABS: FeedSortTab[] = [
-  { id: 'reply', label: '新评论', enabled: true },
+  { id: 'reply', label: '最新', enabled: true },
   { id: 'latest', label: '新帖子', enabled: true },
   { id: 'hot', label: '推荐帖', enabled: true },
 ];
@@ -717,9 +717,13 @@ export interface PrivateMessage {
   to_user_id: number;
   subject: string;
   content: string;
-  kind: 'user' | 'system' | 'reject' | 'report_result' | string;
+  kind: 'user' | 'system' | 'reject' | 'report_result' | 'reply' | 'mention' | 'moderation' | string;
   related_post_id?: number;
   related_report_id?: number;
+  related_comment_id?: number;
+  related_floor?: number;
+  /** 待审目标实时状态：pending|published|rejected|deleted */
+  related_status?: string;
   is_read: boolean;
   created_at: string;
   from_user?: User;

frontend/src/components/ArticleEditor.tsx

@@ -31,7 +31,6 @@ import {
   insertMarkdownLink,
 } from '../utils/markdownFormat';
 import { countWords } from '../utils/text';
-import { api } from '../api/client';
 import { notify } from '@/lib/notify';
 import { MembersOnly } from './editor/MembersOnlyExtension';
 import { ReplyOnly } from './editor/ReplyOnlyExtension';
@@ -40,7 +39,8 @@ import { TabIndent } from './editor/TabIndentExtension';
 import { ArticleImage, type ImageDisplay } from './editor/ArticleImageExtension';
 import { ImageGroup, suggestImageGroupLayout } from './editor/ImageGroupExtension';
 import { ClearFloatParagraph, ClearFloatSync } from './editor/ClearFloatParagraph';
-import { ArticleLinkDialog } from './editor/ArticleLinkDialog';
+import { ArticleLinkDialog, type ArticleLinkConfirm } from './editor/ArticleLinkDialog';
+import { ArticleImagePickerDialog } from './editor/ArticleImagePickerDialog';
 import { ArticleCodeBlockDialog } from './editor/ArticleCodeBlockDialog';
 import { ArticleCodeBlock } from './editor/ArticleCodeBlockExtension';
 import {
@@ -73,6 +73,7 @@ interface Props {
 
 type EditorMode = 'rich' | 'markdown';
 type LinkTarget = 'rich' | 'markdown';
+type ImagePickerTarget = 'rich' | 'markdown';
 type CodeBlockTarget = 'rich' | 'markdown';
 type TableTarget = 'rich' | 'markdown';
 
@@ -167,34 +168,6 @@ function cycleHeading(editor: Editor) {
   editor.chain().focus().toggleHeading({ level: 2 }).run();
 }
 
-/** 触发图片文件选择并上传（支持多选） */
-async function uploadPostImageFiles(multiple = true): Promise<string[]> {
-  return new Promise(resolve => {
-    const input = document.createElement('input');
-    input.type = 'file';
-    input.accept = 'image/jpeg,image/png,image/gif,image/webp';
-    input.multiple = multiple;
-    input.onchange = async () => {
-      const files = [...(input.files ?? [])];
-      if (!files.length) {
-        resolve([]);
-        return;
-      }
-      const urls: string[] = [];
-      for (const file of files) {
-        try {
-          const { url } = await api.uploadPostImage(file);
-          urls.push(url);
-        } catch (e: unknown) {
-          notify.error(e instanceof Error ? e.message : '图片上传失败');
-        }
-      }
-      resolve(urls);
-    };
-    input.click();
-  });
-}
-
 /** 渲染工具栏按钮列表 */
 function renderToolButtons(tools: ToolBtn[]) {
   return tools.map((t, i) => (
@@ -228,7 +201,11 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
   const [markdownSource, setMarkdownSource] = useState('');
   const [linkDialogOpen, setLinkDialogOpen] = useState(false);
   const [linkDialogUrl, setLinkDialogUrl] = useState('');
+  const [linkDialogText, setLinkDialogText] = useState('');
+  const [linkDialogEditing, setLinkDialogEditing] = useState(false);
   const [linkTarget, setLinkTarget] = useState<LinkTarget>('rich');
+  const [imagePickerOpen, setImagePickerOpen] = useState(false);
+  const [imagePickerTarget, setImagePickerTarget] = useState<ImagePickerTarget>('rich');
   const [codeBlockDialogOpen, setCodeBlockDialogOpen] = useState(false);
   const [codeBlockTarget, setCodeBlockTarget] = useState<CodeBlockTarget>('rich');
   const [codeBlockEditing, setCodeBlockEditing] = useState(false);
@@ -262,6 +239,11 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
         openOnClick: false,
         autolink: true,
         defaultProtocol: 'https',
+        // 新标签由全站设置在展示层处理，编辑器不写 target/rel
+        HTMLAttributes: {
+          target: null,
+          rel: null,
+        },
       }),
       ArticleImage.configure({ inline: false, allowBase64: false }),
       ImageGroup,
@@ -393,14 +375,33 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
   const openLinkDialog = useCallback((target: LinkTarget) => {
     if (target === 'rich') {
       if (!editor) return;
-      const prev = editor.getAttributes('link').href as string | undefined;
+      const { from, to, empty } = editor.state.selection;
-      setLinkDialogUrl(prev ?? '');
+      let text = empty ? '' : editor.state.doc.textBetween(from, to, '');
+      let href = '';
+      let editing = false;
+      if (editor.isActive('link')) {
+        const attrs = editor.getAttributes('link');
+        href = (attrs.href as string) || '';
+        editing = Boolean(href);
+        editor.chain().focus().extendMarkRange('link').run();
+        const sel = editor.state.selection;
+        text = editor.state.doc.textBetween(sel.from, sel.to, '') || text;
+      }
+      setLinkDialogUrl(href);
+      setLinkDialogText(text);
+      setLinkDialogEditing(editing);
     } else {
+      const textarea = markdownRef.current;
+      const selected = textarea
+        ? markdownSource.slice(textarea.selectionStart, textarea.selectionEnd)
+        : '';
       setLinkDialogUrl('');
+      setLinkDialogText(selected);
+      setLinkDialogEditing(false);
     }
     setLinkTarget(target);
     setLinkDialogOpen(true);
-  }, [editor]);
+  }, [editor, markdownSource]);
 
   const openCodeBlockDialog = useCallback((target: CodeBlockTarget) => {
     setCodeBlockTarget(target);
@@ -477,11 +478,12 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
     }
   }, [editor]);
 
-  const applyLink = useCallback((url: string) => {
+  const applyLink = useCallback((payload: ArticleLinkConfirm) => {
+    const { url, text } = payload;
     if (linkTarget === 'markdown') {
       const textarea = markdownRef.current;
       if (!textarea || !url) return;
-      insertMarkdownLink(textarea, markdownSource, url, handleMarkdownChange);
+      insertMarkdownLink(textarea, markdownSource, url, handleMarkdownChange, { text });
       return;
     }
     if (!editor) return;
@@ -489,7 +491,31 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
       editor.chain().focus().extendMarkRange('link').unsetLink().run();
       return;
     }
-    editor.chain().focus().extendMarkRange('link').setLink({ href: url }).run();
+    // 新标签行为由全站 open_content_links_in_new_tab 在展示层处理
+    const linkAttrs = { href: url };
+    const { empty } = editor.state.selection;
+    const hasLink = editor.isActive('link');
+    if (!empty || hasLink) {
+      editor.chain().focus().extendMarkRange('link').setLink(linkAttrs).run();
+      const { from, to } = editor.state.selection;
+      const current = editor.state.doc.textBetween(from, to, '');
+      if (text && current !== text) {
+        editor.chain().focus().insertContentAt(
+          { from, to },
+          {
+            type: 'text',
+            text,
+            marks: [{ type: 'link', attrs: linkAttrs }],
+          },
+        ).run();
+      }
+      return;
+    }
+    editor.chain().focus().insertContent({
+      type: 'text',
+      text: text || '链接文字',
+      marks: [{ type: 'link', attrs: linkAttrs }],
+    }).run();
   }, [editor, linkTarget, markdownSource, handleMarkdownChange]);
 
   const removeLink = useCallback(() => {
@@ -497,16 +523,33 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
     editor.chain().focus().extendMarkRange('link').unsetLink().run();
   }, [editor]);
 
-  const setImage = useCallback(async () => {
+  const openImagePicker = useCallback((target: ImagePickerTarget) => {
-    if (!editor) return;
+    setImagePickerTarget(target);
-    const urls = await uploadPostImageFiles(true);
+    setImagePickerOpen(true);
+  }, []);
+
+  const applyImageUrls = useCallback((urls: string[]) => {
     if (!urls.length) return;
+    if (imagePickerTarget === 'markdown') {
+      const textarea = markdownRef.current;
+      if (!textarea) return;
+      if (urls.length === 1) {
+        insertAtCursor(textarea, markdownSource, `\n\n![图片](${urls[0]})\n\n`, handleMarkdownChange);
+        return;
+      }
+      const layout = suggestImageGroupLayout(urls.length);
+      const imgs = urls.map(u => `<img src="${u}" alt="">`).join('');
+      const block = `\n\n<div data-image-group data-layout="${layout}" class="image-group image-group--${layout}">${imgs}</div>\n\n`;
+      insertAtCursor(textarea, markdownSource, block, handleMarkdownChange);
+      return;
+    }
+    if (!editor) return;
     if (urls.length === 1) {
       editor.chain().focus().setImage({ src: urls[0] }).run();
       return;
     }
     editor.chain().focus().insertImageGroup(urls, suggestImageGroupLayout(urls.length)).run();
-  }, [editor]);
+  }, [editor, imagePickerTarget, markdownSource, handleMarkdownChange]);
 
   const setImageDisplay = useCallback((display: ImageDisplay) => {
     if (!editor) return;
@@ -596,21 +639,6 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
     fn(textarea, markdownSource, handleMarkdownChange);
   }, [markdownSource, handleMarkdownChange]);
 
-  const insertMarkdownImage = useCallback(async () => {
-    const textarea = markdownRef.current;
-    if (!textarea) return;
-    const urls = await uploadPostImageFiles(true);
-    if (!urls.length) return;
-    if (urls.length === 1) {
-      insertAtCursor(textarea, markdownSource, `\n\n![图片](${urls[0]})\n\n`, handleMarkdownChange);
-      return;
-    }
-    const layout = suggestImageGroupLayout(urls.length);
-    const imgs = urls.map(u => `<img src="${u}" alt="">`).join('');
-    const block = `\n\n<div data-image-group data-layout="${layout}" class="image-group image-group--${layout}">${imgs}</div>\n\n`;
-    insertAtCursor(textarea, markdownSource, block, handleMarkdownChange);
-  }, [markdownSource, handleMarkdownChange]);
-
   const markdownPreviewHtml = useMemo(
     () => sanitizeHtml(markdownToHtml(markdownSource)),
     [markdownSource],
@@ -637,9 +665,9 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
       { icon: <LinkIcon size={15} />, title: '链接', active: editor.isActive('link'), action: () => openLinkDialog('rich') },
       {
         icon: <ImageIcon size={15} />,
-        title: '上传图片',
+        title: '图片',
-        hint: '可多选；多张自动并排成图组',
+        hint: '上传、链接或从已上传中选择',
-        action: setImage,
+        action: () => openImagePicker('rich'),
       },
       {
         icon: <Columns2 size={15} />,
@@ -732,7 +760,7 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
     }
 
     return tools;
-  }, [editor, enableContentGates, openLinkDialog, openCodeBlockDialog, openTableDialog, setImage, wrapMembersOnly, wrapReplyOnly, wrapPointsOnly, wrapSelectedAsGroup, setImageDisplay]);
+  }, [editor, enableContentGates, openLinkDialog, openCodeBlockDialog, openTableDialog, openImagePicker, wrapMembersOnly, wrapReplyOnly, wrapPointsOnly, wrapSelectedAsGroup, setImageDisplay]);
 
   const buildMarkdownTools = useCallback((): ToolBtn[] => {
     const tools: ToolBtn[] = [
@@ -748,7 +776,12 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
       { icon: <Code size={15} />, title: '代码块', hint: '语言、行号与折叠', action: () => openCodeBlockDialog('markdown') },
       { icon: <TableIcon size={15} />, title: '表格', hint: '插入 GFM 管道表', action: () => openTableDialog('markdown') },
       { icon: <LinkIcon size={15} />, title: '链接', action: () => openLinkDialog('markdown') },
-      { icon: <ImageIcon size={15} />, title: '上传图片', action: insertMarkdownImage },
+      {
+        icon: <ImageIcon size={15} />,
+        title: '图片',
+        hint: '上传、链接或从已上传中选择',
+        action: () => openImagePicker('markdown'),
+      },
     ];
     if (enableContentGates) {
       tools.push(
@@ -776,7 +809,7 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
       );
     }
     return tools;
-  }, [enableContentGates, withMarkdown, openLinkDialog, openCodeBlockDialog, openTableDialog, insertMarkdownImage]);
+  }, [enableContentGates, withMarkdown, openLinkDialog, openCodeBlockDialog, openTableDialog, openImagePicker]);
 
   const tools = mode === 'rich' ? buildRichTools() : buildMarkdownTools();
   const words = mode === 'markdown'
@@ -897,8 +930,15 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
         open={linkDialogOpen}
         onOpenChange={setLinkDialogOpen}
         initialUrl={linkDialogUrl}
+        initialText={linkDialogText}
+        editing={linkDialogEditing}
         onConfirm={applyLink}
-        onRemove={linkTarget === 'rich' && linkDialogUrl ? removeLink : undefined}
+        onRemove={linkTarget === 'rich' && linkDialogEditing ? removeLink : undefined}
+      />
+      <ArticleImagePickerDialog
+        open={imagePickerOpen}
+        onOpenChange={setImagePickerOpen}
+        onInsert={applyImageUrls}
       />
       <ArticleCodeBlockDialog
         open={codeBlockDialogOpen}

frontend/src/components/CommentEditor.tsx

@@ -12,11 +12,11 @@ import {
   List, ListOrdered, Code, Link as LinkIcon, Image as ImageIcon,
 } from 'lucide-react';
 import { POST_CONTENT_PURIFY_CONFIG } from '../utils/postContent';
-import { api } from '../api/client';
-import { notify } from '@/lib/notify';
 import { ArticleCodeBlock } from './editor/ArticleCodeBlockExtension';
 import { ArticleCodeBlockDialog } from './editor/ArticleCodeBlockDialog';
 import { ArticleImage } from './editor/ArticleImageExtension';
+import { ArticleImagePickerDialog } from './editor/ArticleImagePickerDialog';
+import { ArticleLinkDialog, type ArticleLinkConfirm } from './editor/ArticleLinkDialog';
 import { TabIndent } from './editor/TabIndentExtension';
 import type { CodeBlockInsertOptions } from '../utils/codeBlockOptions';
 import { Tooltip } from './ui/Tooltip';
@@ -49,28 +49,6 @@ function isEditorEmpty(editor: Editor): boolean {
   return !hasImage;
 }
 
-/** 触发图片文件选择并上传 */
-async function uploadImageFiles(): Promise<string[]> {
-  return new Promise(resolve => {
-    const input = document.createElement('input');
-    input.type = 'file';
-    input.accept = 'image/jpeg,image/png,image/gif,image/webp';
-    input.multiple = false;
-    input.onchange = async () => {
-      const files = [...(input.files ?? [])];
-      if (!files.length) { resolve([]); return; }
-      try {
-        const { url } = await api.uploadPostImage(files[0]);
-        resolve([url]);
-      } catch (e: unknown) {
-        notify.error(e instanceof Error ? e.message : '图片上传失败');
-        resolve([]);
-      }
-    };
-    input.click();
-  });
-}
-
 const CommentEditor = forwardRef<CommentEditorHandle, Props>(function CommentEditor(
   { value, onChange, placeholder = '说点什么吧…' },
   ref,
@@ -79,6 +57,11 @@ const CommentEditor = forwardRef<CommentEditorHandle, Props>(function CommentEdi
   const lastValueRef = useRef(value);
   const [, setTick] = useState(0);
   const [showSticker, setShowSticker] = useState(false);
+  const [imagePickerOpen, setImagePickerOpen] = useState(false);
+  const [linkDialogOpen, setLinkDialogOpen] = useState(false);
+  const [linkDialogUrl, setLinkDialogUrl] = useState('');
+  const [linkDialogText, setLinkDialogText] = useState('');
+  const [linkDialogEditing, setLinkDialogEditing] = useState(false);
   const [codeBlockDialogOpen, setCodeBlockDialogOpen] = useState(false);
   const [codeBlockEditing, setCodeBlockEditing] = useState(false);
   const [codeBlockInitial, setCodeBlockInitial] = useState<CodeBlockInsertOptions | null>(null);
@@ -99,6 +82,11 @@ const CommentEditor = forwardRef<CommentEditorHandle, Props>(function CommentEdi
         openOnClick: false,
         autolink: true,
         defaultProtocol: 'https',
+        // 新标签由全站设置在展示层处理，编辑器不写 target/rel
+        HTMLAttributes: {
+          target: null,
+          rel: null,
+        },
       }),
       ArticleImage.configure({ inline: true, allowBase64: true }),
       Placeholder.configure({ placeholder }),
@@ -179,11 +167,14 @@ const CommentEditor = forwardRef<CommentEditorHandle, Props>(function CommentEdi
     setShowSticker(false);
   }, [editor]);
 
-  const setImage = useCallback(async () => {
+  const applyImageUrls = useCallback((urls: string[]) => {
-    if (!editor) return;
+    if (!editor || !urls.length) return;
-    const urls = await uploadImageFiles();
+    // 评论为 inline 图，无图组：逐张插入并跟空格，便于光标落在右侧
-    if (!urls.length) return;
+    const nodes = urls.flatMap(src => [
-    editor.chain().focus().setImage({ src: urls[0] }).run();
+      { type: 'image' as const, attrs: { src } },
+      { type: 'text' as const, text: ' ' },
+    ]);
+    editor.chain().focus().insertContent(nodes).run();
   }, [editor]);
 
   const openCodeBlockDialog = useCallback(() => {
@@ -213,23 +204,70 @@ const CommentEditor = forwardRef<CommentEditorHandle, Props>(function CommentEdi
     }).run();
   }, [editor]);
 
-  const setLink = useCallback(() => {
+  const openLinkDialog = useCallback(() => {
     if (!editor) return;
-    const prev = editor.getAttributes('link').href as string | undefined;
+    const { from, to, empty } = editor.state.selection;
-    const url = window.prompt('链接地址', prev ?? 'https://');
+    let text = empty ? '' : editor.state.doc.textBetween(from, to, '');
-    if (url === null) return;
+    let href = '';
+    let editing = false;
+    if (editor.isActive('link')) {
+      const attrs = editor.getAttributes('link');
+      href = (attrs.href as string) || '';
+      editing = Boolean(href);
+      editor.chain().focus().extendMarkRange('link').run();
+      const sel = editor.state.selection;
+      text = editor.state.doc.textBetween(sel.from, sel.to, '') || text;
+    }
+    setLinkDialogUrl(href);
+    setLinkDialogText(text);
+    setLinkDialogEditing(editing);
+    setLinkDialogOpen(true);
+  }, [editor]);
+
+  const applyLink = useCallback((payload: ArticleLinkConfirm) => {
+    if (!editor) return;
+    const { url, text } = payload;
     if (!url) {
       editor.chain().focus().extendMarkRange('link').unsetLink().run();
       return;
     }
-    editor.chain().focus().extendMarkRange('link').setLink({ href: url }).run();
+    // 新标签行为由全站 open_content_links_in_new_tab 在展示层处理
+    const linkAttrs = { href: url };
+    const { empty } = editor.state.selection;
+    const hasLink = editor.isActive('link');
+    if (!empty || hasLink) {
+      editor.chain().focus().extendMarkRange('link').setLink(linkAttrs).run();
+      const { from, to } = editor.state.selection;
+      const current = editor.state.doc.textBetween(from, to, '');
+      if (text && current !== text) {
+        editor.chain().focus().insertContentAt(
+          { from, to },
+          {
+            type: 'text',
+            text,
+            marks: [{ type: 'link', attrs: linkAttrs }],
+          },
+        ).run();
+      }
+      return;
+    }
+    editor.chain().focus().insertContent({
+      type: 'text',
+      text: text || '链接文字',
+      marks: [{ type: 'link', attrs: linkAttrs }],
+    }).run();
+  }, [editor]);
+
+  const removeLink = useCallback(() => {
+    if (!editor) return;
+    editor.chain().focus().extendMarkRange('link').unsetLink().run();
   }, [editor]);
 
   if (!editor) {
     return <div className="comment-editor"><div className="article-editor-bar" /><div className="article-editor-body" /></div>;
   }
 
-  const tools: { icon: React.ReactNode; title: string; active?: boolean; action: () => void; className?: string }[] = [
+  const tools: { icon: React.ReactNode; title: string; hint?: string; active?: boolean; action: () => void; className?: string }[] = [
     { icon: <Bold size={15} />, title: '加粗', active: editor.isActive('bold'), action: () => editor.chain().focus().toggleBold().run() },
     { icon: <Italic size={15} />, title: '斜体', active: editor.isActive('italic'), action: () => editor.chain().focus().toggleItalic().run() },
     { icon: <UnderlineIcon size={15} />, title: '下划线', active: editor.isActive('underline'), action: () => editor.chain().focus().toggleUnderline().run() },
@@ -237,8 +275,13 @@ const CommentEditor = forwardRef<CommentEditorHandle, Props>(function CommentEdi
     { icon: <List size={15} />, title: '无序列表', active: editor.isActive('bulletList'), action: () => editor.chain().focus().toggleBulletList().run() },
     { icon: <ListOrdered size={15} />, title: '有序列表', active: editor.isActive('orderedList'), action: () => editor.chain().focus().toggleOrderedList().run() },
     { icon: <Code size={15} />, title: '代码块', active: editor.isActive('codeBlock'), action: openCodeBlockDialog },
-    { icon: <LinkIcon size={15} />, title: '链接', active: editor.isActive('link'), action: setLink },
+    { icon: <LinkIcon size={15} />, title: '链接', active: editor.isActive('link'), action: openLinkDialog },
-    { icon: <ImageIcon size={15} />, title: '上传图片', action: setImage },
+    {
+      icon: <ImageIcon size={15} />,
+      title: '图片',
+      hint: '上传、链接或从已上传中选择',
+      action: () => setImagePickerOpen(true),
+    },
     { icon: <span className="article-tool-btn__owo">OwO</span>, title: '表情 OwO', active: showSticker, action: () => setShowSticker(v => !v), className: 'article-tool-btn--owo' },
   ];
 
@@ -247,14 +290,14 @@ const CommentEditor = forwardRef<CommentEditorHandle, Props>(function CommentEdi
       <div className="article-editor-bar">
         <div className="article-editor-tools">
           {tools.map((t, i) => (
-            <Tooltip key={i} content={t.title} side="bottom">
+            <Tooltip key={i} content={t.title} hint={t.hint} side="bottom">
               <button
                 ref={i === tools.length - 1 ? stickerBtnRef : undefined}
                 type="button"
                 className={`article-tool-btn${t.active ? ' active' : ''}${t.className ? ` ${t.className}` : ''}`}
                 onMouseDown={e => e.preventDefault()}
                 onClick={t.action}
-                aria-label={t.title}
+                aria-label={t.hint ? `${t.title}，${t.hint}` : t.title}
               >
                 {t.icon}
               </button>
@@ -268,6 +311,20 @@ const CommentEditor = forwardRef<CommentEditorHandle, Props>(function CommentEdi
         </div>
       </div>
       {showSticker && <StickerPicker onSelect={insertSticker} />}
+      <ArticleLinkDialog
+        open={linkDialogOpen}
+        onOpenChange={setLinkDialogOpen}
+        initialUrl={linkDialogUrl}
+        initialText={linkDialogText}
+        editing={linkDialogEditing}
+        onConfirm={applyLink}
+        onRemove={linkDialogEditing ? removeLink : undefined}
+      />
+      <ArticleImagePickerDialog
+        open={imagePickerOpen}
+        onOpenChange={setImagePickerOpen}
+        onInsert={applyImageUrls}
+      />
       <ArticleCodeBlockDialog
         open={codeBlockDialogOpen}
         onOpenChange={setCodeBlockDialogOpen}

frontend/src/components/FeedSortBar.tsx

@@ -15,7 +15,7 @@ import type { FeedSortTab } from '../api/types';
 export type FeedSort = 'latest' | 'reply' | 'hot';
 
 const SORT_META: Record<FeedSort, { hint: string; icon: typeof Clock }> = {
-  reply: { hint: '最近有人评论', icon: MessageCircle },
+  reply: { hint: '按最近活动（发帖或评论）', icon: MessageCircle },
   latest: { hint: '按发帖时间', icon: Clock },
   hot: { hint: '仅展示推荐帖', icon: BadgeCheck },
 };

frontend/src/components/PostAuthorCard.tsx

@@ -9,7 +9,6 @@ import { useAuth } from '../hooks/useAuth';
 import { loginPath } from '../utils/authRedirect';
 import { formatTime } from '../utils/content';
 import { userPath } from '../utils/userPath';
-import ComposeMessageDialog from './ComposeMessageDialog';
 import UserLink from './UserLink';
 
 interface Props {
@@ -28,7 +27,6 @@ export default function PostAuthorCard({
   const { user: me } = useAuth();
   const [profile, setProfile] = useState<UserPublic | null>(null);
   const [stats, setStats] = useState<UserActivityStats | null>(null);
-  const [msgOpen, setMsgOpen] = useState(false);
 
   useEffect(() => {
     if (!author?.id) {
@@ -78,7 +76,7 @@ export default function PostAuthorCard({
       nav(loginPath(profileHref));
       return;
     }
-    setMsgOpen(true);
+    nav(`/messages?peer=${author.id}`);
   };
 
   return (
@@ -159,16 +157,6 @@ export default function PostAuthorCard({
           </Button>
         </div>
       </div>
-
-      {!isSelf && (
-        <ComposeMessageDialog
-          open={msgOpen}
-          onOpenChange={setMsgOpen}
-          toUserId={author.id}
-          toNickname={nick}
-          onSent={() => nav(`/messages?peer=${author.id}`)}
-        />
-      )}
     </div>
   );
 }

frontend/src/components/PostContent.tsx

@@ -1,7 +1,6 @@
-import { useMemo, useCallback, useEffect, useState } from 'react';
+import { useMemo, useCallback, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { renderPostContentHtml } from '../utils/postContent';
-import { extractHeadingsFromHtml, type PostHeading } from '../utils/postHeadings';
 import { loginPath, registerPath } from '../utils/authRedirect';
 import { useForumLimits } from '../hooks/useForumLimits';
 import { notify } from '@/lib/notify';
@@ -12,8 +11,6 @@ interface Props {
   html: string;
   isLoggedIn: boolean;
   className?: string;
-  /** 正文标题树变化时回调（用于侧栏目录） */
-  onHeadingsChange?: (headings: PostHeading[]) => void;
   /** 点击「回复可见」门控的「去回复」 */
   onRequestReply?: () => void;
   /** 积分解锁成功后刷新正文 */
@@ -26,7 +23,6 @@ export default function PostContent({
   html,
   isLoggedIn,
   className = 'post-detail-content',
-  onHeadingsChange,
   onRequestReply,
   onUnlocked,
   postId: postIdProp,
@@ -39,19 +35,12 @@ export default function PostContent({
   const [lightboxAlt, setLightboxAlt] = useState('');
   const [unlocking, setUnlocking] = useState(false);
 
-  const prepared = useMemo(() => {
+  const preparedHtml = useMemo(
-    const rendered = renderPostContentHtml(html, isLoggedIn, {
+    () => renderPostContentHtml(html, isLoggedIn, {
       openLinksInNewTab: limits.open_content_links_in_new_tab,
-    });
+    }),
-    return {
+    [html, isLoggedIn, limits.open_content_links_in_new_tab],
-      html: rendered,
+  );
-      headings: extractHeadingsFromHtml(rendered),
-    };
-  }, [html, isLoggedIn, limits.open_content_links_in_new_tab]);
-
-  useEffect(() => {
-    onHeadingsChange?.(prepared.headings);
-  }, [prepared.headings, onHeadingsChange]);
 
   const openLightbox = useCallback((img: HTMLImageElement) => {
     const full = img.getAttribute('data-full') || img.currentSrc || img.src;
@@ -167,7 +156,7 @@ export default function PostContent({
         className={className}
         onClick={handleClick}
         onKeyDown={handleKeyDown}
-        dangerouslySetInnerHTML={{ __html: prepared.html }}
+        dangerouslySetInnerHTML={{ __html: preparedHtml }}
       />
       <ImageLightbox
         src={lightboxSrc}

frontend/src/components/PullToRefresh.tsx

@@ -31,7 +31,7 @@ function pickScrollEl(): HTMLElement | null {
   const page = document.querySelector<HTMLElement>('.page-wrap:not(.page-wrap--feed)');
   if (page) return page;
 
-  const showcase = document.querySelector<HTMLElement>('.showcase-page');
+  const showcase = document.querySelector<HTMLElement>('.showcase-panel');
   if (showcase) return showcase.closest<HTMLElement>('.main-content') ?? showcase;
 
   const admin = document.querySelector<HTMLElement>('.admin-main');

frontend/src/components/RightPanel.tsx

@@ -232,11 +232,13 @@ export default function RightPanel({
     <div className={`aside-panel-inner${isPostDetail ? ' aside-panel-inner--post-detail' : ''}`}>
       {isPostDetail && (
         <>
-          <PostAuthorCard
+          {postDetail.author?.id ? (
-            author={postDetail.author}
+            <PostAuthorCard
-            publishedAt={postDetail.publishedAt}
+              author={postDetail.author}
-            viewCount={postDetail.viewCount}
+              publishedAt={postDetail.publishedAt}
-          />
+              viewCount={postDetail.viewCount}
+            />
+          ) : null}
           <div className="widget-card widget-card--outline">
             <div className="widget-card-head">
               <ListTree className="widget-card-icon widget-card-icon--outline" aria-hidden />

frontend/src/components/ShowcaseAsideWidget.tsx

@@ -19,12 +19,14 @@ export default function ShowcaseAsideWidget() {
   useEffect(() => {
     let cancelled = false;
     const hit = getSessionSnapshot<CommunityShowcaseItem[]>(SHOWCASE_KEY);
-    if (hit !== undefined) {
+    // 非空快照直接用；空数组可能是启动竞态假空，仍再拉
+    if (hit !== undefined && hit.length > 0) {
       setItems(hit);
       setLoading(false);
       return;
     }
-    setLoading(true);
+    if (hit !== undefined) setItems(hit);
+    setLoading(hit === undefined);
     api.communityShowcase()
       .then((r) => {
         if (cancelled) return;
@@ -33,10 +35,8 @@ export default function ShowcaseAsideWidget() {
         setItems(next);
       })
       .catch(() => {
-        if (!cancelled) {
+        // 失败不写空快照，避免假空粘死
-          setSessionSnapshot(SHOWCASE_KEY, []);
+        if (!cancelled && hit === undefined) setItems([]);
-          setItems([]);
-        }
       })
       .finally(() => {
         if (!cancelled) setLoading(false);
@@ -54,17 +54,13 @@ export default function ShowcaseAsideWidget() {
           setItems(next);
         })
         .catch(() => {
-          if (opts.showLoading) {
+          // 软刷新 / 强刷失败：保持旧 UI，不写空快照
-            setSessionSnapshot(SHOWCASE_KEY, []);
-            setItems([]);
-          }
-          // 软刷新失败：保持旧 UI
         })
         .finally(() => setLoading(false));
     };
     const applyHitOrReload = (showLoading: boolean) => {
       const hit = getSessionSnapshot<CommunityShowcaseItem[]>(SHOWCASE_KEY);
-      if (hit !== undefined) {
+      if (hit !== undefined && hit.length > 0) {
         setItems(hit);
         setLoading(false);
         return;

frontend/src/components/admin/FeedSortTabList.tsx

@@ -5,7 +5,7 @@ import type { FeedSortId, FeedSortTab } from '../../api/types';
 import { normalizeFeedSortTabs } from '../../utils/feedSortTabs';
 
 const TAB_META: Record<FeedSortId, { hint: string; placeholder: string }> = {
-  reply: { hint: '按最后评论时间', placeholder: '新评论' },
+  reply: { hint: '按最近活动（发帖或评论）', placeholder: '最新' },
   latest: { hint: '按发帖时间', placeholder: '新帖子' },
   hot: { hint: '仅展示推荐帖', placeholder: '推荐帖' },
 };

frontend/src/components/editor/ArticleImagePickerDialog.tsx

@@ -0,0 +1,351 @@
+import { useCallback, useEffect, useRef, useState, type DragEvent } from 'react';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@/components/ui/dialog';
+import { Input } from '@/components/ui/input';
+import { Button } from '@/components/ui/button';
+import { notify } from '@/lib/notify';
+import { api } from '@/api/client';
+import type { MediaItem } from '@/api/types';
+import { toPostImageThumbSrc } from '@/utils/postContent';
+import { Upload, Link2, Images, Loader2 } from 'lucide-react';
+
+export type ImagePickerTarget = 'rich' | 'markdown';
+type PickerTab = 'upload' | 'link' | 'gallery';
+
+interface Props {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  /** 上传或选中后插入一张或多张图片 URL */
+  onInsert: (urls: string[]) => void;
+}
+
+/** 校验可插入的图片地址：外链或站内绝对路径 */
+export function isValidImageSrc(url: string): boolean {
+  const u = url.trim();
+  if (!u) return false;
+  if (u.startsWith('/') && !u.startsWith('//')) return true;
+  try {
+    const parsed = new URL(u);
+    return parsed.protocol === 'http:' || parsed.protocol === 'https:';
+  } catch {
+    return false;
+  }
+}
+
+const ACCEPT = 'image/jpeg,image/png,image/gif,image/webp';
+const PAGE_SIZE = 24;
+
+/** 文章编辑器：统一图片插入（上传 / 链接 / 我的图片） */
+export function ArticleImagePickerDialog({
+  open,
+  onOpenChange,
+  onInsert,
+}: Props) {
+  const [tab, setTab] = useState<PickerTab>('upload');
+  const [url, setUrl] = useState('');
+  const [uploading, setUploading] = useState(false);
+  const [dragOver, setDragOver] = useState(false);
+  const fileInputRef = useRef<HTMLInputElement>(null);
+
+  const [gallery, setGallery] = useState<MediaItem[]>([]);
+  const [galleryPage, setGalleryPage] = useState(1);
+  const [galleryTotalPages, setGalleryTotalPages] = useState(1);
+  const [galleryLoading, setGalleryLoading] = useState(false);
+  const [galleryLoaded, setGalleryLoaded] = useState(false);
+  const [selected, setSelected] = useState<Set<string>>(new Set());
+
+  const resetState = useCallback(() => {
+    setTab('upload');
+    setUrl('');
+    setUploading(false);
+    setDragOver(false);
+    setGallery([]);
+    setGalleryPage(1);
+    setGalleryTotalPages(1);
+    setGalleryLoading(false);
+    setGalleryLoaded(false);
+    setSelected(new Set());
+  }, []);
+
+  useEffect(() => {
+    if (open) resetState();
+  }, [open, resetState]);
+
+  const handleOpenChange = (next: boolean) => {
+    if (!next) resetState();
+    onOpenChange(next);
+  };
+
+  const finishInsert = (urls: string[]) => {
+    if (!urls.length) return;
+    onInsert(urls);
+    handleOpenChange(false);
+  };
+
+  const uploadFiles = async (files: File[]) => {
+    const images = files.filter(f => f.type.startsWith('image/'));
+    if (!images.length) {
+      notify.warning('请选择图片文件（jpeg / png / gif / webp）');
+      return;
+    }
+    setUploading(true);
+    const urls: string[] = [];
+    try {
+      for (const file of images) {
+        try {
+          const { url: uploaded } = await api.uploadPostImage(file);
+          urls.push(uploaded);
+        } catch (e: unknown) {
+          notify.error(e instanceof Error ? e.message : '图片上传失败');
+        }
+      }
+      if (urls.length) finishInsert(urls);
+    } finally {
+      setUploading(false);
+    }
+  };
+
+  const onFileChange = (list: FileList | null) => {
+    if (!list?.length) return;
+    void uploadFiles([...list]);
+  };
+
+  const onDrop = (e: DragEvent) => {
+    e.preventDefault();
+    setDragOver(false);
+    if (uploading) return;
+    void uploadFiles([...e.dataTransfer.files]);
+  };
+
+  const handleLinkInsert = () => {
+    const next = url.trim();
+    if (!next) {
+      notify.warning('请输入图片地址');
+      return;
+    }
+    if (!isValidImageSrc(next)) {
+      notify.warning('请使用 http(s) 外链或本站以 / 开头的路径');
+      return;
+    }
+    finishInsert([next]);
+  };
+
+  const loadGallery = useCallback(async (page: number, append: boolean) => {
+    setGalleryLoading(true);
+    try {
+      const res = await api.myPostImages({ page, size: PAGE_SIZE });
+      setGallery(prev => (append ? [...prev, ...res.files] : res.files));
+      setGalleryPage(res.page);
+      setGalleryTotalPages(res.total_pages);
+      setGalleryLoaded(true);
+    } catch (e: unknown) {
+      notify.error(e instanceof Error ? e.message : '加载图片失败');
+      setGalleryLoaded(true);
+    } finally {
+      setGalleryLoading(false);
+    }
+  }, []);
+
+  useEffect(() => {
+    if (open && tab === 'gallery' && !galleryLoaded && !galleryLoading) {
+      void loadGallery(1, false);
+    }
+  }, [open, tab, galleryLoaded, galleryLoading, loadGallery]);
+
+  const toggleSelect = (itemUrl: string) => {
+    setSelected(prev => {
+      const next = new Set(prev);
+      if (next.has(itemUrl)) next.delete(itemUrl);
+      else next.add(itemUrl);
+      return next;
+    });
+  };
+
+  const handleGalleryInsert = () => {
+    if (!selected.size) {
+      notify.warning('请先选择图片');
+      return;
+    }
+    // 保持网格出现顺序
+    const urls = gallery.filter(f => selected.has(f.url)).map(f => f.url);
+    finishInsert(urls);
+  };
+
+  const tabs: { id: PickerTab; label: string; icon: typeof Upload }[] = [
+    { id: 'upload', label: '上传', icon: Upload },
+    { id: 'link', label: '链接', icon: Link2 },
+    { id: 'gallery', label: '我的图片', icon: Images },
+  ];
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogContent className="article-image-picker">
+        <DialogHeader>
+          <DialogTitle>插入图片</DialogTitle>
+          <DialogDescription>
+            上传本地文件、粘贴链接，或从已上传图库中选择。
+          </DialogDescription>
+        </DialogHeader>
+
+        <div className="article-image-picker__tabs" role="tablist">
+          {tabs.map(t => {
+            const Icon = t.icon;
+            return (
+              <button
+                key={t.id}
+                type="button"
+                role="tab"
+                aria-selected={tab === t.id}
+                className={`article-image-picker__tab${tab === t.id ? ' is-active' : ''}`}
+                onClick={() => setTab(t.id)}
+                disabled={uploading}
+              >
+                <Icon size={14} aria-hidden />
+                {t.label}
+              </button>
+            );
+          })}
+        </div>
+
+        {tab === 'upload' && (
+          <div className="article-image-picker__panel">
+            <div
+              className={`article-image-picker__drop${dragOver ? ' is-dragover' : ''}${uploading ? ' is-busy' : ''}`}
+              onDragOver={e => {
+                e.preventDefault();
+                if (!uploading) setDragOver(true);
+              }}
+              onDragLeave={() => setDragOver(false)}
+              onDrop={onDrop}
+              onClick={() => !uploading && fileInputRef.current?.click()}
+              role="button"
+              tabIndex={0}
+              onKeyDown={e => {
+                if (e.key === 'Enter' || e.key === ' ') {
+                  e.preventDefault();
+                  fileInputRef.current?.click();
+                }
+              }}
+            >
+              {uploading ? (
+                <>
+                  <Loader2 size={28} className="article-image-picker__spin" />
+                  <p>正在上传…</p>
+                </>
+              ) : (
+                <>
+                  <Upload size={28} />
+                  <p>拖拽图片到此处，或点击选择文件</p>
+                  <span>支持 jpeg / png / gif / webp；多选将并排成图组</span>
+                </>
+              )}
+            </div>
+            <input
+              ref={fileInputRef}
+              type="file"
+              accept={ACCEPT}
+              multiple
+              className="sr-only"
+              onChange={e => {
+                onFileChange(e.target.files);
+                e.target.value = '';
+              }}
+            />
+          </div>
+        )}
+
+        {tab === 'link' && (
+          <div className="article-image-picker__panel">
+            <Input
+              type="url"
+              value={url}
+              placeholder="https://… 或 /uploads/posts/…"
+              onChange={e => setUrl(e.target.value)}
+              onKeyDown={e => {
+                if (e.key === 'Enter') {
+                  e.preventDefault();
+                  handleLinkInsert();
+                }
+              }}
+              autoFocus
+            />
+            <p className="article-image-picker__hint">
+              粘贴外链或本站已上传地址，无需重复上传。
+            </p>
+            <DialogFooter className="article-image-picker__footer">
+              <Button type="button" variant="outline" onClick={() => handleOpenChange(false)}>
+                取消
+              </Button>
+              <Button type="button" onClick={handleLinkInsert}>
+                插入
+              </Button>
+            </DialogFooter>
+          </div>
+        )}
+
+        {tab === 'gallery' && (
+          <div className="article-image-picker__panel">
+            {galleryLoading && !gallery.length ? (
+              <div className="article-image-picker__empty">
+                <Loader2 size={22} className="article-image-picker__spin" />
+                <span>加载中…</span>
+              </div>
+            ) : !gallery.length ? (
+              <div className="article-image-picker__empty">暂无上传记录</div>
+            ) : (
+              <>
+                <div className="article-image-picker__grid">
+                  {gallery.map(item => {
+                    const thumb = toPostImageThumbSrc(item.url) || item.url;
+                    const isSel = selected.has(item.url);
+                    return (
+                      <button
+                        key={item.url}
+                        type="button"
+                        className={`article-image-picker__thumb${isSel ? ' is-selected' : ''}`}
+                        title={item.name}
+                        onClick={() => toggleSelect(item.url)}
+                      >
+                        <img src={thumb} alt={item.name} loading="lazy" />
+                      </button>
+                    );
+                  })}
+                </div>
+                {galleryPage < galleryTotalPages && (
+                  <div className="article-image-picker__more">
+                    <Button
+                      type="button"
+                      variant="outline"
+                      size="sm"
+                      disabled={galleryLoading}
+                      onClick={() => void loadGallery(galleryPage + 1, true)}
+                    >
+                      {galleryLoading ? '加载中…' : '加载更多'}
+                    </Button>
+                  </div>
+                )}
+              </>
+            )}
+            <DialogFooter className="article-image-picker__footer">
+              <span className="article-image-picker__selected-count">
+                已选 {selected.size}
+              </span>
+              <Button type="button" variant="outline" onClick={() => handleOpenChange(false)}>
+                取消
+              </Button>
+              <Button type="button" disabled={!selected.size} onClick={handleGalleryInsert}>
+                插入选中
+              </Button>
+            </DialogFooter>
+          </div>
+        )}
+      </DialogContent>
+    </Dialog>
+  );
+}

frontend/src/components/editor/ArticleLinkDialog.tsx

@@ -1,39 +1,172 @@
-import { useEffect, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import {
   Dialog,
   DialogContent,
-  DialogDescription,
   DialogFooter,
   DialogHeader,
   DialogTitle,
 } from '@/components/ui/dialog';
 import { Input } from '@/components/ui/input';
 import { Button } from '@/components/ui/button';
+import { Label } from '@/components/ui/label';
+import { notify } from '@/lib/notify';
+import { api } from '@/api/client';
+import type { PostItem, SitePageSummary } from '@/api/types';
+import { pagePath, postPath } from '@/utils/permalink';
+import { useForumLimits } from '@/hooks/useForumLimits';
+import { ChevronDown, Loader2 } from 'lucide-react';
+
+export interface ArticleLinkConfirm {
+  url: string;
+  text: string;
+}
 
 interface Props {
   open: boolean;
   onOpenChange: (open: boolean) => void;
   initialUrl?: string;
-  onConfirm: (url: string) => void;
+  initialText?: string;
+  /** 是否正在编辑已有链接 */
+  editing?: boolean;
+  onConfirm: (payload: ArticleLinkConfirm) => void;
   onRemove?: () => void;
 }
 
-/** 文章编辑器链接输入弹窗 */
+type SiteHit = {
+  key: string;
+  title: string;
+  url: string;
+  kind: 'post' | 'page';
+};
+
+/** 校验可插入的链接地址：外链或站内绝对路径 */
+export function isValidLinkHref(url: string): boolean {
+  const u = url.trim();
+  if (!u) return false;
+  if (u.startsWith('/') && !u.startsWith('//')) return true;
+  if (u.startsWith('#') && u.length > 1) return true;
+  try {
+    const parsed = new URL(u);
+    return parsed.protocol === 'http:' || parsed.protocol === 'https:';
+  } catch {
+    return false;
+  }
+}
+
+const SEARCH_DEBOUNCE_MS = 300;
+const POST_PAGE_SIZE = 12;
+
+/** 文章/评论编辑器：插入或编辑链接（含站内内容搜索） */
 export function ArticleLinkDialog({
   open,
   onOpenChange,
   initialUrl = '',
+  initialText = '',
+  editing = false,
   onConfirm,
   onRemove,
 }: Props) {
-  const [url, setUrl] = useState(initialUrl);
+  const { limits } = useForumLimits();
+  const [url, setUrl] = useState('');
+  const [text, setText] = useState('');
+  const [advancedOpen, setAdvancedOpen] = useState(false);
+  const [query, setQuery] = useState('');
+  const [debouncedQuery, setDebouncedQuery] = useState('');
+  const [posts, setPosts] = useState<PostItem[]>([]);
+  const [pages, setPages] = useState<SitePageSummary[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [loaded, setLoaded] = useState(false);
 
   useEffect(() => {
-    if (open) setUrl(initialUrl || 'https://');
+    if (!open) return;
-  }, [open, initialUrl]);
+    setUrl(initialUrl || '');
+    setText(initialText || '');
+    setAdvancedOpen(false);
+    setQuery('');
+    setDebouncedQuery('');
+    setPosts([]);
+    setPages([]);
+    setLoaded(false);
+  }, [open, initialUrl, initialText]);
+
+  useEffect(() => {
+    if (!open || !advancedOpen) return;
+    const t = window.setTimeout(() => setDebouncedQuery(query.trim()), SEARCH_DEBOUNCE_MS);
+    return () => window.clearTimeout(t);
+  }, [query, open, advancedOpen]);
+
+  const loadSiteHits = useCallback(async (keyword: string) => {
+    setLoading(true);
+    try {
+      const [postsRes, pagesRes] = await Promise.all([
+        api.posts({
+          page: 1,
+          size: POST_PAGE_SIZE,
+          sort: 'new',
+          ...(keyword ? { keyword, title_only: '1' } : {}),
+        }),
+        api.pages(),
+      ]);
+      setPosts(postsRes.posts || []);
+      let nextPages = pagesRes.pages || [];
+      if (keyword) {
+        const q = keyword.toLowerCase();
+        nextPages = nextPages.filter(
+          p => p.title.toLowerCase().includes(q) || p.slug.toLowerCase().includes(q),
+        );
+      }
+      setPages(nextPages.slice(0, POST_PAGE_SIZE));
+      setLoaded(true);
+    } catch (e: unknown) {
+      notify.error(e instanceof Error ? e.message : '加载站内内容失败');
+      setLoaded(true);
+    } finally {
+      setLoading(false);
+    }
+  }, []);
+
+  // 仅展开高级选项时再请求站内内容，避免默认打开就打接口
+  useEffect(() => {
+    if (!open || !advancedOpen) return;
+    void loadSiteHits(debouncedQuery);
+  }, [open, advancedOpen, debouncedQuery, loadSiteHits]);
+
+  const hits: SiteHit[] = useMemo(() => {
+    const postHits: SiteHit[] = posts.map(p => ({
+      key: `post-${p.id}`,
+      title: p.title,
+      url: postPath(p.id, limits),
+      kind: 'post',
+    }));
+    const pageHits: SiteHit[] = pages.map(p => ({
+      key: `page-${p.slug}`,
+      title: p.title,
+      url: pagePath(p.slug, limits),
+      kind: 'page',
+    }));
+    return [...postHits, ...pageHits];
+  }, [posts, pages, limits]);
+
+  const pickHit = (hit: SiteHit) => {
+    setUrl(hit.url);
+    // 选站内内容时同步用标题作为链接文字
+    setText(hit.title);
+  };
 
   const handleConfirm = () => {
-    onConfirm(url.trim());
+    const nextUrl = url.trim();
+    if (!nextUrl) {
+      notify.warning('请输入网址');
+      return;
+    }
+    if (!isValidLinkHref(nextUrl)) {
+      notify.warning('请使用 http(s) 外链或本站以 / 开头的路径');
+      return;
+    }
+    onConfirm({
+      url: nextUrl,
+      text: text.trim() || '链接文字',
+    });
     onOpenChange(false);
   };
 
@@ -41,25 +174,119 @@ export function ArticleLinkDialog({
     <Dialog open={open} onOpenChange={onOpenChange}>
       <DialogContent className="article-link-dialog">
         <DialogHeader>
-          <DialogTitle>插入链接</DialogTitle>
+          <DialogTitle>插入或编辑链接</DialogTitle>
-          <DialogDescription>输入完整 URL，留空并确认可移除已有链接。</DialogDescription>
         </DialogHeader>
-        <Input
+
-          type="url"
+        <section className="article-link-dialog__section">
-          value={url}
+          <div className="article-link-dialog__field">
-          placeholder="https://"
+            <Label htmlFor="article-link-url">网址</Label>
-          onChange={e => setUrl(e.target.value)}
+            <Input
-          onKeyDown={e => {
+              id="article-link-url"
-            if (e.key === 'Enter') {
+              type="url"
-              e.preventDefault();
+              value={url}
-              handleConfirm();
+              placeholder="https://… 或 /post/123"
-            }
+              onChange={e => setUrl(e.target.value)}
-          }}
+              onKeyDown={e => {
-          autoFocus
+                if (e.key === 'Enter') {
-        />
+                  e.preventDefault();
+                  handleConfirm();
+                }
+              }}
+              autoFocus
+            />
+          </div>
+          <div className="article-link-dialog__field">
+            <Label htmlFor="article-link-text">链接文字</Label>
+            <Input
+              id="article-link-text"
+              value={text}
+              placeholder="显示在正文中的文字"
+              onChange={e => setText(e.target.value)}
+              onKeyDown={e => {
+                if (e.key === 'Enter') {
+                  e.preventDefault();
+                  handleConfirm();
+                }
+              }}
+            />
+          </div>
+        </section>
+
+        <section className="article-link-dialog__section article-link-dialog__advanced">
+          <button
+            type="button"
+            className={`article-link-dialog__advanced-toggle${advancedOpen ? ' is-open' : ''}`}
+            aria-expanded={advancedOpen}
+            onClick={() => setAdvancedOpen(v => !v)}
+          >
+            <span>高级选项</span>
+            <ChevronDown size={16} aria-hidden className="article-link-dialog__advanced-chevron" />
+          </button>
+          {advancedOpen ? (
+            <div className="article-link-dialog__advanced-body">
+              <h3 className="article-link-dialog__section-title">链接到站点中的内容</h3>
+              <div className="article-link-dialog__field">
+                <Label htmlFor="article-link-search">搜索</Label>
+                <Input
+                  id="article-link-search"
+                  type="search"
+                  value={query}
+                  placeholder="搜索帖子或单页…"
+                  onChange={e => setQuery(e.target.value)}
+                />
+              </div>
+              <div className="article-link-dialog__hits">
+                <p className="article-link-dialog__hits-hint">
+                  {debouncedQuery
+                    ? `搜索「${debouncedQuery}」`
+                    : '未指定搜索条件。自动显示最近发布条目。'}
+                </p>
+                {loading && !loaded ? (
+                  <div className="article-link-dialog__hits-empty">
+                    <Loader2 size={18} className="article-link-dialog__spin" />
+                    <span>加载中…</span>
+                  </div>
+                ) : !hits.length ? (
+                  <div className="article-link-dialog__hits-empty">暂无匹配内容</div>
+                ) : (
+                  <ul className="article-link-dialog__hit-list">
+                    {hits.map(hit => (
+                      <li key={hit.key}>
+                        <button
+                          type="button"
+                          className={`article-link-dialog__hit${url === hit.url ? ' is-selected' : ''}`}
+                          onClick={() => pickHit(hit)}
+                        >
+                          <span className="article-link-dialog__hit-title">{hit.title}</span>
+                          <span className="article-link-dialog__hit-kind">
+                            {hit.kind === 'post' ? '帖子' : '单页'}
+                          </span>
+                        </button>
+                      </li>
+                    ))}
+                  </ul>
+                )}
+                {loading && loaded ? (
+                  <div className="article-link-dialog__hits-loading">
+                    <Loader2 size={14} className="article-link-dialog__spin" />
+                  </div>
+                ) : null}
+              </div>
+            </div>
+          ) : null}
+        </section>
+
         <DialogFooter className="article-link-dialog__footer">
-          {onRemove && initialUrl ? (
+          {editing && onRemove ? (
-            <Button type="button" variant="outline" onClick={() => { onRemove(); onOpenChange(false); }}>
+            <Button
+              type="button"
+              variant="outline"
+              className="article-link-dialog__remove"
+              onClick={() => {
+                onRemove();
+                onOpenChange(false);
+              }}
+            >
               移除链接
             </Button>
           ) : null}
@@ -67,7 +294,7 @@ export function ArticleLinkDialog({
             取消
           </Button>
           <Button type="button" onClick={handleConfirm}>
-            确定
+            {editing ? '更新链接' : '添加链接'}
           </Button>
         </DialogFooter>
       </DialogContent>

frontend/src/hooks/useSessionResource.ts

@@ -13,15 +13,22 @@ type Fetcher<T> = () => Promise<T>;
  * 会话快照数据源：有缓存则跳过请求；无缓存时保留上一份画面直到新数据返回。
  * 手机下拉软刷新 commit / PAGE_FORCE_REFRESH_EVENT 会应用新快照。
  */
+function isEmptyArray(value: unknown): boolean {
+  return Array.isArray(value) && value.length === 0;
+}
+
 export function useSessionResource<T>(
   key: string | null,
   fetcher: Fetcher<T>,
   opts?: {
     enabled?: boolean;
     onError?: (e: unknown) => void;
+    /** 缓存为空数组时仍后台再拉，避免启动竞态假空粘死 */
+    revalidateEmpty?: boolean;
   },
 ) {
   const enabled = opts?.enabled !== false;
+  const revalidateEmpty = opts?.revalidateEmpty === true;
   const fetcherRef = useRef(fetcher);
   fetcherRef.current = fetcher;
   const onErrorRef = useRef(opts?.onError);
@@ -49,7 +56,7 @@ export function useSessionResource<T>(
     }
 
     const hit = getSessionSnapshot<T>(key);
-    if (hit !== undefined) {
+    if (hit !== undefined && !(revalidateEmpty && isEmptyArray(hit))) {
       setData(hit);
       setLoading(false);
       setPending(false);
@@ -57,9 +64,16 @@ export function useSessionResource<T>(
     }
 
     const seq = ++seqRef.current;
-    const keep = dataRef.current !== undefined;
+    const keep = dataRef.current !== undefined || (hit !== undefined && isEmptyArray(hit));
-    if (keep) setPending(true);
+    if (hit !== undefined && isEmptyArray(hit)) {
-    else setLoading(true);
+      setData(hit);
+      setPending(true);
+      setLoading(false);
+    } else if (keep && dataRef.current !== undefined) {
+      setPending(true);
+    } else {
+      setLoading(true);
+    }
 
     fetcherRef.current()
       .then((next) => {
@@ -70,6 +84,7 @@ export function useSessionResource<T>(
       .catch((e: unknown) => {
         if (seq !== seqRef.current) return;
         onErrorRef.current?.(e);
+        // 失败不写空快照；已有画面则保留
         if (!keep) setData(undefined);
       })
       .finally(() => {
@@ -81,7 +96,7 @@ export function useSessionResource<T>(
     return () => {
       seqRef.current += 1;
     };
-  }, [key, enabled]);
+  }, [key, enabled, revalidateEmpty]);
 
   const replace = useCallback((next: T | ((prev: T | undefined) => T)) => {
     setData((prev) => {
@@ -99,18 +114,20 @@ export function useSessionResource<T>(
     const reload = (opts: { allowLoading: boolean }) => {
       if (!key || !enabled) return;
       const warm = getSessionSnapshot<T>(key);
-      if (warm !== undefined) {
+      if (warm !== undefined && !(revalidateEmpty && isEmptyArray(warm))) {
         setData(warm);
         setLoading(false);
         setPending(false);
         return;
       }
       const seq = ++seqRef.current;
-      const keep = dataRef.current !== undefined;
+      const keep = dataRef.current !== undefined || (warm !== undefined && isEmptyArray(warm));
       if (opts.allowLoading) {
         deleteSessionSnapshot(key);
         if (keep) setPending(true);
         else setLoading(true);
+      } else if (warm !== undefined && isEmptyArray(warm)) {
+        setPending(true);
       }
       fetcherRef.current()
         .then((next) => {
@@ -138,7 +155,7 @@ export function useSessionResource<T>(
       window.removeEventListener(PAGE_FORCE_REFRESH_EVENT, onForce);
       window.removeEventListener(PAGE_SOFT_REFRESH_COMMIT_EVENT, onCommit);
     };
-  }, [key, enabled]);
+  }, [key, enabled, revalidateEmpty]);
 
   return { data, loading, pending, replace, invalidate };
 }

frontend/src/layouts/MainLayout.tsx

@@ -72,6 +72,8 @@ export default function MainLayout() {
   const [recentComments, setRecentComments] = useState<RecentComment[]>(() => getCachedRecentComments());
   const [recentUsers, setRecentUsers] = useState<RecentUser[]>(() => getCachedRecentUsers());
   const [unreadMessages, setUnreadMessages] = useState(() => getBootUnread());
+  const [dmUnread, setDmUnread] = useState(0);
+  const [notifyUnread, setNotifyUnread] = useState(0);
   const [tags, setTags] = useState<TagCount[]>(() => getCachedTags());
   const [tagsLoading, setTagsLoading] = useState(() => getCachedTags().length === 0);
   const [postOutline, setPostOutline] = useState<{
@@ -148,7 +150,10 @@ export default function MainLayout() {
     setSidebarOpen(false);
   }, [loc.pathname, loc.search]);
   useEffect(() => {
-    if (!/^\/post\/\d+/.test(loc.pathname)) setPostOutline(null);
+    const isArticleAside =
+      (/^\/post\/\d+/.test(loc.pathname) && !/\/edit$/.test(loc.pathname))
+      || /^\/page\//.test(loc.pathname);
+    if (!isArticleAside) setPostOutline(null);
   }, [loc.pathname]);
   useEffect(() => {
     if (!hideAside) setAsideOpen(false);
@@ -306,13 +311,29 @@ export default function MainLayout() {
   const refreshUnreadMessages = useCallback(() => {
     if (!user) {
       setUnreadMessages(0);
+      setDmUnread(0);
+      setNotifyUnread(0);
       return;
     }
     api.messageUnreadCount()
-      .then((r) => setUnreadMessages(r.count || 0))
+      .then((r) => {
-      .catch(() => setUnreadMessages(0));
+        setUnreadMessages(r.count || 0);
+        setDmUnread(r.dm_count ?? 0);
+        setNotifyUnread(r.notify_count ?? 0);
+      })
+      .catch(() => {
+        setUnreadMessages(0);
+        setDmUnread(0);
+        setNotifyUnread(0);
+      });
   }, [user]);
 
+  /** 仅有通知未读时直达通知 Tab，避免先看到空私信列表 */
+  const openMessages = useCallback(() => {
+    const path = notifyUnread > 0 && dmUnread === 0 ? '/messages?tab=notify' : '/messages';
+    void transitionTo(nav, path);
+  }, [nav, notifyUnread, dmUnread]);
+
   useEffect(() => {
     refreshUnreadMessages();
     const onRefresh = () => refreshUnreadMessages();
@@ -477,6 +498,10 @@ export default function MainLayout() {
   const activeChipIndex = Math.max(0, boardChipIds.indexOf(mobileActiveBoard === -1 ? 0 : mobileActiveBoard));
 
   const isPostDetail = /^\/post\/\d+/.test(loc.pathname) && !/\/edit$/.test(loc.pathname);
+  const isSitePage = /^\/page\//.test(loc.pathname);
+  const isArticleAside = isPostDetail || isSitePage;
+  // 帖子有作者 →「作者与目录」；单页仅目录
+  const articleAsideLabel = isPostDetail ? '作者与目录' : '文章目录';
   const setPostOutlineSafe = useCallback((outline: {
     headings: PostHeading[];
     scrollRoot: HTMLElement | null;
@@ -632,10 +657,10 @@ export default function MainLayout() {
                   type="button"
                   className="header-icon-btn"
                   onClick={openAside}
-                  aria-label={isPostDetail ? '打开作者与目录' : '打开社区动态'}
+                  aria-label={isArticleAside ? `打开${articleAsideLabel}` : '打开社区动态'}
                   aria-expanded={asideOpen}
                   aria-controls="aside-drawer"
-                  title={isPostDetail ? '作者与目录' : '社区动态'}
+                  title={isArticleAside ? articleAsideLabel : '社区动态'}
                 >
                   <PanelRight size={18} aria-hidden />
                 </button>
@@ -660,7 +685,7 @@ export default function MainLayout() {
                   className="header-icon-btn header-msg-btn"
                   title={unreadMessages > 0 ? `${unreadMessages} 条未读消息` : '站内消息'}
                   aria-label={unreadMessages > 0 ? `站内消息，${unreadMessages} 条未读` : '站内消息'}
-                  onClick={() => void transitionTo(nav, '/messages')}
+                  onClick={openMessages}
                 >
                   <Mail size={18} aria-hidden />
                   {unreadMessages > 0 && (
@@ -684,7 +709,7 @@ export default function MainLayout() {
                     <DropdownMenuItem onClick={() => void transitionTo(nav, '/profile')}>
                       账号设置{typeof user.points === 'number' ? ` · ${user.points} 积分` : ''}
                     </DropdownMenuItem>
-                    <DropdownMenuItem onClick={() => void transitionTo(nav, '/messages')}>
+                    <DropdownMenuItem onClick={openMessages}>
                       站内消息{unreadMessages > 0 ? ` (${unreadMessages})` : ''}
                     </DropdownMenuItem>
                     <DropdownMenuItem onClick={() => void transitionTo(nav, '/favorites')}>我的收藏</DropdownMenuItem>
@@ -815,7 +840,7 @@ export default function MainLayout() {
             asideWidgets={asideWidgets}
             onPostClick={openPost}
             
-            postDetail={isPostDetail ? {
+            postDetail={isArticleAside ? {
               author: postOutline?.author ?? null,
               publishedAt: postOutline?.publishedAt,
               viewCount: postOutline?.viewCount,
@@ -879,7 +904,7 @@ export default function MainLayout() {
                   onClick={() => { closeSidebar(); openAside(); }}
                 >
                   <PanelRight size={16} aria-hidden />
-                  {isPostDetail ? '作者与目录' : '社区动态'}
+                  {isArticleAside ? articleAsideLabel : '社区动态'}
                 </button>
                 <button
                   type="button"
@@ -910,10 +935,10 @@ export default function MainLayout() {
             className="aside-drawer"
             role="dialog"
             aria-modal="true"
-            aria-label={isPostDetail ? '作者与目录' : '社区动态'}
+            aria-label={isArticleAside ? articleAsideLabel : '社区动态'}
           >
             <div className="aside-drawer-head">
-              <span>{isPostDetail ? '作者与目录' : '社区动态'}</span>
+              <span>{isArticleAside ? articleAsideLabel : '社区动态'}</span>
               <button
                 ref={asideCloseRef}
                 type="button"
@@ -934,7 +959,7 @@ export default function MainLayout() {
                 loading={asideLoading}
                 asideWidgets={asideWidgets}
                 onPostClick={openPost}
-                postDetail={isPostDetail ? {
+                postDetail={isArticleAside ? {
                   author: postOutline?.author ?? null,
                   publishedAt: postOutline?.publishedAt,
                   viewCount: postOutline?.viewCount,

frontend/src/pages/PostDetailPage.tsx

@@ -1,4 +1,4 @@
-import { useState, useEffect, useLayoutEffect, useRef, useCallback } from 'react';
+import { useState, useEffect, useLayoutEffect, useRef, useCallback, useMemo } from 'react';
 import { useParams, useNavigate, useOutletContext, useLocation, useNavigationType } from 'react-router-dom';
 import { ArrowLeft, ThumbsUp, Star, Lock, MessageSquare, MessageSquareOff, Flag, MoreHorizontal } from 'lucide-react';
 import FeaturedIcon from '@/components/FeaturedIcon';
@@ -60,7 +60,8 @@ import { excerptFromHTML, firstImageFromHTML } from '../utils/seoText';
 import { canonicalRedirectPath, parsePermalinkID, postPath } from '../utils/permalink';
 import { useForumLimits } from '../hooks/useForumLimits';
 import type { LayoutCtx } from '../layouts/MainLayout';
-import type { PostHeading } from '../utils/postHeadings';
+import { extractHeadingsFromHtml } from '../utils/postHeadings';
+import { renderPostContentHtml } from '../utils/postContent';
 import { InFlowSiteFooter } from '../components/SiteFooter';
 import NotFoundPage from './NotFoundPage';
 
@@ -132,7 +133,6 @@ export default function PostDetailPage() {
   const [deletingPost, setDeletingPost] = useState(false);
   const [deleteOpen, setDeleteOpen] = useState(false);
   const [composerOpen, setComposerOpen] = useState(false);
-  const [headings, setHeadings] = useState<PostHeading[]>([]);
   const [reportOpen, setReportOpen] = useState(false);
   const [reportReason, setReportReason] = useState<ReportReason>('spam');
   const [reportDetail, setReportDetail] = useState('');
@@ -173,6 +173,15 @@ export default function PostDetailPage() {
 
   const brand = getCachedSiteBranding();
   const postContent = post?.content ?? '';
+  const isLoggedIn = !!user;
+  // 同步从正文派生目录，避免预取缓存命中后 setHeadings([]) 盖掉子组件上报且不再回调
+  const headings = useMemo(() => {
+    if (!postContent.trim()) return [];
+    const rendered = renderPostContentHtml(postContent, isLoggedIn, {
+      openLinksInNewTab: limits.open_content_links_in_new_tab,
+    });
+    return extractHeadingsFromHtml(rendered);
+  }, [postContent, isLoggedIn, limits.open_content_links_in_new_tab]);
   const postSEO = post ? {
     title: post.title,
     description: excerptFromHTML(postContent),
@@ -196,10 +205,6 @@ export default function PostDetailPage() {
   } : null;
   usePageSEO(postSEO);
 
-  const handleHeadingsChange = useCallback((next: PostHeading[]) => {
-    setHeadings(next);
-  }, []);
-
   useEffect(() => {
     if (loading || !post) {
       setPostOutline({ headings: [], scrollRoot: null, title: '文章目录' });
@@ -263,7 +268,6 @@ export default function PostDetailPage() {
       setReplyTo(null);
       setEditingCommentId(null);
       setComposerOpen(false);
-      setHeadings([]);
       setLoading(false);
       return;
     }
@@ -272,7 +276,6 @@ export default function PostDetailPage() {
     setReplyTo(null);
     setEditingCommentId(null);
     setComposerOpen(false);
-    setHeadings([]);
     if (!keep) {
       setLoading(true);
       setPost(null);
@@ -1124,9 +1127,8 @@ export default function PostDetailPage() {
 
         <PostContent
           html={post.content || ''}
-          isLoggedIn={!!user}
+          isLoggedIn={isLoggedIn}
           postId={post.id}
-          onHeadingsChange={handleHeadingsChange}
           onRequestReply={scrollToCommentBox}
           onUnlocked={() => { void reloadPostContent(); }}
         />

frontend/src/pages/ShowcasePage.tsx

@@ -1,4 +1,7 @@
-import { ExternalLink, Globe2 } from 'lucide-react';
+import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { ArrowLeft, ExternalLink, Globe2 } from 'lucide-react';
+import { Button } from '@/components/ui/button';
 import { Spinner } from '@/components/ui/spinner';
 import { api } from '../api/client';
 import type { CommunityShowcaseItem } from '../api/types';
@@ -7,12 +10,65 @@ import { getCachedSiteBranding, useSiteBranding } from '../hooks/useSiteBranding
 import { InFlowSiteFooter } from '../components/SiteFooter';
 import { useSessionResource } from '../hooks/useSessionResource';
 
+function siteMark(name: string, url: string): string {
+  const raw = (name || '').trim() || url.replace(/^https?:\/\//i, '');
+  const ch = Array.from(raw)[0];
+  return ch ? ch.toUpperCase() : '?';
+}
+
+function hostLabel(url: string): string {
+  try {
+    return new URL(url).host;
+  } catch {
+    return url.replace(/^https?:\/\//i, '');
+  }
+}
+
+/** 目标站约定路径 /favicon.ico */
+function faviconURL(siteURL: string): string | null {
+  try {
+    return new URL('/favicon.ico', siteURL).href;
+  } catch {
+    return null;
+  }
+}
+
+function ShowcaseFavicon({ name, url }: { name: string; url: string }) {
+  const src = faviconURL(url);
+  const [failed, setFailed] = useState(!src);
+  const mark = siteMark(name, url);
+
+  if (failed || !src) {
+    return (
+      <span className="showcase-item-mark" aria-hidden>
+        {mark}
+      </span>
+    );
+  }
+
+  return (
+    <span className="showcase-item-favicon">
+      <img
+        src={src}
+        alt=""
+        width={40}
+        height={40}
+        referrerPolicy="no-referrer"
+        decoding="async"
+        onError={() => setFailed(true)}
+      />
+    </span>
+  );
+}
+
 /** 官方精选的公网部署展柜（只读；仅人工精选条目） */
 export default function ShowcasePage() {
+  const nav = useNavigate();
   const { branding } = useSiteBranding();
   const { data: items = [], loading } = useSessionResource<CommunityShowcaseItem[]>(
     'showcase',
     () => api.communityShowcase().then((r) => (Array.isArray(r.items) ? r.items : [])),
+    { revalidateEmpty: true },
   );
 
   usePageSEO({
@@ -24,52 +80,65 @@ export default function ShowcasePage() {
 
   return (
     <div className="page-wrap">
-      <div className="showcase-page">
+      <div className="feed-panel list-page-panel showcase-panel">
-      <header className="showcase-head">
+        <header className="list-page-panel__head showcase-head">
-        <div className="showcase-head-mark" aria-hidden>
+          <Button variant="ghost" size="sm" className="list-page-panel__back" onClick={() => nav('/')}>
-          <Globe2 size={22} />
+            <ArrowLeft />
-        </div>
+            返回
-        <div>
+          </Button>
-          <h1 className="showcase-title">开源部署展柜</h1>
+          <div className="showcase-head__title-row">
-          <p className="showcase-desc">
+            <h1 className="page-title">开源部署展柜</h1>
+            {!loading && items.length > 0 && (
+              <span className="showcase-head__count">精选 {items.length} 站</span>
+            )}
+          </div>
+          <p className="page-desc">
             以下站点自愿开启社区上报，并由官方演示站精选推荐（非全量目录）
           </p>
-        </div>
+        </header>
-      </header>
 
-      {loading ? (
+        {loading ? (
-        <div className="flex justify-center py-16"><Spinner size="lg" /></div>
+          <div className="flex justify-center py-16"><Spinner size="lg" /></div>
-      ) : items.length === 0 ? (
+        ) : items.length === 0 ? (
-        <p className="showcase-empty">暂无精选实例</p>
+          <div className="showcase-empty list-page-panel__empty">
-      ) : (
+            <Globe2 size={28} strokeWidth={1.5} aria-hidden />
-        <ul className="showcase-list">
+            <p>暂无精选实例</p>
-          {items.map((item) => (
+            <span>有站点被官方推荐后会出现在这里</span>
-            <li key={item.site_url} className="showcase-item">
+          </div>
-              <a
+        ) : (
-                href={item.site_url}
+          <ul className="showcase-list">
-                target="_blank"
+            {items.map((item) => {
-                rel="noopener noreferrer"
+              const name = item.site_name || '未命名站点';
-                className="showcase-item-link"
+              return (
-              >
+                <li key={item.site_url} className="showcase-item">
-                <span className="showcase-item-name">{item.site_name || '未命名站点'}</span>
+                  <a
-                <span className="showcase-item-url">
+                    href={item.site_url}
-                  {item.site_url}
+                    target="_blank"
-                  <ExternalLink size={12} aria-hidden />
+                    rel="noopener noreferrer"
-                </span>
+                    className="showcase-item-link"
-                {(item.featured_note || item.version) && (
+                  >
-                  <span className="showcase-item-meta">
+                    <ShowcaseFavicon name={name} url={item.site_url} />
-                    {item.featured_note || null}
+                    <span className="showcase-item-body">
-                    {item.featured_note && item.version ? ' · ' : null}
+                      <span className="showcase-item-name">{name}</span>
-                    {item.version ? `v${item.version}` : null}
+                      <span className="showcase-item-url">
-                  </span>
+                        {hostLabel(item.site_url)}
-                )}
+                        <ExternalLink size={12} aria-hidden />
-              </a>
+                      </span>
-            </li>
+                      {item.featured_note ? (
-          ))}
+                        <span className="showcase-item-note">{item.featured_note}</span>
-        </ul>
+                      ) : null}
-      )}
+                    </span>
+                    {item.version ? (
+                      <span className="showcase-item-version">v{item.version}</span>
+                    ) : null}
+                  </a>
+                </li>
+              );
+            })}
+          </ul>
+        )}
 
-      <InFlowSiteFooter />
+        <InFlowSiteFooter />
       </div>
     </div>
   );

frontend/src/pages/SitePageView.tsx

@@ -1,13 +1,18 @@
-import { useParams } from 'react-router-dom';
+import { useEffect, useMemo, useRef } from 'react';
+import { useOutletContext, useParams } from 'react-router-dom';
 import NotFoundPage from './NotFoundPage';
 import { api } from '../api/client';
 import type { SitePage } from '../api/types';
+import ArticleOutline from '../components/ArticleOutline';
 import PostContent from '../components/PostContent';
 import { usePageSEO } from '../hooks/usePageSEO';
 import { parsePermalinkSlug, pagePath } from '../utils/permalink';
 import { useForumLimits } from '../hooks/useForumLimits';
 import { useAuth } from '../hooks/useAuth';
 import { useSessionResource } from '../hooks/useSessionResource';
+import type { LayoutCtx } from '../layouts/MainLayout';
+import { extractHeadingsFromHtml } from '../utils/postHeadings';
+import { renderPostContentHtml } from '../utils/postContent';
 
 /** 自定义单页（关于我们、版规等） */
 export default function SitePageView() {
@@ -15,12 +20,25 @@ export default function SitePageView() {
   const slug = parsePermalinkSlug(rawSlug);
   const { limits } = useForumLimits();
   const { user } = useAuth();
+  const { setPostOutline, isMobile } = useOutletContext<LayoutCtx>();
+  const pageRef = useRef<HTMLDivElement>(null);
   const { data: page, loading } = useSessionResource<SitePage | null>(
     slug ? `sitepage:${slug}` : null,
     () => api.page(slug).then(d => d.page),
     { enabled: !!slug },
   );
   const notFound = !slug || (!loading && !page);
+  const isLoggedIn = !!user;
+  const pageContent = page?.content ?? '';
+
+  // 同步从正文派生目录，与帖子详情共用右侧栏目录布局
+  const headings = useMemo(() => {
+    if (!pageContent.trim()) return [];
+    const rendered = renderPostContentHtml(pageContent, isLoggedIn, {
+      openLinksInNewTab: limits.open_content_links_in_new_tab,
+    });
+    return extractHeadingsFromHtml(rendered);
+  }, [pageContent, isLoggedIn, limits.open_content_links_in_new_tab]);
 
   usePageSEO({
     title: page?.title,
@@ -29,19 +47,42 @@ export default function SitePageView() {
     ogType: 'article',
   });
 
+  useEffect(() => {
+    if (loading || !page) {
+      setPostOutline({ headings: [], scrollRoot: null, title: '文章目录' });
+      return () => setPostOutline(null);
+    }
+    setPostOutline({
+      headings,
+      scrollRoot: pageRef.current,
+      title: '文章目录',
+    });
+    return () => setPostOutline(null);
+  }, [headings, loading, page, setPostOutline]);
+
   if (!slug) return <NotFoundPage title="页面不存在" />;
   if (loading) return null;
   if (notFound || !page) return <NotFoundPage title="页面不存在" description="该页面不存在或未发布" />;
 
   return (
-    <div className="page-wrap">
+    <div className="page-wrap" ref={pageRef}>
       <article className="site-page">
         <header className="site-page__head">
           <h1>{page.title}</h1>
         </header>
+        {isMobile && headings.length > 0 && (
+          <details className="post-detail-toc-mobile">
+            <summary>文章目录（{headings.length}）</summary>
+            <ArticleOutline
+              headings={headings}
+              scrollRoot={pageRef.current}
+              title="目录"
+            />
+          </details>
+        )}
         <PostContent
           html={page.content}
-          isLoggedIn={!!user}
+          isLoggedIn={isLoggedIn}
           className="site-page__body post-detail-content"
         />
       </article>

frontend/src/pages/UserProfilePage.tsx

@@ -23,7 +23,6 @@ import { useForumLimits } from '../hooks/useForumLimits';
 import { useSessionResource } from '../hooks/useSessionResource';
 import PostListItem from '../components/PostListItem';
 import FeedPagination from '../components/FeedPagination';
-import ComposeMessageDialog from '../components/ComposeMessageDialog';
 import { openForumPost } from '../utils/openPost';
 import { formatDateTime } from '../utils/content';
 import { usePageSEO } from '../hooks/usePageSEO';
@@ -44,7 +43,6 @@ export default function UserProfilePage() {
   const { limits } = useForumLimits();
   const pageSize = limits.page_size_default > 0 ? limits.page_size_default : 20;
 
-  const [msgOpen, setMsgOpen] = useState(false);
   const [notFound, setNotFound] = useState(false);
   const [postPage, setPostPage] = useState(1);
 
@@ -183,7 +181,7 @@ export default function UserProfilePage() {
                       nav(loginPath(userPath(profile.id)));
                       return;
                     }
-                    setMsgOpen(true);
+                    nav(`/messages?peer=${profile.id}`);
                   }}
                 >
                   <Mail size={14} />
@@ -265,16 +263,6 @@ export default function UserProfilePage() {
         </div>
       </div>
       <InFlowSiteFooter />
-
-      {!isSelf && profile && me && (
-        <ComposeMessageDialog
-          open={msgOpen}
-          onOpenChange={setMsgOpen}
-          toUserId={profile.id}
-          toNickname={profile.nickname}
-          onSent={() => nav(`/messages?peer=${profile.id}`)}
-        />
-      )}
     </div>
   );
 }

frontend/src/pages/admin/AdminCommentsPage.tsx

@@ -1,5 +1,5 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { Trash2, RotateCcw } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Badge } from '@/components/ui/badge';
@@ -40,6 +40,8 @@ function formatAdminTime(iso: string) {
 
 export default function AdminCommentsPage() {
   const nav = useNavigate();
+  const [searchParams, setSearchParams] = useSearchParams();
+  const focusId = Number(searchParams.get('id') || 0) || 0;
   const { ready } = useAdminGuard();
   const [tab, setTab] = useState<Tab>('pending');
   const [comments, setComments] = useState<Comment[]>([]);
@@ -49,6 +51,9 @@ export default function AdminCommentsPage() {
   const [totalPages, setTotalPages] = useState(1);
   const [pendingCount, setPendingCount] = useState(0);
   const [revComment, setRevComment] = useState<Comment | null>(null);
+  const [highlightId, setHighlightId] = useState<number | null>(focusId > 0 ? focusId : null);
+  const focusTriedRef = useRef(false);
+  const highlightTimer = useRef<ReturnType<typeof setTimeout>>();
 
   const loadList = (p = page, st: Tab = tab) => {
     setLoading(true);
@@ -90,6 +95,45 @@ export default function AdminCommentsPage() {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [ready, tab]);
 
+  // 从通知深链 ?id= 定位并高亮待审行
+  useEffect(() => {
+    if (!ready || loading || focusId <= 0 || focusTriedRef.current) return;
+    if (tab === 'trash') return;
+
+    const found = comments.find((c) => c.id === focusId);
+    if (found) {
+      focusTriedRef.current = true;
+      setHighlightId(focusId);
+      requestAnimationFrame(() => {
+        document.getElementById(`admin-comment-row-${focusId}`)?.scrollIntoView({
+          behavior: 'smooth',
+          block: 'center',
+        });
+      });
+      clearTimeout(highlightTimer.current);
+      highlightTimer.current = setTimeout(() => setHighlightId(null), 2800);
+      const next = new URLSearchParams(searchParams);
+      next.delete('id');
+      setSearchParams(next, { replace: true });
+      return;
+    }
+
+    // pending 未找到则切到全部再试一次
+    if (tab === 'pending') {
+      setTab('all');
+      setPage(1);
+      return;
+    }
+
+    focusTriedRef.current = true;
+    notify.warning('该评论可能已审核或不在当前列表');
+    const next = new URLSearchParams(searchParams);
+    next.delete('id');
+    setSearchParams(next, { replace: true });
+  }, [ready, loading, comments, focusId, tab, searchParams, setSearchParams]);
+
+  useEffect(() => () => clearTimeout(highlightTimer.current), []);
+
   const approve = async (id: number) => {
     try {
       const r = await api.adminApproveComment(id);
@@ -268,7 +312,11 @@ export default function AdminCommentsPage() {
               </thead>
               <tbody>
                 {comments.map(c => (
-                  <tr key={c.id}>
+                  <tr
+                    key={c.id}
+                    id={`admin-comment-row-${c.id}`}
+                    className={cn(highlightId === c.id && 'admin-row-highlight')}
+                  >
                     <td>{c.id}</td>
                     <td>#{c.floor}</td>
                     <td>

frontend/src/pages/admin/AdminPostsPage.tsx

@@ -1,5 +1,5 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { Search, Lock, LockOpen, MessageSquareOff, Trash2, RotateCcw } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
@@ -32,6 +32,8 @@ function formatAdminTime(iso: string) {
 
 export default function AdminPostsPage() {
   const nav = useNavigate();
+  const [searchParams, setSearchParams] = useSearchParams();
+  const focusId = Number(searchParams.get('id') || 0) || 0;
   const { ready } = useAdminGuard();
   const [tab, setTab] = useState<Tab>('pending');
   const [posts, setPosts] = useState<PostItem[]>([]);
@@ -42,6 +44,9 @@ export default function AdminPostsPage() {
   const [pendingCount, setPendingCount] = useState(0);
   const [keyword, setKeyword] = useState('');
   const [search, setSearch] = useState('');
+  const [highlightId, setHighlightId] = useState<number | null>(focusId > 0 ? focusId : null);
+  const focusTriedRef = useRef(false);
+  const highlightTimer = useRef<ReturnType<typeof setTimeout>>();
 
   const loadActive = (p = page, kw = search, status = tab === 'pending' ? 'pending' : 'all') => {
     setLoading(true);
@@ -92,6 +97,43 @@ export default function AdminPostsPage() {
     // eslint-disable-next-line react-hooks/exhaustive-deps -- 仅随 tab/search/ready 刷新
   }, [ready, search, tab]);
 
+  // 从通知深链 ?id= 定位并高亮
+  useEffect(() => {
+    if (!ready || loading || focusId <= 0 || focusTriedRef.current) return;
+    if (tab === 'trash') return;
+
+    const found = posts.find((p) => p.id === focusId);
+    if (found) {
+      focusTriedRef.current = true;
+      setHighlightId(focusId);
+      requestAnimationFrame(() => {
+        document.getElementById(`admin-post-row-${focusId}`)?.scrollIntoView({
+          behavior: 'smooth',
+          block: 'center',
+        });
+      });
+      clearTimeout(highlightTimer.current);
+      highlightTimer.current = setTimeout(() => setHighlightId(null), 2800);
+      const next = new URLSearchParams(searchParams);
+      next.delete('id');
+      setSearchParams(next, { replace: true });
+      return;
+    }
+
+    if (tab === 'pending') {
+      setTab('active');
+      return;
+    }
+
+    focusTriedRef.current = true;
+    notify.warning('该帖子可能已审核或不在当前列表');
+    const next = new URLSearchParams(searchParams);
+    next.delete('id');
+    setSearchParams(next, { replace: true });
+  }, [ready, loading, posts, focusId, tab, searchParams, setSearchParams]);
+
+  useEffect(() => () => clearTimeout(highlightTimer.current), []);
+
   const switchTab = (next: Tab) => {
     if (next === tab) return;
     setTab(next);
@@ -352,7 +394,11 @@ export default function AdminPostsPage() {
                 {posts.map(p => {
                   const edited = p.updated_at && isTimeDiffSignificant(p.created_at, p.updated_at);
                   return (
-                  <tr key={p.id}>
+                  <tr
+                    key={p.id}
+                    id={`admin-post-row-${p.id}`}
+                    className={cn(highlightId === p.id && 'admin-row-highlight')}
+                  >
                     <td>{p.id}</td>
                     <td className="max-w-[200px] truncate">
                       <button type="button" className="admin-text-link" onClick={() => nav(`/post/${p.id}`)}>

frontend/src/pages/admin/AdminSettingsPage.tsx

@@ -952,7 +952,7 @@ export default function AdminSettingsPage() {
                 <div className="admin-settings-subsection">
                   <h4 className="admin-settings-subsection-title">首页排序标签</h4>
                   <p className="admin-settings-subsection-desc">
-                    拖拽调整顺序；在「显示名称」框中改首页文案；右侧开关控制启停。第一个启用项为默认排序
+                    拖拽调整顺序；在「显示名称」框中改首页文案；右侧开关控制启停。第一个启用项为默认排序。「最新」按发帖与评论的最近时间混排
                   </p>
                   <FeedSortTabList
                     tabs={normalizeFeedSortTabs(limits.feed_sort_tabs ?? DEFAULT_FEED_SORT_TABS)}

frontend/src/utils/content.ts

@@ -89,6 +89,25 @@ export function formatTime(iso: string) {
   return `${d.getFullYear()}年${d.getMonth() + 1}月${d.getDate()}日`;
 }
 
+/** 会话列表时间：今天 HH:mm，同年 M月D日，更早含年 */
+export function formatConvListTime(iso: string) {
+  const d = new Date(iso);
+  if (Number.isNaN(d.getTime())) return iso;
+  const now = new Date();
+  const pad = (n: number) => String(n).padStart(2, '0');
+  if (
+    d.getFullYear() === now.getFullYear()
+    && d.getMonth() === now.getMonth()
+    && d.getDate() === now.getDate()
+  ) {
+    return `${pad(d.getHours())}:${pad(d.getMinutes())}`;
+  }
+  if (d.getFullYear() === now.getFullYear()) {
+    return `${d.getMonth() + 1}月${d.getDate()}日`;
+  }
+  return `${d.getFullYear()}年${d.getMonth() + 1}月${d.getDate()}日`;
+}
+
 /** 完整日期时间（用于帖子发布/修改时间展示） */
 export function formatDateTime(iso: string) {
   const d = new Date(iso);

frontend/src/utils/feedSortTabs.ts

@@ -4,7 +4,7 @@ import { DEFAULT_FEED_SORT_TABS } from '../api/types';
 const FEED_SORT_IDS: FeedSortId[] = ['reply', 'latest', 'hot'];
 
 const DEFAULT_LABELS: Record<FeedSortId, string> = {
-  reply: '新评论',
+  reply: '最新',
   latest: '新帖子',
   hot: '推荐帖',
 };

frontend/src/utils/homeBoot.ts

@@ -44,7 +44,7 @@ export type HomeBootPayload = {
   recent_comments: RecentComment[];
   recent_users: RecentUser[];
   tags: TagCount[];
-  showcase: CommunityShowcaseItem[];
+  showcase?: CommunityShowcaseItem[];
   pages: SitePageSummary[];
   limits: ForumLimitsPublic;
   branding: SiteBranding;
@@ -77,7 +77,10 @@ export function consumeHomeBoot(): HomeBootPayload | null {
   if (Array.isArray(boot.recent_comments)) setCachedRecentComments(boot.recent_comments);
   if (Array.isArray(boot.recent_users)) setCachedRecentUsers(boot.recent_users);
   if (Array.isArray(boot.tags)) setCachedTags(boot.tags);
-  if (Array.isArray(boot.showcase)) setSessionSnapshot('showcase', boot.showcase);
+  // 仅当 boot 显式带 showcase 时灌入（侧栏关闭时省略，避免 [] 粘死）
+  if ('showcase' in boot && Array.isArray(boot.showcase)) {
+    setSessionSnapshot('showcase', boot.showcase);
+  }
 
   // 鉴权 / 签到：有 user 字段即种子（含 null = 已确认访客）
   if ('user' in boot) {

frontend/src/utils/markdownFormat.ts

@@ -122,9 +122,12 @@ export function insertMarkdownLink(
   value: string,
   url: string,
   onChange: ChangeHandler,
+  opts?: { text?: string },
 ) {
   const { selectionStart, selectionEnd } = textarea;
-  const selected = value.slice(selectionStart, selectionEnd) || '链接文字';
+  const selected = opts?.text?.trim()
+    || value.slice(selectionStart, selectionEnd)
+    || '链接文字';
   const insert = `[${selected}](${url})`;
   const next = value.slice(0, selectionStart) + insert + value.slice(selectionEnd);
   applyTextareaChange(

handler/api.go

@@ -421,13 +421,18 @@ func (h *Handlers) APIAdminRejectComment(c *gin.Context) {
 			title = "未知帖子"
 		}
 		pid := comment.PostID
-		_, _ = h.Message.SendSystem(
+		cid := comment.ID
+		floor := comment.Floor
+		_, _ = h.Message.SendSystemWithRefs(
 			comment.UserID,
 			"评论未通过审核",
 			service.FormatCommentRejectContent(title, comment.PostID, comment.Floor, reason),
 			model.MessageKindReject,
-			&pid,
+			service.SystemNotifyRefs{
-			nil,
+				PostID:    &pid,
+				CommentID: &cid,
+				Floor:     &floor,
+			},
 		)
 	}
 	c.JSON(http.StatusOK, gin.H{"message": "已拒绝该评论并通知作者", "status": model.ContentStatusRejected})

handler/media.go

@@ -8,6 +8,27 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
+// APIMyPostImages 当前用户已上传的帖子图片列表
+func (h *Handlers) APIMyPostImages(c *gin.Context) {
+	if h.Store == nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "上传存储未初始化"})
+		return
+	}
+	uid := h.currentUserID(c)
+	if uid == 0 {
+		c.JSON(http.StatusUnauthorized, gin.H{"error": "请先登录"})
+		return
+	}
+	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
+	size, _ := strconv.Atoi(c.DefaultQuery("size", "24"))
+	result, err := h.Store.ListUserPostImages(uid, page, size)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+	c.JSON(http.StatusOK, result)
+}
+
 // APIAdminMedia 列出媒体资源
 func (h *Handlers) APIAdminMedia(c *gin.Context) {
 	if h.Store == nil {

handler/message.go

@@ -136,6 +136,20 @@ func (h *Handlers) APIMarkNotificationsRead(c *gin.Context) {
 	c.JSON(http.StatusOK, gin.H{"message": "通知已全部标为已读"})
 }
 
+// APIMarkMessageRead 单条消息已读
+func (h *Handlers) APIMarkMessageRead(c *gin.Context) {
+	id, err := strconv.ParseUint(c.Param("id"), 10, 64)
+	if err != nil || id == 0 {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "无效的消息"})
+		return
+	}
+	if err := h.Message.MarkMessageRead(h.currentUserID(c), uint(id)); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{"message": "已标为已读"})
+}
+
 // APISendMessage 发送私信
 func (h *Handlers) APISendMessage(c *gin.Context) {
 	var req struct {

handler/ssr_home.go

@@ -36,7 +36,8 @@ type homeBootPayload struct {
 	RecentComments []service.RecentCommentItem     `json:"recent_comments"`
 	RecentUsers    []service.RecentUserItem        `json:"recent_users"`
 	Tags           []service.TagCount              `json:"tags"`
-	Showcase       []service.CommunityShowcaseItem `json:"showcase"`
+	// omitempty：侧栏关闭或未拉取时不写字段，避免 SPA 把 [] 当成有效会话快照
+	Showcase []service.CommunityShowcaseItem `json:"showcase,omitempty"`
 	Pages          []service.SitePageSummary       `json:"pages"`
 	Limits         service.ForumLimitsPublic       `json:"limits"`
 	Branding       service.SiteBranding            `json:"branding"`
@@ -261,13 +262,15 @@ func (h *Handlers) gatherHomeSSR(c *gin.Context, boardID uint) (*homeSSRData, er
 		go func() {
 			defer wg.Done()
 			items, err := h.Community.ListShowcase(c.Request.Host)
-			if err != nil || items == nil {
+			if err != nil {
+				// 失败不写 showcase，让前端自行请求，避免假空粘死
+				return
+			}
+			if items == nil {
 				items = []service.CommunityShowcaseItem{}
 			}
 			out.boot.Showcase = items
 		}()
-	} else {
-		out.boot.Showcase = []service.CommunityShowcaseItem{}
 	}
 
 	uid := h.currentUserID(c)
@@ -553,7 +556,7 @@ func writeSSRFeed(b *strings.Builder, boot homeBootPayload, meta homeSSRMeta) {
 		tabs := boot.Limits.FeedSortTabs
 		if len(tabs) == 0 {
 			tabs = []service.FeedSortTab{
-				{ID: service.FeedSortReply, Label: "新评论", Enabled: true},
+				{ID: service.FeedSortReply, Label: "最新", Enabled: true},
 				{ID: service.FeedSortLatest, Label: "新帖子", Enabled: true},
 				{ID: service.FeedSortHot, Label: "推荐帖", Enabled: true},
 			}

model/models.go

@@ -226,16 +226,20 @@ const (
 
 // PrivateMessage 站内私信
 type PrivateMessage struct {
-	ID              uint      `gorm:"primaryKey" json:"id"`
+	ID                uint      `gorm:"primaryKey" json:"id"`
-	FromUserID      uint      `gorm:"index;not null" json:"from_user_id"` // 0 表示系统
+	FromUserID        uint      `gorm:"index;not null" json:"from_user_id"` // 0 表示系统
-	ToUserID        uint      `gorm:"index;not null" json:"to_user_id"`
+	ToUserID          uint      `gorm:"index;not null" json:"to_user_id"`
-	Subject         string    `gorm:"size:256;not null" json:"subject"`
+	Subject           string    `gorm:"size:256;not null" json:"subject"`
-	Content         string    `gorm:"type:text;not null" json:"content"`
+	Content           string    `gorm:"type:text;not null" json:"content"`
-	Kind            string    `gorm:"size:32;default:user;index" json:"kind"`
+	Kind              string    `gorm:"size:32;default:user;index" json:"kind"`
-	RelatedPostID   *uint     `gorm:"index" json:"related_post_id,omitempty"`
+	RelatedPostID     *uint     `gorm:"index" json:"related_post_id,omitempty"`
-	RelatedReportID *uint     `gorm:"index" json:"related_report_id,omitempty"`
+	RelatedReportID   *uint     `gorm:"index" json:"related_report_id,omitempty"`
-	IsRead          bool      `gorm:"default:false;index" json:"is_read"`
+	RelatedCommentID  *uint     `gorm:"index" json:"related_comment_id,omitempty"`
-	CreatedAt       time.Time `json:"created_at"`
+	RelatedFloor      *int      `json:"related_floor,omitempty"` // 评论自身楼号，对应 #floor-N
+	IsRead            bool      `gorm:"default:false;index" json:"is_read"`
+	CreatedAt         time.Time `json:"created_at"`
+	// RelatedStatus 列表接口实时回填：pending|published|rejected|deleted（不落库）
+	RelatedStatus string `json:"related_status,omitempty" gorm:"-"`
 
 	FromUser User `gorm:"foreignKey:FromUserID" json:"from_user,omitempty"`
 	ToUser   User `gorm:"foreignKey:ToUserID" json:"to_user,omitempty"`

router/router.go

@@ -177,6 +177,7 @@ func Setup(cfg *config.Config) (*gin.Engine, error) {
 		api.POST("/profile/password", h.APIUpdatePassword)
 		api.POST("/profile/avatar", h.APIUploadAvatar)
 		api.POST("/uploads/image", h.APIUploadPostImage)
+		api.GET("/uploads/images", h.APIMyPostImages)
 		api.POST("/posts", middleware.RateLimitMiddleware(limiter, "post"), h.APICreatePost)
 		api.PUT("/posts/:id", h.APIUpdatePost)
 		api.DELETE("/posts/:id", h.APIDeletePost)
@@ -194,6 +195,7 @@ func Setup(cfg *config.Config) (*gin.Engine, error) {
 		api.GET("/messages/unread-count", h.APIMessageUnreadCount)
 		api.GET("/messages/notifications", h.APIMessageNotifications)
 		api.POST("/messages/notifications/read", h.APIMarkNotificationsRead)
+		api.POST("/messages/:id/read", h.APIMarkMessageRead)
 		api.GET("/messages/conversations", h.APIMessageConversations)
 		api.GET("/messages/conversations/:peerId", h.APIConversationMessages)
 		api.POST("/messages/conversations/:peerId/read", h.APIMarkConversationRead)

service/media.go

@@ -154,6 +154,122 @@ func (s *UploadStore) ListMedia(category, query string, page, size int) (*MediaL
 	}, nil
 }
 
+// ListUserPostImages 列出当前用户历史上传的帖子图片（category=posts）
+func (s *UploadStore) ListUserPostImages(userID uint, page, size int) (*MediaListResult, error) {
+	if s == nil {
+		return nil, errors.New("上传存储未初始化")
+	}
+	if model.DB == nil {
+		return nil, errors.New("数据库未初始化")
+	}
+	if userID == 0 {
+		return nil, errors.New("未登录")
+	}
+	if page < 1 {
+		page = 1
+	}
+	if size < 1 {
+		size = 24
+	}
+	if size > 100 {
+		size = 100
+	}
+
+	var records []model.Media
+	if err := model.DB.Where("category = ? AND user_id = ?", UploadCategoryPosts, userID).
+		Order("created_at desc, id desc").
+		Find(&records).Error; err != nil {
+		return nil, err
+	}
+
+	// 上传会登记原图 + WebP；图库按 stem 去重，优先展示 WebP（与插入 URL 一致）
+	records = dedupePostMediaPreferWebP(records)
+
+	total := len(records)
+	totalPages := 1
+	if total > 0 {
+		totalPages = (total + size - 1) / size
+	}
+	if page > totalPages {
+		page = totalPages
+	}
+	start := (page - 1) * size
+	if start > total {
+		start = total
+	}
+	end := start + size
+	if end > total {
+		end = total
+	}
+	pageRecords := records[start:end]
+
+	files := make([]MediaItem, 0, len(pageRecords))
+	for _, r := range pageRecords {
+		mod := r.UpdatedAt
+		if mod.IsZero() {
+			mod = r.CreatedAt
+		}
+		files = append(files, MediaItem{
+			Category:    r.Category,
+			Name:        r.Name,
+			URL:         r.URL,
+			Size:        r.Size,
+			ModifiedAt:  mod.UTC(),
+			ContentType: r.ContentType,
+			StorageType: r.StorageType,
+		})
+	}
+
+	mode, _, _, _ := s.snapshot()
+	storageType := config.StorageTypeLocal
+	if mode == config.StorageTypeS3 {
+		storageType = config.StorageTypeS3
+	}
+
+	return &MediaListResult{
+		Files:          files,
+		Total:          total,
+		Page:           page,
+		TotalPages:     totalPages,
+		StorageType:    storageType,
+		CategoryCounts: map[string]int{UploadCategoryPosts: total},
+	}, nil
+}
+
+// dedupePostMediaPreferWebP 同一上传的原图/WebP 只保留一条，优先 WebP
+func dedupePostMediaPreferWebP(records []model.Media) []model.Media {
+	type slot struct {
+		idx    int
+		isWebP bool
+	}
+	seen := map[string]slot{}
+	out := make([]model.Media, 0, len(records))
+	for _, r := range records {
+		stem := mediaFileStem(r.Name)
+		isWebP := strings.EqualFold(filepath.Ext(r.Name), ".webp") ||
+			strings.EqualFold(r.ContentType, "image/webp")
+		if s, ok := seen[stem]; ok {
+			if isWebP && !s.isWebP {
+				out[s.idx] = r
+				seen[stem] = slot{idx: s.idx, isWebP: true}
+			}
+			continue
+		}
+		seen[stem] = slot{idx: len(out), isWebP: isWebP}
+		out = append(out, r)
+	}
+	return out
+}
+
+func mediaFileStem(name string) string {
+	name = filepath.Base(strings.TrimSpace(name))
+	ext := filepath.Ext(name)
+	if ext == "" {
+		return strings.ToLower(name)
+	}
+	return strings.ToLower(strings.TrimSuffix(name, ext))
+}
+
 // DeleteMedia 按 URL 批量删除媒体（含伴生扩展名与数据库索引）
 func (s *UploadStore) DeleteMedia(urls []string) (int, error) {
 	if s == nil {

service/message.go

@@ -3,11 +3,13 @@ package service
 import (
 	"errors"
 	"fmt"
+	"regexp"
 	"strings"
 	"time"
 	"unicode/utf8"
 
 	"git.iioio.com/freefire/jiang13-forum/model"
+	"gorm.io/gorm"
 )
 
 var (
@@ -24,13 +26,15 @@ func NewMessageService(filter *SensitiveFilter, settings *ForumSettingsService)
 }
 
 type MessageSendInput struct {
-	FromUserID      uint
+	FromUserID       uint
-	ToUserID        uint
+	ToUserID         uint
-	Subject         string
+	Subject          string
-	Content         string
+	Content          string
-	Kind            string
+	Kind             string
-	RelatedPostID   *uint
+	RelatedPostID    *uint
-	RelatedReportID *uint
+	RelatedReportID  *uint
+	RelatedCommentID *uint
+	RelatedFloor     *int
 }
 
 // Send 发送私信（用户互发或系统通知）
@@ -82,14 +86,16 @@ func (s *MessageService) Send(in MessageSendInput) (*model.PrivateMessage, error
 	}
 
 	msg := &model.PrivateMessage{
-		FromUserID:      in.FromUserID,
+		FromUserID:       in.FromUserID,
-		ToUserID:        in.ToUserID,
+		ToUserID:         in.ToUserID,
-		Subject:         subject,
+		Subject:          subject,
-		Content:         content,
+		Content:          content,
-		Kind:            kind,
+		Kind:             kind,
-		RelatedPostID:   in.RelatedPostID,
+		RelatedPostID:    in.RelatedPostID,
-		RelatedReportID: in.RelatedReportID,
+		RelatedReportID:  in.RelatedReportID,
-		IsRead:          false,
+		RelatedCommentID: in.RelatedCommentID,
+		RelatedFloor:     in.RelatedFloor,
+		IsRead:           false,
 	}
 	if err := model.DB.Create(msg).Error; err != nil {
 		return nil, err
@@ -98,22 +104,54 @@ func (s *MessageService) Send(in MessageSendInput) (*model.PrivateMessage, error
 	return msg, nil
 }
 
+// SystemNotifyRefs 系统通知关联目标（帖子 / 评论 / 举报）
+type SystemNotifyRefs struct {
+	PostID    *uint
+	ReportID  *uint
+	CommentID *uint
+	Floor     *int
+}
+
 // SendSystem 系统私信（管理员/系统 → 用户）
 func (s *MessageService) SendSystem(toUserID uint, subject, content, kind string, relatedPostID, relatedReportID *uint) (*model.PrivateMessage, error) {
+	return s.SendSystemWithRefs(toUserID, subject, content, kind, SystemNotifyRefs{
+		PostID:   relatedPostID,
+		ReportID: relatedReportID,
+	})
+}
+
+// SendSystemWithRefs 系统私信（可附带评论楼层深链）
+func (s *MessageService) SendSystemWithRefs(toUserID uint, subject, content, kind string, refs SystemNotifyRefs) (*model.PrivateMessage, error) {
 	if kind == "" {
 		kind = model.MessageKindSystem
 	}
 	return s.Send(MessageSendInput{
-		FromUserID:      0,
+		FromUserID:       0,
-		ToUserID:        toUserID,
+		ToUserID:         toUserID,
-		Subject:         subject,
+		Subject:          subject,
-		Content:         content,
+		Content:          content,
-		Kind:            kind,
+		Kind:             kind,
-		RelatedPostID:   relatedPostID,
+		RelatedPostID:    refs.PostID,
-		RelatedReportID: relatedReportID,
+		RelatedReportID:  refs.ReportID,
+		RelatedCommentID: refs.CommentID,
+		RelatedFloor:     refs.Floor,
 	})
 }
 
+// MarkMessageRead 将单条消息标为已读（仅收件人本人）
+func (s *MessageService) MarkMessageRead(userID, messageID uint) error {
+	if messageID == 0 {
+		return errors.New("无效的消息")
+	}
+	res := model.DB.Model(&model.PrivateMessage{}).
+		Where("id = ? AND to_user_id = ? AND is_read = ?", messageID, userID, false).
+		Update("is_read", true)
+	if res.Error != nil {
+		return res.Error
+	}
+	return nil
+}
+
 // MarkAllRead 全部标为已读
 func (s *MessageService) MarkAllRead(userID uint) error {
 	return model.DB.Model(&model.PrivateMessage{}).
@@ -175,9 +213,212 @@ func (s *MessageService) ListNotifications(userID uint, page, size int, kind str
 	if list == nil {
 		list = []model.PrivateMessage{}
 	}
+	s.enrichModerationStatus(list)
 	return list, total, nil
 }
 
+// enrichModerationStatus 为待审通知回填目标当前审核状态
+func (s *MessageService) enrichModerationStatus(list []model.PrivateMessage) {
+	if len(list) == 0 {
+		return
+	}
+
+	resolvedByIndex := enrichModerationCommentIDs(list)
+
+	commentIDs := make([]uint, 0, len(list))
+	postIDs := make([]uint, 0, len(list))
+	// 历史评论通知：按帖+楼层回查（兜底）
+	type pfKey struct {
+		PostID uint
+		Floor  int
+	}
+	pfNeeded := make([]pfKey, 0, len(list))
+	seenC := map[uint]struct{}{}
+	seenP := map[uint]struct{}{}
+	seenPF := map[pfKey]struct{}{}
+
+	for i := range list {
+		m := &list[i]
+		if m.Kind != model.MessageKindModeration {
+			continue
+		}
+		if m.RelatedCommentID != nil && *m.RelatedCommentID > 0 {
+			id := *m.RelatedCommentID
+			if _, ok := seenC[id]; !ok {
+				seenC[id] = struct{}{}
+				commentIDs = append(commentIDs, id)
+			}
+			continue
+		}
+		if cid, ok := resolvedByIndex[i]; ok && cid > 0 {
+			if _, ok := seenC[cid]; !ok {
+				seenC[cid] = struct{}{}
+				commentIDs = append(commentIDs, cid)
+			}
+			continue
+		}
+		if m.RelatedPostID == nil || *m.RelatedPostID == 0 {
+			continue
+		}
+		pid := *m.RelatedPostID
+		if looksLikeModerationComment(m.Subject, m.Content) {
+			floor := 0
+			if m.RelatedFloor != nil && *m.RelatedFloor > 0 {
+				floor = *m.RelatedFloor
+			} else {
+				floor = parseNotifyFloor(m.Content)
+			}
+			if floor > 0 {
+				k := pfKey{PostID: pid, Floor: floor}
+				if _, ok := seenPF[k]; !ok {
+					seenPF[k] = struct{}{}
+					pfNeeded = append(pfNeeded, k)
+				}
+			}
+			continue
+		}
+		if _, ok := seenP[pid]; !ok {
+			seenP[pid] = struct{}{}
+			postIDs = append(postIDs, pid)
+		}
+	}
+
+	commentStatus := map[uint]string{}
+	if len(commentIDs) > 0 {
+		type row struct {
+			ID        uint
+			Status    string
+			DeletedAt gorm.DeletedAt
+		}
+		var rows []row
+		_ = model.DB.Unscoped().Model(&model.Comment{}).
+			Select("id", "status", "deleted_at").
+			Where("id IN ?", commentIDs).
+			Find(&rows)
+		for _, r := range rows {
+			commentStatus[r.ID] = contentStatusOrDeleted(r.Status, r.DeletedAt)
+		}
+		for _, id := range commentIDs {
+			if _, ok := commentStatus[id]; !ok {
+				commentStatus[id] = "deleted"
+			}
+		}
+	}
+
+	statusByPF := map[pfKey]string{}
+	if len(pfNeeded) > 0 {
+		postSet := map[uint]struct{}{}
+		for _, k := range pfNeeded {
+			postSet[k.PostID] = struct{}{}
+		}
+		pids := make([]uint, 0, len(postSet))
+		for id := range postSet {
+			pids = append(pids, id)
+		}
+		type row struct {
+			PostID    uint
+			Floor     int
+			Status    string
+			DeletedAt gorm.DeletedAt
+		}
+		var rows []row
+		_ = model.DB.Unscoped().Model(&model.Comment{}).
+			Select("post_id", "floor", "status", "deleted_at").
+			Where("post_id IN ?", pids).
+			Find(&rows)
+		for _, r := range rows {
+			k := pfKey{PostID: r.PostID, Floor: r.Floor}
+			// 同楼多条时后者覆盖；正常业务一帖一楼唯一
+			statusByPF[k] = contentStatusOrDeleted(r.Status, r.DeletedAt)
+		}
+		for _, k := range pfNeeded {
+			if _, ok := statusByPF[k]; !ok {
+				statusByPF[k] = "deleted"
+			}
+		}
+	}
+
+	postStatus := map[uint]string{}
+	if len(postIDs) > 0 {
+		type row struct {
+			ID        uint
+			Status    string
+			DeletedAt gorm.DeletedAt
+		}
+		var rows []row
+		_ = model.DB.Unscoped().Model(&model.Post{}).
+			Select("id", "status", "deleted_at").
+			Where("id IN ?", postIDs).
+			Find(&rows)
+		for _, r := range rows {
+			postStatus[r.ID] = contentStatusOrDeleted(r.Status, r.DeletedAt)
+		}
+		for _, id := range postIDs {
+			if _, ok := postStatus[id]; !ok {
+				postStatus[id] = "deleted"
+			}
+		}
+	}
+
+	for i := range list {
+		m := &list[i]
+		if m.Kind != model.MessageKindModeration {
+			continue
+		}
+		if m.RelatedCommentID != nil && *m.RelatedCommentID > 0 {
+			m.RelatedStatus = commentStatus[*m.RelatedCommentID]
+			continue
+		}
+		if cid, ok := resolvedByIndex[i]; ok && cid > 0 {
+			m.RelatedStatus = commentStatus[cid]
+			continue
+		}
+		if m.RelatedPostID == nil || *m.RelatedPostID == 0 {
+			continue
+		}
+		pid := *m.RelatedPostID
+		if looksLikeModerationComment(m.Subject, m.Content) {
+			floor := 0
+			if m.RelatedFloor != nil && *m.RelatedFloor > 0 {
+				floor = *m.RelatedFloor
+			} else {
+				floor = parseNotifyFloor(m.Content)
+			}
+			if floor > 0 {
+				m.RelatedStatus = statusByPF[pfKey{PostID: pid, Floor: floor}]
+			}
+			continue
+		}
+		m.RelatedStatus = postStatus[pid]
+	}
+}
+
+var notifyFloorRe = regexp.MustCompile(`#(\d+)\s*楼`)
+
+// parseNotifyFloor 从待审评论文案解析楼号（如「#2 楼评论」「#1 楼下」）
+func parseNotifyFloor(content string) int {
+	m := notifyFloorRe.FindStringSubmatch(content)
+	if len(m) < 2 {
+		return 0
+	}
+	var n int
+	_, _ = fmt.Sscanf(m[1], "%d", &n)
+	if n < 0 {
+		return 0
+	}
+	return n
+}
+
+func contentStatusOrDeleted(status string, deletedAt gorm.DeletedAt) string {
+	if deletedAt.Valid {
+		return "deleted"
+	}
+	if status != "" {
+		return status
+	}
+	return model.ContentStatusPublished
+}
+
 // MarkNotificationsRead 将系统通知全部标为已读
 func (s *MessageService) MarkNotificationsRead(userID uint) error {
 	return s.MarkConversationRead(userID, 0)

service/message_moderation.go

@@ -0,0 +1,166 @@
+package service
+
+import (
+	"math"
+	"strings"
+	"time"
+
+	"git.iioio.com/freefire/jiang13-forum/model"
+)
+
+// looksLikeModerationComment 判断待审通知是否指向评论（含嵌套回复）
+func looksLikeModerationComment(subject, content string) bool {
+	if strings.Contains(subject, "评论") || strings.Contains(content, "评论") {
+		return true
+	}
+	return strings.Contains(content, "回复") || strings.Contains(content, "楼下")
+}
+
+// isNestedModerationContent 嵌套回复待审（正文为「#N 楼下…」）
+func isNestedModerationContent(content string) bool {
+	return strings.Contains(content, "楼下")
+}
+
+// resolveModerationCommentRef 为历史待审评论通知推断目标评论 ID 与自身楼号
+func resolveModerationCommentRef(postID uint, content string, notifyAt time.Time) (commentID uint, floor int) {
+	if postID == 0 || model.DB == nil {
+		return 0, 0
+	}
+	displayFloor := parseNotifyFloor(content)
+	if displayFloor <= 0 {
+		return 0, 0
+	}
+
+	if isNestedModerationContent(content) {
+		var parent struct {
+			ID uint
+		}
+		err := model.DB.Unscoped().Model(&model.Comment{}).
+			Select("id").
+			Where("post_id = ? AND floor = ?", postID, displayFloor).
+			First(&parent).Error
+		if err != nil || parent.ID == 0 {
+			return 0, 0
+		}
+
+		type childRow struct {
+			ID        uint
+			Floor     int
+			CreatedAt time.Time
+		}
+		var children []childRow
+		_ = model.DB.Unscoped().Model(&model.Comment{}).
+			Select("id", "floor", "created_at").
+			Where("post_id = ? AND reply_to = ?", postID, parent.ID).
+			Find(&children).Error
+		if len(children) == 0 {
+			return 0, 0
+		}
+		if len(children) == 1 {
+			return children[0].ID, children[0].Floor
+		}
+		best := children[0]
+		bestDiff := math.MaxFloat64
+		for _, c := range children {
+			diff := math.Abs(float64(c.CreatedAt.Sub(notifyAt)))
+			if diff < bestDiff {
+				bestDiff = diff
+				best = c
+			}
+		}
+		// 通知与评论创建时间相差超过 7 天则放弃，避免误配旧回复
+		if bestDiff > float64(7*24*time.Hour) {
+			return 0, 0
+		}
+		return best.ID, best.Floor
+	}
+
+	var row struct {
+		ID    uint
+		Floor int
+	}
+	err := model.DB.Unscoped().Model(&model.Comment{}).
+		Select("id", "floor").
+		Where("post_id = ? AND floor = ?", postID, displayFloor).
+		First(&row).Error
+	if err != nil || row.ID == 0 {
+		return 0, 0
+	}
+	return row.ID, row.Floor
+}
+
+// BackfillModerationNotifyRefs 为历史 moderation 通知补写 related_comment_id / related_floor
+func BackfillModerationNotifyRefs() error {
+	if model.DB == nil {
+		return nil
+	}
+	var rows []model.PrivateMessage
+	err := model.DB.Where("kind = ? AND (related_comment_id IS NULL OR related_comment_id = 0)", model.MessageKindModeration).
+		Find(&rows).Error
+	if err != nil {
+		return err
+	}
+	for _, m := range rows {
+		if m.RelatedPostID == nil || *m.RelatedPostID == 0 {
+			continue
+		}
+		if !looksLikeModerationComment(m.Subject, m.Content) {
+			continue
+		}
+		cid, fl := resolveModerationCommentRef(*m.RelatedPostID, m.Content, m.CreatedAt)
+		if cid == 0 {
+			continue
+		}
+		floor := fl
+		updates := map[string]interface{}{
+			"related_comment_id": cid,
+			"related_floor":      floor,
+		}
+		_ = model.DB.Model(&model.PrivateMessage{}).Where("id = ?", m.ID).Updates(updates).Error
+	}
+	return nil
+}
+
+// enrichModerationCommentIDs 为无 related_comment_id 的评论类待审通知解析评论 ID
+func enrichModerationCommentIDs(list []model.PrivateMessage) map[int]uint {
+	out := make(map[int]uint)
+	for i := range list {
+		m := &list[i]
+		if m.Kind != model.MessageKindModeration {
+			continue
+		}
+		if m.RelatedCommentID != nil && *m.RelatedCommentID > 0 {
+			continue
+		}
+		if m.RelatedPostID == nil || *m.RelatedPostID == 0 {
+			continue
+		}
+		if !looksLikeModerationComment(m.Subject, m.Content) {
+			continue
+		}
+		// 嵌套回复优先按子评论匹配，避免 displayFloor 查到父评论状态
+		if isNestedModerationContent(m.Content) {
+			cid, _ := resolveModerationCommentRef(*m.RelatedPostID, m.Content, m.CreatedAt)
+			if cid > 0 {
+				out[i] = cid
+			}
+			continue
+		}
+		// 顶层评论：有 related_floor 时按楼号查 ID
+		if m.RelatedFloor != nil && *m.RelatedFloor > 0 {
+			var row struct{ ID uint }
+			if err := model.DB.Unscoped().Model(&model.Comment{}).
+				Select("id").
+				Where("post_id = ? AND floor = ?", *m.RelatedPostID, *m.RelatedFloor).
+				First(&row).Error; err == nil && row.ID > 0 {
+				out[i] = row.ID
+			}
+			continue
+		}
+		cid, _ := resolveModerationCommentRef(*m.RelatedPostID, m.Content, m.CreatedAt)
+		if cid > 0 {
+			out[i] = cid
+		}
+	}
+	return out
+}

service/message_moderation_integration_test.go

@@ -0,0 +1,61 @@
+package service
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"git.iioio.com/freefire/jiang13-forum/model"
+	"github.com/glebarez/sqlite"
+	"gorm.io/gorm"
+)
+
+// TestProductionDBModerationEnrich 用本地生产库拷贝验证 related_status 回填（无库则跳过）
+func TestProductionDBModerationEnrich(t *testing.T) {
+	dbPath := filepath.Join("..", "dist", "data", "jiang13.db")
+	if _, err := os.Stat(dbPath); err != nil {
+		t.Skip("dist/data/jiang13.db 不存在，跳过")
+	}
+
+	db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	model.DB = db
+
+	if err := BackfillModerationNotifyRefs(); err != nil {
+		t.Fatal(err)
+	}
+
+	var adminID uint
+	if err := db.Model(&model.User{}).Where("role = ?", model.RoleAdmin).Order("id asc").Limit(1).Pluck("id", &adminID).Error; err != nil || adminID == 0 {
+		t.Skip("无管理员用户，跳过")
+	}
+
+	svc := &MessageService{}
+	list, _, err := svc.ListNotifications(adminID, 1, 100, "moderation")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(list) == 0 {
+		t.Skip("无 moderation 通知")
+	}
+
+	pendingUI := 0
+	published := 0
+	for _, m := range list {
+		if m.RelatedStatus == model.ContentStatusPublished {
+			published++
+		} else if m.RelatedStatus == "" || m.RelatedStatus == model.ContentStatusPending {
+			pendingUI++
+			t.Logf("仍无 published 状态: id=%d subject=%q status=%q content=%q", m.ID, m.Subject, m.RelatedStatus, m.Content)
+		}
+	}
+	t.Logf("moderation=%d published=%d pending_or_empty=%d", len(list), published, pendingUI)
+	if published == 0 {
+		t.Fatal("没有任何 moderation 通知回填为 published")
+	}
+	if pendingUI > 0 {
+		t.Fatalf("%d 条通知仍会被 UI 判为待审", pendingUI)
+	}
+}

service/message_moderation_test.go

@@ -0,0 +1,102 @@
+package service
+
+import (
+	"testing"
+	"time"
+
+	"git.iioio.com/freefire/jiang13-forum/model"
+	"github.com/glebarez/sqlite"
+	"gorm.io/gorm"
+)
+
+func TestParseNotifyFloor(t *testing.T) {
+	cases := map[string]int{
+		"用户 X 在《Y》提交了待审核 #2 楼评论": 2,
+		"用户 X 在《Y》#3 楼下提交了待审核回复":  3,
+		"无楼号":                        0,
+	}
+	for content, want := range cases {
+		if got := parseNotifyFloor(content); got != want {
+			t.Errorf("parseNotifyFloor(%q) = %d, want %d", content, got, want)
+		}
+	}
+}
+
+func TestEnrichModerationStatusPublished(t *testing.T) {
+	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := db.AutoMigrate(&model.User{}, &model.Post{}, &model.Comment{}, &model.PrivateMessage{}); err != nil {
+		t.Fatal(err)
+	}
+	model.DB = db
+
+	post := model.Post{Title: "测试帖", Status: model.ContentStatusPublished, UserID: 1}
+	if err := db.Create(&post).Error; err != nil {
+		t.Fatal(err)
+	}
+	comment := model.Comment{
+		PostID: post.ID, UserID: 2, Floor: 2,
+		Status: model.ContentStatusPublished,
+	}
+	if err := db.Create(&comment).Error; err != nil {
+		t.Fatal(err)
+	}
+
+	pid := post.ID
+	msg := model.PrivateMessage{
+		FromUserID:    0,
+		ToUserID:      1,
+		Subject:       "新的待审核评论",
+		Content:       "用户 A 在《测试帖》提交了待审核 #2 楼评论",
+		Kind:          model.MessageKindModeration,
+		RelatedPostID: &pid,
+		CreatedAt:     time.Now(),
+	}
+	if err := db.Create(&msg).Error; err != nil {
+		t.Fatal(err)
+	}
+
+	svc := &MessageService{}
+	list := []model.PrivateMessage{msg}
+	svc.enrichModerationStatus(list)
+	if list[0].RelatedStatus != model.ContentStatusPublished {
+		t.Fatalf("RelatedStatus = %q, want published", list[0].RelatedStatus)
+	}
+}
+
+func TestResolveNestedModerationCommentRef(t *testing.T) {
+	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := db.AutoMigrate(&model.Post{}, &model.Comment{}); err != nil {
+		t.Fatal(err)
+	}
+	model.DB = db
+
+	post := model.Post{Title: "嵌套", Status: model.ContentStatusPublished}
+	if err := db.Create(&post).Error; err != nil {
+		t.Fatal(err)
+	}
+	parent := model.Comment{PostID: post.ID, Floor: 1, Status: model.ContentStatusPublished}
+	child := model.Comment{
+		PostID: post.ID, Floor: 3, Status: model.ContentStatusPublished,
+	}
+	if err := db.Create(&parent).Error; err != nil {
+		t.Fatal(err)
+	}
+	rt := parent.ID
+	child.ReplyTo = &rt
+	child.CreatedAt = time.Now()
+	if err := db.Create(&child).Error; err != nil {
+		t.Fatal(err)
+	}
+
+	notifyAt := child.CreatedAt.Add(2 * time.Second)
+	cid, floor := resolveModerationCommentRef(post.ID, "用户 A 在《嵌套》#1 楼下提交了待审核回复", notifyAt)
+	if cid != child.ID || floor != 3 {
+		t.Fatalf("resolve = (%d, %d), want (%d, 3)", cid, floor, child.ID)
+	}
+}

service/notify.go

@@ -96,9 +96,15 @@ func (s *NotifyService) NotifyCommentPublished(comment *model.Comment) {
 	subject := "收到新回复"
 	content := FormatReplyContent(authorName, title, displayFloor, isNested)
 	pid := comment.PostID
-	_, _ = s.messages.SendSystem(toUserID, subject, content, model.MessageKindReply, &pid, nil)
+	cid := comment.ID
+	floor := comment.Floor
+	_, _ = s.messages.SendSystemWithRefs(toUserID, subject, content, model.MessageKindReply, SystemNotifyRefs{
+		PostID:    &pid,
+		CommentID: &cid,
+		Floor:     &floor,
+	})
 
-	s.sendReplyMail(toUserID, authorName, title, comment.PostID, displayFloor, isNested, comment.Content)
+	s.sendReplyMail(toUserID, authorName, title, comment.PostID, comment.Floor, displayFloor, isNested, comment.Content)
 }
 
 // NotifyCommentMentions 评论公开后通知被 @提及的用户（跳过已收到回复通知的人）
@@ -125,6 +131,8 @@ func (s *NotifyService) NotifyCommentMentions(comment *model.Comment) {
 	}
 	displayFloor := s.resolveDisplayFloor(comment)
 	pid := comment.PostID
+	cid := comment.ID
+	floor := comment.Floor
 	subject := "有人 @了你"
 	content := FormatMentionContent(authorName, title, displayFloor)
 
@@ -132,7 +140,11 @@ func (s *NotifyService) NotifyCommentMentions(comment *model.Comment) {
 		if uid == 0 || uid == comment.UserID || uid == replyTo {
 			continue
 		}
-		_, _ = s.messages.SendSystem(uid, subject, content, model.MessageKindMention, &pid, nil)
+		_, _ = s.messages.SendSystemWithRefs(uid, subject, content, model.MessageKindMention, SystemNotifyRefs{
+			PostID:    &pid,
+			CommentID: &cid,
+			Floor:     &floor,
+		})
 	}
 }
 
@@ -149,8 +161,9 @@ func (s *NotifyService) NotifyPendingPost(post *model.Post) {
 	subject := "新的待审核帖子"
 	content := FormatPendingPostContent(authorName, title, post.ID)
 	pid := post.ID
-	s.notifyAdmins(subject, content, model.MessageKindModeration, &pid, func(siteName, baseURL string) (string, string, string) {
+	s.notifyAdmins(subject, content, model.MessageKindModeration, SystemNotifyRefs{PostID: &pid}, func(siteName, baseURL string) (string, string, string) {
-		return BuildModerationMail(siteName, "帖子", authorName, title, post.ID, 0, false, AbsoluteURL(baseURL, "/admin/posts"))
+		adminPath := fmt.Sprintf("/admin/posts?id=%d", post.ID)
+		return BuildModerationMail(siteName, "帖子", authorName, title, post.ID, 0, false, AbsoluteURL(baseURL, adminPath))
 	})
 }
 
@@ -173,14 +186,21 @@ func (s *NotifyService) NotifyPendingComment(comment *model.Comment) {
 	isNested := comment.ReplyTo != nil && *comment.ReplyTo > 0
 	content := FormatPendingCommentContent(authorName, title, displayFloor, isNested)
 	pid := comment.PostID
-	s.notifyAdmins(subject, content, model.MessageKindModeration, &pid, func(siteName, baseURL string) (string, string, string) {
+	cid := comment.ID
-		return BuildModerationMail(siteName, "评论", authorName, title, comment.PostID, displayFloor, isNested, AbsoluteURL(baseURL, "/admin/comments"))
+	floor := comment.Floor
+	adminPath := fmt.Sprintf("/admin/comments?id=%d", comment.ID)
+	s.notifyAdmins(subject, content, model.MessageKindModeration, SystemNotifyRefs{
+		PostID:    &pid,
+		CommentID: &cid,
+		Floor:     &floor,
+	}, func(siteName, baseURL string) (string, string, string) {
+		return BuildModerationMail(siteName, "评论", authorName, title, comment.PostID, displayFloor, isNested, AbsoluteURL(baseURL, adminPath))
 	})
 }
 
 func (s *NotifyService) notifyAdmins(
 	subject, content, kind string,
-	relatedPostID *uint,
+	refs SystemNotifyRefs,
 	buildMail func(siteName, baseURL string) (subj, text, html string),
 ) {
 	admins, err := s.listAdmins()
@@ -197,7 +217,7 @@ func (s *NotifyService) notifyAdmins(
 	}
 
 	for _, admin := range admins {
-		_, _ = s.messages.SendSystem(admin.ID, subject, content, kind, relatedPostID, nil)
+		_, _ = s.messages.SendSystemWithRefs(admin.ID, subject, content, kind, refs)
 		email := strings.TrimSpace(admin.Email)
 		if email == "" || mailSubj == "" {
 			continue
@@ -211,7 +231,7 @@ func (s *NotifyService) notifyAdmins(
 	}
 }
 
-func (s *NotifyService) sendReplyMail(toUserID uint, authorName, postTitle string, postID uint, displayFloor int, isNested bool, rawContent string) {
+func (s *NotifyService) sendReplyMail(toUserID uint, authorName, postTitle string, postID uint, ownFloor, displayFloor int, isNested bool, rawContent string) {
 	if s.mail == nil || !s.settings.MailReady() {
 		return
 	}
@@ -227,6 +247,10 @@ func (s *NotifyService) sendReplyMail(toUserID uint, authorName, postTitle strin
 	baseURL := s.settings.SitePublicBaseURL("")
 	postPath := s.settings.Permalink().PostPath(postID)
 	link := AbsoluteURL(baseURL, postPath)
+	// 直达评论自身楼层（嵌套回复也有独立 floor）
+	if ownFloor > 0 {
+		link = fmt.Sprintf("%s#floor-%d", link, ownFloor)
+	}
 	excerpt := truncateNotifyExcerpt(rawContent, 120)
 	subj, text, html := BuildReplyMail(siteName, authorName, postTitle, displayFloor, isNested, excerpt, link)
 	_ = s.mail.SendHTML(email, subj, text, html)

service/post.go

@@ -357,18 +357,12 @@ func (s *PostService) List(q PostListQuery) ([]model.Post, int64, error) {
 	}
 	switch sortKey {
 	case "reply":
-		// 有回复的帖子优先，按最后回复时间倒序；无回复的帖子沉底（仅计已公开评论）
+		// 最近活动：按最后公开评论时间与发帖时间的较晚者倒序（零回复新帖也能靠前）
-		db = db.Order(`(
+		db = db.Order(`COALESCE((
-			SELECT COUNT(*) FROM comments
-			WHERE comments.post_id = posts.id AND comments.deleted_at IS NULL
-			AND comments.status = 'published'
-		) > 0 DESC`)
-		db = db.Order(`(
 			SELECT MAX(created_at) FROM comments
 			WHERE comments.post_id = posts.id AND comments.deleted_at IS NULL
 			AND comments.status = 'published'
-		) DESC`)
+		), posts.created_at) DESC`)
-		db = db.Order("posts.created_at DESC")
 	case "hot":
 		// 仅推荐帖：按互动再按 id
 		db = db.Order("like_count desc, view_count desc")
@@ -384,7 +378,7 @@ func normalizePostSort(sort string) string {
 	case "latest", "hot":
 		return sort
 	default:
-		// 含空串 / reply：默认新评论
+		// 含空串 / reply：默认最近活动
 		return "reply"
 	}
 }

service/report.go

@@ -305,14 +305,20 @@ func (s *ReportService) Handle(in HandleReportInput) (*model.PostReport, error)
 		if commentAuthorID > 0 {
 			pid := postID
 			rid := rep.ID
+			cid := *rep.CommentID
+			floor := commentFloor
 			body := fmt.Sprintf("你在帖子《%s》下的评论（#%d）未通过审核。\n\n原因：\n%s", postTitle, commentFloor, reason)
-			_, _ = s.messages.SendSystem(
+			_, _ = s.messages.SendSystemWithRefs(
 				commentAuthorID,
 				fmt.Sprintf("评论未通过审核 · 《%s》", postTitle),
 				body,
 				model.MessageKindReject,
-				&pid,
+				SystemNotifyRefs{
-				&rid,
+					PostID:    &pid,
+					ReportID:  &rid,
+					CommentID: &cid,
+					Floor:     &floor,
+				},
 			)
 		}
 	default:
@@ -345,13 +351,19 @@ func (s *ReportService) Handle(in HandleReportInput) (*model.PostReport, error)
 	}
 	pid := postID
 	rid := rep.ID
-	_, _ = s.messages.SendSystem(
+	resultRefs := SystemNotifyRefs{PostID: &pid, ReportID: &rid}
+	if isCommentReport && rep.CommentID != nil {
+		cid := *rep.CommentID
+		floor := commentFloor
+		resultRefs.CommentID = &cid
+		resultRefs.Floor = &floor
+	}
+	_, _ = s.messages.SendSystemWithRefs(
 		rep.ReporterID,
 		"举报处理结果通知",
 		content,
 		model.MessageKindReportResult,
-		&pid,
+		resultRefs,
-		&rid,
 	)
 
 	_ = model.DB.Preload("Post", func(tx *gorm.DB) *gorm.DB {

service/settings.go

@@ -206,7 +206,7 @@ var feedSortTabDefaultOrder = []string{
 }
 
 var feedSortTabDefaultLabels = map[string]string{
-	FeedSortReply:  "新评论",
+	FeedSortReply:  "最新",
 	FeedSortLatest: "新帖子",
 	FeedSortHot:    "推荐帖",
 }
@@ -287,7 +287,7 @@ var forumSettingDefs = []settingDef{
 
 var feedSettingDefaults = map[string]string{
 	SettingFeedListStyle: "title",
-	SettingFeedSortTabs:  `[{"id":"reply","label":"新评论","enabled":true},{"id":"latest","label":"新帖子","enabled":true},{"id":"hot","label":"推荐帖","enabled":true}]`,
+	SettingFeedSortTabs:  `[{"id":"reply","label":"最新","enabled":true},{"id":"latest","label":"新帖子","enabled":true},{"id":"hot","label":"推荐帖","enabled":true}]`,
 }
 
 var asideSettingDefaults = map[string]string{