freefire/jiang13-forum
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Compare commits

base: freefire:v1.1.6
Branches Tags
freefire:main freefire:rebuild/gitea-ssr
freefire:v1.1.7 freefire:v1.1.6 freefire:v1.1.5
...
compare: freefire:main
Branches Tags
freefire:main freefire:rebuild/gitea-ssr
freefire:v1.1.7 freefire:v1.1.6 freefire:v1.1.5

6 Commits
v1.1.6 ... main

Author SHA1 Message Date
freefire
76be8926f2 feat: 完善表情选择与评论富文本展示 
发帖编辑器支持 OwO 贴纸；评论区复用文章列表、段落与代码块阅读态，并优化表情面板间距与悬停反馈。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-02 03:57:41 +08:00
freefire
4d93e455f9 fix: 私信表情插入编辑框，不再作为图片附件发送 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-02 03:12:33 +08:00
freefire
c958dcfd80 chore: 发布 Docker 镜像版本 1.1.7 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-02 03:01:36 +08:00
freefire
84bfbd9a3e fix: 帖子详情右栏默认头像与全站配色一致 
作者卡占位头像改为深绿底白字，与 post-avatar 默认样式统一。
 2026-09-02 02:50:23 +08:00
freefire
500e452c2f feat: 重设计私信页并优化开源展柜体验 
私信改为飞书风布局，支持缩略图表情/图片、按会话草稿与用户搜索发起会话；主页发私信直达消息页。开源展柜修复空列表粘滞并改版目录式 UI。
 2026-09-02 02:45:29 +08:00
freefire
1c0f7ede55 fix: 待审通知实时回填审核态并重构消息页体验 2026-09-02 01:39:27 +08:00
41 changed files with 3323 additions and 833 deletions
Expand all files Collapse all files

2
Makefile
View File

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

14
README.md
View File

@@ -212,15 +212,15 @@ docker run -d --name jiang13 \
docker login docker login
.\build.bat -Target docker # Windows .\build.bat -Target docker # Windows
# make docker # Linux/macOS # make docker # Linux/macOS
docker push hangzhang714128/jiang13-forum:1.1.6 docker push hangzhang714128/jiang13-forum:1.1.7
docker push hangzhang714128/jiang13-forum:latest docker push hangzhang714128/jiang13-forum:latest
``` ```
或直接构建： 或直接构建：
```bash ```bash
docker build --build-arg VERSION=1.1.6 -t hangzhang714128/jiang13-forum:1.1.6 -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.6 docker push hangzhang714128/jiang13-forum:1.1.7
docker push hangzhang714128/jiang13-forum:latest docker push hangzhang714128/jiang13-forum:latest
``` ```
@@ -252,19 +252,19 @@ docker push hangzhang714128/jiang13-forum:latest
| `jiang13-*-windows-amd64.exe` | Windows x64 | | `jiang13-*-windows-amd64.exe` | Windows x64 |
| `jiang13-*-linux-amd64` | Linux x64 | | `jiang13-*-linux-amd64` | Linux x64 |
当前 **1.1.6：** [Windows](https://git.iioio.com/freefire/jiang13-forum/releases/download/v1.1.6/jiang13-1.1.6-windows-amd64.exe) · [Linux](https://git.iioio.com/freefire/jiang13-forum/releases/download/v1.1.6/jiang13-1.1.6-linux-amd64) 当前 **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`）： 把文件放到目标目录后直接运行（首次会在同目录生成 `app.ini`）：
```bash ```bash
# Windows # Windows
.\jiang13-1.1.6-windows-amd64.exe .\jiang13-1.1.7-windows-amd64.exe
# 或改名为 jiang13.exe 后： # 或改名为 jiang13.exe 后：
.\jiang13.exe .\jiang13.exe
# Linux # Linux
chmod +x jiang13-1.1.6-linux-amd64 chmod +x jiang13-1.1.7-linux-amd64
./jiang13-1.1.6-linux-amd64 ./jiang13-1.1.7-linux-amd64
``` ```
本地刚编译的产物在 `dist/`： 本地刚编译的产物在 `dist/`：

2
build.ps1
View File

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

4
cmd/jiang13/program.go
View File

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

27
docs/site-posts/changelog.md
View File

@@ -10,7 +10,7 @@
Docker 镜像、Windows exe、Linux 单文件 **共用同一版本号**。有新版本时，以本页为准。 Docker 镜像、Windows exe、Linux 单文件 **共用同一版本号**。有新版本时，以本页为准。
**当前版本：1.1.6**（2026-09-01） **当前版本：1.1.7**（2026-09-02）
## 去哪看新版本 ## 去哪看新版本
@@ -21,16 +21,16 @@ Docker 镜像、Windows exe、Linux 单文件 **共用同一版本号**。有新
| Windows / Linux | 预编译单文件（与 Docker 同版本） | [Gitea Releases](https://git.iioio.com/freefire/jiang13-forum/releases) | | Windows / Linux | 预编译单文件（与 Docker 同版本） | [Gitea Releases](https://git.iioio.com/freefire/jiang13-forum/releases) |
| 源码 | 提交记录与自行编译 | [Gitea 仓库](https://git.iioio.com/freefire/jiang13-forum) | | 源码 | 提交记录与自行编译 | [Gitea 仓库](https://git.iioio.com/freefire/jiang13-forum) |
**1.1.6 直接下载：** **1.1.7 直接下载：**
- Windows x64：[jiang13-1.1.6-windows-amd64.exe](https://git.iioio.com/freefire/jiang13-forum/releases/download/v1.1.6/jiang13-1.1.6-windows-amd64.exe) - 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.6-linux-amd64](https://git.iioio.com/freefire/jiang13-forum/releases/download/v1.1.6/jiang13-1.1.6-linux-amd64) - 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.6/SHA256SUMS.txt) - 校验文件：[SHA256SUMS.txt](https://git.iioio.com/freefire/jiang13-forum/releases/download/v1.1.7/SHA256SUMS.txt)
拉取指定版本镜像： 拉取指定版本镜像：
```bash ```bash
docker pull hangzhang714128/jiang13-forum:1.1.6 docker pull hangzhang714128/jiang13-forum:1.1.7
# 或始终跟随最新 # 或始终跟随最新
docker pull hangzhang714128/jiang13-forum:latest docker pull hangzhang714128/jiang13-forum:latest
``` ```
@@ -47,6 +47,21 @@ Linux：赋予执行权限后放到原目录覆盖，同样保留 `data/` 与 `a
--- ---
## 1.1.7 — 2026-09-02
私信与开源展柜体验升级，待审通知的审核态更及时。
**新增 / 调整**
- 私信改为飞书风布局：缩略图表情/图片、按会话草稿、用户搜索发起会话
- 主页「发私信」直达消息页对应会话
- 开源展柜改为目录式 UI，空列表不再粘滞
- 消息页体验重构；待审通知打开后实时回填审核态
**修复**
- 帖子详情右栏默认头像改为深绿底白字，与列表默认头像配色一致
## 1.1.6 — 2026-09-01 ## 1.1.6 — 2026-09-01
编辑器插入体验与首页默认 Feed 排序更合理。 编辑器插入体验与首页默认 Feed 排序更合理。

2
frontend/src/api/client.ts
View File

@@ -664,6 +664,8 @@ export const api = {
}, },
markNotificationsRead: () => markNotificationsRead: () =>
request<{ message: string }>('/api/messages/notifications/read', { method: 'POST' }), 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 }) => sendMessage: (body: { to_user_id: number; subject?: string; content: string }) =>
request<{ message: PrivateMessage }>('/api/messages', { request<{ message: PrivateMessage }>('/api/messages', {
method: 'POST', body: JSON.stringify(body), method: 'POST', body: JSON.stringify(body),

6
frontend/src/api/types.ts
View File

@@ -717,9 +717,13 @@ export interface PrivateMessage {
to_user_id: number; to_user_id: number;
subject: string; subject: string;
content: 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_post_id?: number;
related_report_id?: number; related_report_id?: number;
related_comment_id?: number;
related_floor?: number;
/** 待审目标实时状态：pending|published|rejected|deleted */
related_status?: string;
is_read: boolean; is_read: boolean;
created_at: string; created_at: string;
from_user?: User; from_user?: User;

112
frontend/src/components/ArticleEditor.tsx
View File

@@ -1,5 +1,6 @@
import { import {
useRef, useEffect, useImperativeHandle, forwardRef, useCallback, useState, useMemo, type ReactNode, useRef, useEffect, useImperativeHandle, forwardRef, useCallback, useState, useMemo,
type ReactNode, type Ref,
} from 'react'; } from 'react';
import { useEditor, EditorContent, type Editor } from '@tiptap/react'; import { useEditor, EditorContent, type Editor } from '@tiptap/react';
import { TextSelection, NodeSelection } from '@tiptap/pm/state'; import { TextSelection, NodeSelection } from '@tiptap/pm/state';
@@ -37,7 +38,10 @@ import { ReplyOnly } from './editor/ReplyOnlyExtension';
import { PointsOnly } from './editor/PointsOnlyExtension'; import { PointsOnly } from './editor/PointsOnlyExtension';
import { TabIndent } from './editor/TabIndentExtension'; import { TabIndent } from './editor/TabIndentExtension';
import { ArticleImage, type ImageDisplay } from './editor/ArticleImageExtension'; import { ArticleImage, type ImageDisplay } from './editor/ArticleImageExtension';
import { ArticleSticker } from './editor/ArticleStickerExtension';
import { ImageGroup, suggestImageGroupLayout } from './editor/ImageGroupExtension'; import { ImageGroup, suggestImageGroupLayout } from './editor/ImageGroupExtension';
import StickerPicker from './emoji/StickerPicker';
import type { Sticker } from '../data/stickers';
import { ClearFloatParagraph, ClearFloatSync } from './editor/ClearFloatParagraph'; import { ClearFloatParagraph, ClearFloatSync } from './editor/ClearFloatParagraph';
import { ArticleLinkDialog, type ArticleLinkConfirm } from './editor/ArticleLinkDialog'; import { ArticleLinkDialog, type ArticleLinkConfirm } from './editor/ArticleLinkDialog';
import { ArticleImagePickerDialog } from './editor/ArticleImagePickerDialog'; import { ArticleImagePickerDialog } from './editor/ArticleImagePickerDialog';
@@ -84,6 +88,7 @@ interface ToolBtn {
align?: 'start' | 'center' | 'end'; align?: 'start' | 'center' | 'end';
active?: boolean; active?: boolean;
className?: string; className?: string;
buttonRef?: Ref<HTMLButtonElement>;
action: () => void; action: () => void;
} }
@@ -119,9 +124,17 @@ function sanitizeHtml(html: string): string {
return DOMPurify.sanitize(html, POST_CONTENT_PURIFY_CONFIG); return DOMPurify.sanitize(html, POST_CONTENT_PURIFY_CONFIG);
} }
/** 判断编辑器内容是否为空 */ /** 判断编辑器内容是否为空（纯贴纸/图片也算有内容） */
function isEditorEmpty(editor: Editor): boolean { function isEditorEmpty(editor: Editor): boolean {
return editor.state.doc.textContent.trim().length === 0; if (editor.state.doc.textContent.trim().length > 0) return false;
let hasMedia = false;
editor.state.doc.descendants((node) => {
if (node.type.name === 'image' || node.type.name === 'sticker' || node.type.name === 'imageGroup') {
hasMedia = true;
return false;
}
});
return !hasMedia;
} }
/** /**
@@ -177,10 +190,12 @@ function renderToolButtons(tools: ToolBtn[]) {
) : null} ) : null}
<Tooltip content={t.title} hint={t.hint} align={t.align} side="bottom"> <Tooltip content={t.title} hint={t.hint} align={t.align} side="bottom">
<button <button
ref={t.buttonRef}
type="button" type="button"
className={`article-tool-btn${t.active ? ' active' : ''}${t.className ? ` ${t.className}` : ''}`} className={`article-tool-btn${t.active ? ' active' : ''}${t.className ? ` ${t.className}` : ''}`}
onMouseDown={e => e.preventDefault()} onMouseDown={e => e.preventDefault()}
onClick={t.action} onClick={t.action}
aria-pressed={t.active || undefined}
> >
{t.icon} {t.icon}
</button> </button>
@@ -213,7 +228,10 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
const [tableDialogOpen, setTableDialogOpen] = useState(false); const [tableDialogOpen, setTableDialogOpen] = useState(false);
const [tableTarget, setTableTarget] = useState<TableTarget>('rich'); const [tableTarget, setTableTarget] = useState<TableTarget>('rich');
const [tableEditing, setTableEditing] = useState(false); const [tableEditing, setTableEditing] = useState(false);
const [showSticker, setShowSticker] = useState(false);
const markdownRef = useRef<HTMLTextAreaElement>(null); const markdownRef = useRef<HTMLTextAreaElement>(null);
const editorBoxRef = useRef<HTMLDivElement>(null);
const stickerBtnRef = useRef<HTMLButtonElement>(null);
const editor = useEditor({ const editor = useEditor({
extensions: [ extensions: [
@@ -246,6 +264,7 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
}, },
}), }),
ArticleImage.configure({ inline: false, allowBase64: false }), ArticleImage.configure({ inline: false, allowBase64: false }),
ArticleSticker,
ImageGroup, ImageGroup,
Placeholder.configure({ Placeholder.configure({
placeholder: ({ node }) => { placeholder: ({ node }) => {
@@ -322,23 +341,42 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
placeCaretInFirstTextblock(editor); placeCaretInFirstTextblock(editor);
}, [value, editor, mode]); }, [value, editor, mode]);
// 全屏时锁定页面滚动，Esc 退出 // 全屏时锁定页面滚动；Esc 先关表情面板，再退出全屏
useEffect(() => { useEffect(() => {
if (!fullscreen) return undefined; if (!fullscreen && !showSticker) return undefined;
const prevOverflow = document.body.style.overflow; const prevOverflow = fullscreen ? document.body.style.overflow : null;
document.body.style.overflow = 'hidden'; if (fullscreen) document.body.style.overflow = 'hidden';
const onKeyDown = (e: KeyboardEvent) => { const onKeyDown = (e: KeyboardEvent) => {
if (e.key === 'Escape') setFullscreen(false); if (e.key !== 'Escape') return;
if (showSticker) {
setShowSticker(false);
stickerBtnRef.current?.focus();
return;
}
if (fullscreen) setFullscreen(false);
}; };
window.addEventListener('keydown', onKeyDown); window.addEventListener('keydown', onKeyDown);
return () => { return () => {
document.body.style.overflow = prevOverflow; if (prevOverflow !== null) document.body.style.overflow = prevOverflow;
window.removeEventListener('keydown', onKeyDown); window.removeEventListener('keydown', onKeyDown);
}; };
}, [fullscreen]); }, [fullscreen, showSticker]);
// 点击编辑器外关闭贴纸面板
useEffect(() => {
if (!showSticker) return;
const onPointer = (e: MouseEvent) => {
if (editorBoxRef.current && !editorBoxRef.current.contains(e.target as Node)) {
setShowSticker(false);
stickerBtnRef.current?.focus();
}
};
document.addEventListener('mousedown', onPointer);
return () => document.removeEventListener('mousedown', onPointer);
}, [showSticker]);
useImperativeHandle(ref, () => ({ useImperativeHandle(ref, () => ({
getHTML: () => { getHTML: () => {
@@ -523,6 +561,30 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
editor.chain().focus().extendMarkRange('link').unsetLink().run(); editor.chain().focus().extendMarkRange('link').unsetLink().run();
}, [editor]); }, [editor]);
const insertSticker = useCallback((sticker: Sticker) => {
if (mode === 'markdown') {
const textarea = markdownRef.current;
if (!textarea) return;
const snippet = (sticker.type === 'text' && sticker.text)
? sticker.text
: (sticker.url ? `![${sticker.name || '表情'}](${sticker.url})` : '');
if (!snippet) return;
insertAtCursor(textarea, markdownSource, snippet, handleMarkdownChange);
setShowSticker(false);
return;
}
if (!editor) return;
if (sticker.type === 'text' && sticker.text) {
editor.chain().focus().insertContent(sticker.text).run();
} else if (sticker.url) {
editor.chain().focus().insertContent([
{ type: 'sticker', attrs: { src: sticker.url, alt: sticker.name } },
{ type: 'text', text: ' ' },
]).run();
}
setShowSticker(false);
}, [editor, mode, markdownSource, handleMarkdownChange]);
const openImagePicker = useCallback((target: ImagePickerTarget) => { const openImagePicker = useCallback((target: ImagePickerTarget) => {
setImagePickerTarget(target); setImagePickerTarget(target);
setImagePickerOpen(true); setImagePickerOpen(true);
@@ -614,6 +676,7 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
const html = sanitizeHtml(editor.getHTML()); const html = sanitizeHtml(editor.getHTML());
lastValueRef.current = html; lastValueRef.current = html;
setMarkdownSource(htmlToMarkdown(html)); setMarkdownSource(htmlToMarkdown(html));
setShowSticker(false);
setMode('markdown'); setMode('markdown');
}, [editor]); }, [editor]);
@@ -626,6 +689,7 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
editor.commands.setContent(html || '', { emitUpdate: false }); editor.commands.setContent(html || '', { emitUpdate: false });
placeCaretInFirstTextblock(editor); placeCaretInFirstTextblock(editor);
} }
setShowSticker(false);
setMode('rich'); setMode('rich');
}, [editor, markdownSource, onChange]); }, [editor, markdownSource, onChange]);
@@ -676,6 +740,15 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
active: groupActive, active: groupActive,
action: wrapSelectedAsGroup, action: wrapSelectedAsGroup,
}, },
{
icon: <span className="article-tool-btn__owo">OwO</span>,
title: '表情 OwO',
hint: '插入贴纸或颜文字',
active: showSticker,
className: 'article-tool-btn--owo',
buttonRef: stickerBtnRef,
action: () => setShowSticker(v => !v),
},
]; ];
if (editor.isActive('table')) { if (editor.isActive('table')) {
@@ -760,7 +833,7 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
} }
return tools; return tools;
}, [editor, enableContentGates, openLinkDialog, openCodeBlockDialog, openTableDialog, openImagePicker, wrapMembersOnly, wrapReplyOnly, wrapPointsOnly, wrapSelectedAsGroup, setImageDisplay]); }, [editor, enableContentGates, showSticker, openLinkDialog, openCodeBlockDialog, openTableDialog, openImagePicker, wrapMembersOnly, wrapReplyOnly, wrapPointsOnly, wrapSelectedAsGroup, setImageDisplay]);
const buildMarkdownTools = useCallback((): ToolBtn[] => { const buildMarkdownTools = useCallback((): ToolBtn[] => {
const tools: ToolBtn[] = [ const tools: ToolBtn[] = [
@@ -782,6 +855,15 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
hint: '上传、链接或从已上传中选择', hint: '上传、链接或从已上传中选择',
action: () => openImagePicker('markdown'), action: () => openImagePicker('markdown'),
}, },
{
icon: <span className="article-tool-btn__owo">OwO</span>,
title: '表情 OwO',
hint: '插入贴纸或颜文字',
active: showSticker,
className: 'article-tool-btn--owo',
buttonRef: stickerBtnRef,
action: () => setShowSticker(v => !v),
},
]; ];
if (enableContentGates) { if (enableContentGates) {
tools.push( tools.push(
@@ -809,7 +891,7 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
); );
} }
return tools; return tools;
}, [enableContentGates, withMarkdown, openLinkDialog, openCodeBlockDialog, openTableDialog, openImagePicker]); }, [enableContentGates, showSticker, withMarkdown, openLinkDialog, openCodeBlockDialog, openTableDialog, openImagePicker]);
const tools = mode === 'rich' ? buildRichTools() : buildMarkdownTools(); const tools = mode === 'rich' ? buildRichTools() : buildMarkdownTools();
const words = mode === 'markdown' const words = mode === 'markdown'
@@ -817,12 +899,16 @@ const ArticleEditor = forwardRef<ArticleEditorHandle, Props>(function ArticleEdi
: (editor ? countWords(editor.getText()) : 0); : (editor ? countWords(editor.getText()) : 0);
return ( return (
<div className={`article-editor article-editor--${mode}${fullscreen ? ' article-editor--fullscreen' : ''}`}> <div
ref={editorBoxRef}
className={`article-editor article-editor--${mode}${fullscreen ? ' article-editor--fullscreen' : ''}`}
>
<div className="article-editor-bar"> <div className="article-editor-bar">
<div className="article-editor-tools"> <div className="article-editor-tools">
{renderToolButtons(tools)} {renderToolButtons(tools)}
</div> </div>
</div> </div>
{showSticker && <StickerPicker onSelect={insertSticker} />}
<div className="article-editor-body"> <div className="article-editor-body">
{mode === 'rich' ? ( {mode === 'rich' ? (

40
frontend/src/components/CommentContent.tsx
View File

@@ -1,15 +1,19 @@
import { useMemo, useCallback } from 'react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { api } from '../api/client'; import { api } from '../api/client';
import { renderCommentContent } from '../utils/content'; import { renderCommentContent } from '../utils/content';
import { handleMdCodeBlockUiClick } from '../utils/enhanceCodeBlocks';
import { userPath } from '../utils/userPath'; import { userPath } from '../utils/userPath';
import { notify } from '@/lib/notify';
interface Props { interface Props {
content: string; content: string;
} }
/** 渲染评论正文（支持正文内 @ 高亮与点击跳转） */ /** 渲染评论正文（支持正文内 @ 高亮、代码块阅读态与点击跳转） */
export default function CommentContent({ content }: Props) { export default function CommentContent({ content }: Props) {
const nav = useNavigate(); const nav = useNavigate();
const html = useMemo(() => renderCommentContent(content), [content]);
const openMention = async (name: string) => { const openMention = async (name: string) => {
try { try {
@@ -26,17 +30,29 @@ export default function CommentContent({ content }: Props) {
} }
}; };
const onClick = useCallback(async (e: React.MouseEvent) => {
try {
if (await handleMdCodeBlockUiClick(e.target)) {
e.preventDefault();
return;
}
} catch {
notify.error('复制失败');
return;
}
const el = (e.target as HTMLElement).closest('.mention') as HTMLElement | null;
if (!el) return;
const name = el.getAttribute('data-name');
if (!name) return;
e.preventDefault();
void openMention(name);
}, [nav]);
return ( return (
<div <div
className="floor-body" className="floor-body post-detail-content"
onClick={(e) => { onClick={(e) => { void onClick(e); }}
const el = (e.target as HTMLElement).closest('.mention') as HTMLElement | null;
if (!el) return;
const name = el.getAttribute('data-name');
if (!name) return;
e.preventDefault();
void openMention(name);
}}
onKeyDown={(e) => { onKeyDown={(e) => {
if (e.key !== 'Enter' && e.key !== ' ') return; if (e.key !== 'Enter' && e.key !== ' ') return;
const el = e.target as HTMLElement; const el = e.target as HTMLElement;
@@ -46,9 +62,7 @@ export default function CommentContent({ content }: Props) {
e.preventDefault(); e.preventDefault();
void openMention(name); void openMention(name);
}} }}
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{ __html: html }}
__html: renderCommentContent(content),
}}
/> />
); );
} }

227
frontend/src/components/PmComposerInput.tsx Normal file
View File

@@ -0,0 +1,227 @@
import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef } from 'react';
import type { Sticker } from '../data/stickers';
export type PmComposerInputHandle = {
insertSticker: (sticker: Sticker) => void;
insertText: (text: string) => void;
focus: () => void;
};
type Props = {
value: string;
onChange: (next: string) => void;
placeholder?: string;
maxLength?: number;
disabled?: boolean;
onSubmit?: () => void;
};
/** 站点内置贴纸路径（评论/私信共用） */
export function isPmStickerSrc(src: string) {
return src.includes('/stickers/');
}
function escapeHtml(s: string) {
return s
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;');
}
function draftToHtml(text: string): string {
if (!text) return '';
const parts = text.split(/(!\[[^\]]*]\([^)]+\))/g);
return parts.map((part) => {
const m = part.match(/^!\[([^\]]*)]\(([^)]+)\)$/);
if (m) {
const alt = escapeHtml(m[1] || '表情');
const src = escapeHtml(m[2]);
const cls = isPmStickerSrc(m[2]) ? 'pm-composer__sticker' : 'pm-composer__inline-img';
return `<img class="${cls}" src="${src}" alt="${alt}" draggable="false">`;
}
return escapeHtml(part).replace(/\n/g, '<br>');
}).join('');
}
function serializeComposer(root: HTMLElement): string {
let out = '';
const walk = (node: Node) => {
if (node.nodeType === Node.TEXT_NODE) {
out += node.textContent || '';
return;
}
if (node.nodeType !== Node.ELEMENT_NODE) return;
const el = node as HTMLElement;
const tag = el.tagName;
if (tag === 'IMG') {
const src = el.getAttribute('src') || '';
const alt = el.getAttribute('alt') || '表情';
out += `![${alt}](${src})`;
return;
}
if (tag === 'BR') {
out += '\n';
return;
}
if (tag === 'DIV' || tag === 'P') {
if (out.length > 0 && !out.endsWith('\n')) out += '\n';
el.childNodes.forEach(walk);
return;
}
el.childNodes.forEach(walk);
};
root.childNodes.forEach(walk);
return out.replace(/\n$/, '');
}
function placeCaretAfter(node: Node) {
const sel = window.getSelection();
if (!sel) return;
const range = document.createRange();
range.setStartAfter(node);
range.collapse(true);
sel.removeAllRanges();
sel.addRange(range);
}
/** 私信输入框：可内联插入贴纸（与评论编辑器一致），序列化为 markdown 图片语法 */
const PmComposerInput = forwardRef<PmComposerInputHandle, Props>(function PmComposerInput(
{ value, onChange, placeholder, maxLength = 4000, disabled, onSubmit },
ref,
) {
const elRef = useRef<HTMLDivElement>(null);
const savedRangeRef = useRef<Range | null>(null);
const valueRef = useRef(value);
valueRef.current = value;
const emit = useCallback(() => {
const el = elRef.current;
if (!el) return;
const next = serializeComposer(el);
if (maxLength && next.length > maxLength) {
el.innerHTML = draftToHtml(valueRef.current);
return;
}
el.dataset.empty = next ? 'false' : 'true';
if (next !== valueRef.current) onChange(next);
}, [maxLength, onChange]);
const restoreRange = useCallback(() => {
const el = elRef.current;
if (!el) return;
el.focus();
const sel = window.getSelection();
if (!sel) return;
const saved = savedRangeRef.current;
if (saved && el.contains(saved.startContainer)) {
sel.removeAllRanges();
sel.addRange(saved);
return;
}
const range = document.createRange();
range.selectNodeContents(el);
range.collapse(false);
sel.removeAllRanges();
sel.addRange(range);
}, []);
const saveRange = useCallback(() => {
const el = elRef.current;
const sel = window.getSelection();
if (!el || !sel || sel.rangeCount === 0) return;
if (!el.contains(sel.anchorNode)) return;
savedRangeRef.current = sel.getRangeAt(0).cloneRange();
}, []);
const insertNodes = useCallback((nodes: Node[]) => {
const el = elRef.current;
if (!el || !nodes.length) return;
restoreRange();
const sel = window.getSelection();
if (!sel) return;
const range = sel.rangeCount > 0 ? sel.getRangeAt(0) : document.createRange();
range.deleteContents();
const frag = document.createDocumentFragment();
nodes.forEach((n) => frag.appendChild(n));
const last = nodes[nodes.length - 1];
range.insertNode(frag);
placeCaretAfter(last);
saveRange();
emit();
}, [emit, restoreRange, saveRange]);
useImperativeHandle(ref, () => ({
insertSticker(sticker) {
if (!sticker.url) return;
const img = document.createElement('img');
img.className = 'pm-composer__sticker';
img.src = sticker.url;
img.alt = sticker.name || '表情';
img.draggable = false;
// 尾随空格，光标可停在贴纸右侧（对齐评论编辑器）
insertNodes([img, document.createTextNode(' ')]);
},
insertText(text) {
if (!text) return;
insertNodes([document.createTextNode(text)]);
},
focus() {
restoreRange();
},
}), [insertNodes, restoreRange]);
// 外部改 value（切会话 / 发送清空）时回填；输入过程中 serialize 与 value 一致则不重绘
useEffect(() => {
const el = elRef.current;
if (!el) return;
if (serializeComposer(el) === value) {
el.dataset.empty = value ? 'false' : 'true';
return;
}
el.innerHTML = draftToHtml(value);
el.dataset.empty = value ? 'false' : 'true';
}, [value]);
useEffect(() => {
const onSel = () => saveRange();
document.addEventListener('selectionchange', onSel);
return () => document.removeEventListener('selectionchange', onSel);
}, [saveRange]);
return (
<div
ref={elRef}
className="pm-composer__input"
role="textbox"
aria-multiline="true"
aria-label="私信内容"
contentEditable={!disabled}
data-placeholder={placeholder || ''}
data-empty={value ? 'false' : 'true'}
suppressContentEditableWarning
onInput={emit}
onBlur={saveRange}
onPaste={(e) => {
e.preventDefault();
const text = e.clipboardData.getData('text/plain');
if (text) insertNodes([document.createTextNode(text)]);
}}
onDrop={(e) => {
// 禁止把文件拖成「大图附件」；贴纸只走选择器
if (e.dataTransfer?.files?.length) e.preventDefault();
}}
onKeyDown={(e) => {
if (e.nativeEvent.isComposing) return;
if (e.key === 'Enter' && !e.shiftKey) {
e.preventDefault();
onSubmit?.();
}
}}
/>
);
});
export default PmComposerInput;

14
frontend/src/components/PostAuthorCard.tsx
View File

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

39
frontend/src/components/PostContent.tsx
View File

@@ -1,6 +1,7 @@
import { useMemo, useCallback, useState } from 'react'; import { useMemo, useCallback, useState } from 'react';
import { useNavigate, useParams } from 'react-router-dom'; import { useNavigate, useParams } from 'react-router-dom';
import { renderPostContentHtml } from '../utils/postContent'; import { renderPostContentHtml } from '../utils/postContent';
import { handleMdCodeBlockUiClick } from '../utils/enhanceCodeBlocks';
import { loginPath, registerPath } from '../utils/authRedirect'; import { loginPath, registerPath } from '../utils/authRedirect';
import { useForumLimits } from '../hooks/useForumLimits'; import { useForumLimits } from '../hooks/useForumLimits';
import { notify } from '@/lib/notify'; import { notify } from '@/lib/notify';
@@ -105,40 +106,12 @@ export default function PostContent({
} }
return; return;
} }
const foldBtn = target.closest<HTMLElement>('[data-code-fold]'); try {
if (foldBtn) { if (await handleMdCodeBlockUiClick(target)) {
e.preventDefault(); e.preventDefault();
const block = foldBtn.closest('.md-codeblock');
if (!block) return;
const collapsed = block.classList.toggle('md-codeblock--collapsed');
const lineCount = parseInt(block.getAttribute('data-line-count') || '0', 10)
|| block.querySelectorAll('.md-code-line').length
|| 1;
if (collapsed && lineCount <= 5) block.classList.add('md-codeblock--short');
else block.classList.remove('md-codeblock--short');
foldBtn.textContent = collapsed ? '展开' : '收起';
return;
}
const copyBtn = target.closest<HTMLElement>('[data-code-copy]');
if (copyBtn) {
e.preventDefault();
const block = copyBtn.closest('.md-codeblock');
const bodies = block?.querySelectorAll('.md-code-line__body');
const text = bodies && bodies.length
? [...bodies].map(el => el.textContent ?? '').join('\n')
: (block?.querySelector('pre')?.textContent ?? '');
try {
await navigator.clipboard.writeText(text);
const prev = copyBtn.textContent;
copyBtn.textContent = '已复制';
copyBtn.classList.add('is-copied');
window.setTimeout(() => {
copyBtn.textContent = prev || '复制';
copyBtn.classList.remove('is-copied');
}, 1600);
} catch {
notify.error('复制失败');
} }
} catch {
notify.error('复制失败');
} }
}, [nav, openLightbox, onRequestReply, onUnlocked, postId, unlocking]); }, [nav, openLightbox, onRequestReply, onUnlocked, postId, unlocking]);

2
frontend/src/components/PullToRefresh.tsx
View File

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

20
frontend/src/components/ShowcaseAsideWidget.tsx
View File

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

14
frontend/src/components/editor/ArticleImageExtension.tsx
View File

@@ -1,5 +1,6 @@
import Image from '@tiptap/extension-image'; import Image from '@tiptap/extension-image';
import { mergeAttributes } from '@tiptap/core'; import { mergeAttributes } from '@tiptap/core';
import { isStickerSrc } from './ArticleStickerExtension';
/** 单图展示形态（对齐 Notion / Medium 常见选项） */ /** 单图展示形态（对齐 Notion / Medium 常见选项） */
export type ImageDisplay = 'default' | 'wide' | 'float-left' | 'float-right'; export type ImageDisplay = 'default' | 'wide' | 'float-left' | 'float-right';
@@ -19,6 +20,19 @@ declare module '@tiptap/core' {
export const ArticleImage = Image.extend({ export const ArticleImage = Image.extend({
name: 'image', name: 'image',
parseHTML() {
return [
{
tag: this.options.allowBase64 ? 'img[src]' : 'img[src]:not([src^="data:"])',
getAttrs: (node) => {
if (typeof node === 'string') return false;
if (isStickerSrc(node.getAttribute('src'))) return false;
return null;
},
},
];
},
addAttributes() { addAttributes() {
return { return {
...this.parent?.(), ...this.parent?.(),

54
frontend/src/components/editor/ArticleStickerExtension.ts Normal file
View File

@@ -0,0 +1,54 @@
import { Node, mergeAttributes } from '@tiptap/core';
/** 贴纸资源路径：评论、私信、发帖共用 /stickers/ */
export function isStickerSrc(src: string | null | undefined): boolean {
return typeof src === 'string' && src.includes('/stickers/');
}
/**
* 行内表情贴纸。文章 Image 是 block，不能拿来插表情，否则会独自占一段。
* 解析 HTML 时优先于普通 img，避免贴纸被收成通栏大图。
*/
export const ArticleSticker = Node.create({
name: 'sticker',
group: 'inline',
inline: true,
atom: true,
selectable: true,
draggable: true,
priority: 60,
addAttributes() {
return {
src: { default: null },
alt: { default: '' },
};
},
parseHTML() {
return [
{
tag: 'img[src]',
getAttrs: (node) => {
if (typeof node === 'string') return false;
const src = node.getAttribute('src') || '';
if (!isStickerSrc(src)) return false;
return {
src,
alt: node.getAttribute('alt') || '',
};
},
},
];
},
renderHTML({ HTMLAttributes }) {
return [
'img',
mergeAttributes(HTMLAttributes, {
class: 'article-sticker',
draggable: 'false',
}),
];
},
});

116
frontend/src/components/emoji/StickerPicker.tsx
View File

@@ -36,17 +36,58 @@ export default function StickerPicker({ onSelect }: Props) {
}, [active]); }, [active]);
useEffect(() => { useEffect(() => {
const el = gridRef.current?.querySelectorAll<HTMLElement>('[role="option"]')[focusIndex]; if (loading || stickers.length === 0) return;
el?.focus(); gridRef.current?.focus();
}, [focusIndex, stickers]); }, [loading, stickers]);
const onKeyDown = useCallback((e: React.KeyboardEvent) => { const onKeyDown = useCallback((e: React.KeyboardEvent) => {
const cols = 8; const items = gridRef.current?.querySelectorAll<HTMLElement>('[role="option"]');
if (e.key === 'ArrowRight') { e.preventDefault(); setFocusIndex((i) => Math.min(stickers.length - 1, i + 1)); } if (!items?.length) return;
else if (e.key === 'ArrowLeft') { e.preventDefault(); setFocusIndex((i) => Math.max(0, i - 1)); }
else if (e.key === 'ArrowDown') { e.preventDefault(); setFocusIndex((i) => Math.min(stickers.length - 1, i + cols)); } const moveTo = (next: number) => {
else if (e.key === 'ArrowUp') { e.preventDefault(); setFocusIndex((i) => Math.max(0, i - cols)); } e.preventDefault();
else if (e.key === 'Enter' || e.key === ' ') { const i = Math.max(0, Math.min(items.length - 1, next));
setFocusIndex(i);
items[i]?.focus();
};
if (e.key === 'ArrowRight') {
moveTo(focusIndex + 1);
return;
}
if (e.key === 'ArrowLeft') {
moveTo(focusIndex - 1);
return;
}
if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
// 颜文字宽度不固定，按视觉行列找下一格，避免按固定 8 列错位
e.preventDefault();
const cur = items[focusIndex];
if (!cur) return;
const cr = cur.getBoundingClientRect();
const cx = cr.left + cr.width / 2;
const cy = cr.top + cr.height / 2;
const dir = e.key === 'ArrowDown' ? 1 : -1;
let best = -1;
let bestScore = Infinity;
items.forEach((el, i) => {
if (i === focusIndex) return;
const r = el.getBoundingClientRect();
const dy = (r.top + r.height / 2) - cy;
if (dy * dir <= 6) return;
const score = Math.abs(dy) * 24 + Math.abs((r.left + r.width / 2) - cx);
if (score < bestScore) {
bestScore = score;
best = i;
}
});
if (best >= 0) {
setFocusIndex(best);
items[best]?.focus();
}
return;
}
if (e.key === 'Enter' || e.key === ' ') {
e.preventDefault(); e.preventDefault();
const s = stickers[focusIndex]; const s = stickers[focusIndex];
if (s) onSelect(s); if (s) onSelect(s);
@@ -73,6 +114,7 @@ export default function StickerPicker({ onSelect }: Props) {
ref={gridRef} ref={gridRef}
className="sticker-picker-grid" className="sticker-picker-grid"
role="listbox" role="listbox"
tabIndex={0}
aria-label={`${active}贴纸`} aria-label={`${active}贴纸`}
aria-activedescendant={`${autoId}-opt-${focusIndex}`} aria-activedescendant={`${autoId}-opt-${focusIndex}`}
onKeyDown={onKeyDown} onKeyDown={onKeyDown}
@@ -82,33 +124,35 @@ export default function StickerPicker({ onSelect }: Props) {
) : stickers.length === 0 ? ( ) : stickers.length === 0 ? (
<div className="sticker-picker-loading">暂无贴纸</div> <div className="sticker-picker-loading">暂无贴纸</div>
) : ( ) : (
stickers.map((s, i) => ( stickers.map((s, i) => {
<button const isText = s.type === 'text' && !!s.text;
key={s.id} return (
id={`${autoId}-opt-${i}`} <button
type="button" key={s.id}
role="option" id={`${autoId}-opt-${i}`}
tabIndex={focusIndex === i ? 0 : -1} type="button"
aria-selected={focusIndex === i} role="option"
aria-label={s.name} tabIndex={focusIndex === i ? 0 : -1}
className="sticker-picker-item" aria-selected={focusIndex === i}
onClick={() => onSelect(s)} aria-label={s.name}
onFocus={() => setFocusIndex(i)} className={isText ? 'sticker-picker-item sticker-picker-item--text' : 'sticker-picker-item sticker-picker-item--image'}
> onClick={() => onSelect(s)}
{s.type === 'text' && s.text ? ( onFocus={() => setFocusIndex(i)}
<span className="sticker-picker-text">{s.text}</span> >
) : ( {isText ? (
<img <span className="sticker-picker-text">{s.text}</span>
src={s.url} ) : (
alt={s.name} <img
width={32} src={s.url}
height={32} alt={s.name}
style={{ width: 32, height: 32, objectFit: 'contain' }} width={32}
loading="lazy" height={32}
/> loading="lazy"
)} />
</button> )}
)) </button>
);
})
)} )}
</div> </div>
</div> </div>

5
frontend/src/data/stickers/hot.ts
View File

@@ -15,10 +15,7 @@ export async function loadHotStickers(): Promise<Sticker[]> {
const allEmoji = getAllStickers(); const allEmoji = getAllStickers();
const all = [...allEmoji, ...KAOMOJI_STICKERS]; const all = [...allEmoji, ...KAOMOJI_STICKERS];
return all return all
.filter((s) => { .filter((s) => s.aliases?.some((a) => HOT_KEYWORDS.includes(a)) || HOT_KEYWORDS.includes(s.name))
if (s.category === '颜文字') return true;
return s.aliases?.some((a) => HOT_KEYWORDS.includes(a)) || HOT_KEYWORDS.includes(s.name);
})
.slice(0, 30) .slice(0, 30)
.map((s) => ({ ...s, category: '热门' as const })); .map((s) => ({ ...s, category: '热门' as const }));
} }

76
frontend/src/data/stickers/kaomoji.ts
View File

@@ -3,30 +3,54 @@ import type { Sticker } from './index';
/** 颜文字贴纸 — 纯文本类型，选择器和编辑器中均作为纯文本显示 */ /** 颜文字贴纸 — 纯文本类型，选择器和编辑器中均作为纯文本显示 */
export const KAOMOJI_STICKERS: Sticker[] = [ export const KAOMOJI_STICKERS: Sticker[] = [
{ id: 'km-happy', name: '开心', category: '颜文字', type: 'text', text: '(ノ´∀`)ノ', aliases: ['哈哈', '开心'] }, { id: 'km-wave-half', name: '勉强挥手', category: '颜文字', type: 'text', text: '(￣▽￣)ノ', aliases: ['挥手', '嗨'] },
{ id: 'km-laugh', name: '大笑', category: '颜文字', type: 'text', text: '(≧∇≦)ﾉ', aliases: ['哈哈哈', '笑死'] }, { id: 'km-shrug-ascii', name: '摊手', category: '颜文字', type: 'text', text: '¯\\_(ツ)_/¯', aliases: ['摊手', '无奈'] },
{ id: 'km-cry', name: '哭', category: '颜文字', type: 'text', text: '(´；ω；`)', aliases: ['呜呜', '伤心'] }, { id: 'km-eyeroll', name: '翻白眼', category: '颜文字', type: 'text', text: '(¬_¬)', aliases: ['白眼', '嫌弃'] },
{ id: 'km-angry', name: '生气', category: '颜文字', type: 'text', text: 'ヽ(｀⌒´)ﾉ', aliases: ['怒', '气死'] }, { id: 'km-speechless', name: '无语凝噎', category: '颜文字', type: 'text', text: '(；一_一)', aliases: ['无语', '沉默'] },
{ id: 'km-shrug', name: '无奈', category: '颜文字', type: 'text', text: '╮(°-°)╭', aliases: ['呵呵', '无语'] }, { id: 'km-shock-idle', name: '震惊但不想管', category: '颜文字', type: 'text', text: '(　ﾟдﾟ)', aliases: ['震惊', '惊讶'] },
{ id: 'km-determined', name: '加油', category: '颜文字', type: 'text', text: '(๑•̀ㅁ•́ฅ)', aliases: ['冲', '奥利给'] }, { id: 'km-dead-inside', name: '心死', category: '颜文字', type: 'text', text: '（。_。）', aliases: ['心死', '无力'] },
{ id: 'km-sad', name: '难过', category: '颜文字', type: 'text', text: '( ´･ω･`)', aliases: ['失落', '低落'] }, { id: 'km-lazy', name: '懒得动', category: '颜文字', type: 'text', text: '( ˘ω˘ )', aliases: ['懒', '摆烂'] },
{ id: 'km-sparkle', name: '兴奋', category: '颜文字', type: 'text', text: '(ﾉ´ヮ`)ﾉ*: ･ﾟ', aliases: ['太棒了', '耶'] }, { id: 'km-awkward-smile', name: '尴尬微笑', category: '颜文字', type: 'text', text: '(￣ω￣;)', aliases: ['尴尬', '呵呵'] },
{ id: 'km-tear', name: '泪奔', category: '颜文字', type: 'text', text: '(╥﹏╥)', aliases: ['泪流', '呜呜'] }, { id: 'km-sob', name: '哭到抽搐', category: '颜文字', type: 'text', text: '(´；ω；｀)', aliases: ['哭', '大哭'] },
{ id: 'km-love', name: '喜欢', category: '颜文字', type: 'text', text: '(◕ᴗ◕✿)', aliases: ['爱', '心动'] }, { id: 'km-grievance', name: '委屈巴巴', category: '颜文字', type: 'text', text: '(๑•́ ₃ •̀๑)', aliases: ['委屈', '嘤嘤'] },
{ id: 'km-cool', name: '酷', category: '颜文字', type: 'text', text: '(⌐■_■)', aliases: ['帅', '墨镜'] }, { id: 'km-blush-blur', name: '害羞到糊掉', category: '颜文字', type: 'text', text: '(⁄ ⁄•⁄ω⁄•⁄ ⁄)', aliases: ['害羞', '脸红'] },
{ id: 'km-stare', name: '盯', category: '颜文字', type: 'text', text: 'ಠ_ಠ', aliases: ['凝视', '盯着看'] }, { id: 'km-grit', name: '咬牙切齿', category: '颜文字', type: 'text', text: '(╬ ￣皿￣)', aliases: ['怒', '生气'] },
{ id: 'km-tableflip', name: '掀桌', category: '颜文字', type: 'text', text: '(╯°□°）╯︵ ┻━┻', aliases: ['掀桌', '愤怒'] }, { id: 'km-short-rage', name: '暴怒短号', category: '颜文字', type: 'text', text: '(｀Д´)', aliases: ['怒', '气死'] },
{ id: 'km-bow', name: '拜托', category: '颜文字', type: 'text', text: '(人･ω･)💦', aliases: ['求求', '拜托了'] }, { id: 'km-fist-rage', name: '气到挥拳', category: '颜文字', type: 'text', text: '٩(๑`^´๑)۶', aliases: ['怒', '挥拳'] },
{ id: 'km-proud', name: '得意', category: '颜文字', type: 'text', text: '(￣▽￣)"', aliases: ['嘿嘿', '自满'] }, { id: 'km-grit-spark', name: '憋屈但要干', category: '颜文字', type: 'text', text: '(๑•̀ㅂ•́)و✧', aliases: ['冲', '加油'] },
{ id: 'km-sleep', name: '困', category: '颜文字', type: 'text', text: '(-ω-)Zzz', aliases: ['睡觉', '晚安'] }, { id: 'km-weep', name: '哭唧唧', category: '颜文字', type: 'text', text: '( ˃̣̣̥ω˂̣̣̥ )', aliases: ['哭', '呜呜'] },
{ id: 'km-wave', name: '招手', category: '颜文字', type: 'text', text: '(´・ω・)ノ', aliases: ['你好', '拜拜'] }, { id: 'km-scamper', name: '撒欢跑走', category: '颜文字', type: 'text', text: 'ᕕ( ᐛ )ᕗ', aliases: ['跑', '溜了'] },
{ id: 'km-wink', name: '眨眼', category: '颜文字', type: 'text', text: '(◠‿◠)', aliases: ['抛媚眼', '嘿嘿'] }, { id: 'km-star-throw', name: '丢星星', category: '颜文字', type: 'text', text: '(ﾉ≧∀≦)ﾉ ‥…━━━★', aliases: ['耶', '星星'] },
{ id: 'km-sorry', name: '抱歉', category: '颜文字', type: 'text', text: 'm(._.)m', aliases: ['对不起', '跪了'] }, { id: 'km-flee', name: '落荒而逃', category: '颜文字', type: 'text', text: 'ε=ε=ε=┌(;*´Д`)ﾉ', aliases: ['逃', '溜'] },
{ id: 'km-doubt', name: '疑惑', category: '颜文字', type: 'text', text: '(╬ Ò _ Ó)', aliases: ['什么', '???'] }, { id: 'km-unflip', name: '把桌摆回去', category: '颜文字', type: 'text', text: '┬─┬ノ( º _ ºノ)', aliases: ['摆桌', '冷静'] },
{ id: 'km-hungry', name: '饿了', category: '颜文字', type: 'text', text: '(๑´ㅂ`๑)', aliases: ['想吃', '吃货'] }, { id: 'km-flip-hard', name: '狠掀桌', category: '颜文字', type: 'text', text: '(┛ಠ_ಠ)┛彡┻━┻', aliases: ['掀桌', '怒'] },
{ id: 'km-gameover', name: 'GG', category: '颜文字', type: 'text', text: '(╯︿╰﹀ )', aliases: ['GG', '完了'] }, { id: 'km-victory-l', name: '胜利举手', category: '颜文字', type: 'text', text: '┏(＾0＾)┛', aliases: ['胜利', '耶'] },
{ id: 'km-gift', name: '送花', category: '颜文字', type: 'text', text: '(✿◠‿◠)', aliases: ['送花', '谢谢'] }, { id: 'km-victory-r', name: '对面胜利', category: '颜文字', type: 'text', text: '┗(＾0＾)┓', aliases: ['胜利', '嗨'] },
{ id: 'km-clap', name: '鼓掌', category: '颜文字', type: 'text', text: 'ヾ(´▽｀;)ゝ', aliases: ['呱唧', '鼓掌'] }, { id: 'km-point', name: '指你呢', category: '颜文字', type: 'text', text: '(☞ﾟヮﾟ)☞', aliases: ['指', '就是你'] },
{ id: 'km-cheer', name: '加油', category: '颜文字', type: 'text', text: '＼(^ω^＼)', aliases: ['冲鸭', 'go'] }, { id: 'km-point-back', name: '指回去', category: '颜文字', type: 'text', text: '☜(ﾟヮﾟ☜)', aliases: ['指回去', '你才'] },
{ id: 'km-please', name: '拜托了', category: '颜文字', type: 'text', text: '( ´･ω･`)', aliases: ['嘤嘤', '求求了'] }, { id: 'km-cat', name: '猫', category: '颜文字', type: 'text', text: '(=^･ω･^=)', aliases: ['猫', '喵'] },
{ id: 'km-cat-round', name: '圆眼猫', category: '颜文字', type: 'text', text: '(ΦωΦ)', aliases: ['猫', '圆眼'] },
{ id: 'km-bear', name: '熊', category: '颜文字', type: 'text', text: 'ʕ•ᴥ•ʔ', aliases: ['熊', '抱抱'] },
{ id: 'km-flower-ear', name: '花耳', category: '颜文字', type: 'text', text: '◕‿◕✿', aliases: ['花', '可爱'] },
{ id: 'km-angry-bird', name: '怒鸟', category: '颜文字', type: 'text', text: '（ꐦ°᷄д°᷅）', aliases: ['怒', '生气'] },
{ id: 'km-smug-wolf', name: '狼尾得意', category: '颜文字', type: 'text', text: '( •̀ ω •́ )✧', aliases: ['得意', '酷'] },
{ id: 'km-cat-wave', name: '猫招手', category: '颜文字', type: 'text', text: '~(=^‥^)ノ', aliases: ['猫', '招手'] },
{ id: 'km-hehe', name: '呵呵', category: '颜文字', type: 'text', text: '( ´_ゝ｀)', aliases: ['呵呵', '滑稽'] },
{ id: 'km-server-down', name: '服务器炸了', category: '颜文字', type: 'text', text: '(；´Д｀)', aliases: ['炸了', '宕机'] },
{ id: 'km-double-shock', name: '双重震惊', category: '颜文字', type: 'text', text: '(ﾟДﾟ≡ﾟдﾟ)!?', aliases: ['震惊', '惊讶'] },
{ id: 'km-cold-sweat', name: '冷汗惊恐', category: '颜文字', type: 'text', text: 'Σ(°△°|||)︴', aliases: ['惊恐', '惊讶'] },
{ id: 'km-hang', name: '宕机', category: '颜文字', type: 'text', text: '(；°○° )', aliases: ['宕机', '卡死'] },
{ id: 'km-pass-box', name: '递箱子', category: '颜文字', type: 'text', text: '( ﾟ∀ﾟ)つ□', aliases: ['递', '补丁'] },
{ id: 'km-shoulder', name: '拍对方肩', category: '颜文字', type: 'text', text: '( ´▽｀)σ)Д`)', aliases: ['拍肩', '兄弟'] },
{ id: 'km-silent-crash', name: '无声崩溃', category: '颜文字', type: 'text', text: '(-_-;)・・・', aliases: ['崩溃', '尴尬'] },
{ id: 'km-blank', name: '呆滞', category: '颜文字', type: 'text', text: '(｡ŏ_ŏ)', aliases: ['发呆', '呆'] },
{ id: 'km-side-eye', name: '眯眼嫌弃', category: '颜文字', type: 'text', text: '(๑¯ω¯๑)', aliases: ['嫌弃', '眯眼'] },
{ id: 'km-lick', name: '舔嘴', category: '颜文字', type: 'text', text: '(๑´ڡ`๑)', aliases: ['好吃', '馋'] },
{ id: 'km-round-laugh', name: '圆滚滚笑', category: '颜文字', type: 'text', text: '( ˶˚ ᗨ ˚˶ )', aliases: ['哈哈', '大笑'] },
{ id: 'km-hug-ask', name: '求抱抱', category: '颜文字', type: 'text', text: '(っ˘̩╭╮˘̩)っ', aliases: ['抱抱', '求抱'] },
{ id: 'km-rage-yi', name: '暴怒益字', category: '颜文字', type: 'text', text: '(╬ಠ益ಠ)', aliases: ['怒', '生气'] },
{ id: 'km-fight', name: '对线准备', category: '颜文字', type: 'text', text: "(ง'̀-'́)ง", aliases: ['对线', '来战'] },
{ id: 'km-cat-minimal', name: '极简猫', category: '颜文字', type: 'text', text: 'ᓚᘏᗢ', aliases: ['猫', '喵'] },
{ id: 'km-pounce', name: '飞扑拥抱', category: '颜文字', type: 'text', text: '(づ｡◕‿‿◕｡)づ', aliases: ['拥抱', '爱'] },
{ id: 'km-suspect', name: '怀疑人生', category: '颜文字', type: 'text', text: '( ◔ ʖ̯ ◔ )', aliases: ['怀疑', '思考'] },
]; ];

33
frontend/src/hooks/useSessionResource.ts
View File

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

26
frontend/src/layouts/MainLayout.tsx
View File

@@ -72,6 +72,8 @@ export default function MainLayout() {
const [recentComments, setRecentComments] = useState<RecentComment[]>(() => getCachedRecentComments()); const [recentComments, setRecentComments] = useState<RecentComment[]>(() => getCachedRecentComments());
const [recentUsers, setRecentUsers] = useState<RecentUser[]>(() => getCachedRecentUsers()); const [recentUsers, setRecentUsers] = useState<RecentUser[]>(() => getCachedRecentUsers());
const [unreadMessages, setUnreadMessages] = useState(() => getBootUnread()); const [unreadMessages, setUnreadMessages] = useState(() => getBootUnread());
const [dmUnread, setDmUnread] = useState(0);
const [notifyUnread, setNotifyUnread] = useState(0);
const [tags, setTags] = useState<TagCount[]>(() => getCachedTags()); const [tags, setTags] = useState<TagCount[]>(() => getCachedTags());
const [tagsLoading, setTagsLoading] = useState(() => getCachedTags().length === 0); const [tagsLoading, setTagsLoading] = useState(() => getCachedTags().length === 0);
const [postOutline, setPostOutline] = useState<{ const [postOutline, setPostOutline] = useState<{
@@ -309,13 +311,29 @@ export default function MainLayout() {
const refreshUnreadMessages = useCallback(() => { const refreshUnreadMessages = useCallback(() => {
if (!user) { if (!user) {
setUnreadMessages(0); setUnreadMessages(0);
setDmUnread(0);
setNotifyUnread(0);
return; return;
} }
api.messageUnreadCount() 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]); }, [user]);
/** 仅有通知未读时直达通知 Tab，避免先看到空私信列表 */
const openMessages = useCallback(() => {
const path = notifyUnread > 0 && dmUnread === 0 ? '/messages?tab=notify' : '/messages';
void transitionTo(nav, path);
}, [nav, notifyUnread, dmUnread]);
useEffect(() => { useEffect(() => {
refreshUnreadMessages(); refreshUnreadMessages();
const onRefresh = () => refreshUnreadMessages(); const onRefresh = () => refreshUnreadMessages();
@@ -667,7 +685,7 @@ export default function MainLayout() {
className="header-icon-btn header-msg-btn" className="header-icon-btn header-msg-btn"
title={unreadMessages > 0 ? `${unreadMessages} 条未读消息` : '站内消息'} title={unreadMessages > 0 ? `${unreadMessages} 条未读消息` : '站内消息'}
aria-label={unreadMessages > 0 ? `站内消息，${unreadMessages} 条未读` : '站内消息'} aria-label={unreadMessages > 0 ? `站内消息，${unreadMessages} 条未读` : '站内消息'}
onClick={() => void transitionTo(nav, '/messages')} onClick={openMessages}
> >
<Mail size={18} aria-hidden /> <Mail size={18} aria-hidden />
{unreadMessages > 0 && ( {unreadMessages > 0 && (
@@ -691,7 +709,7 @@ export default function MainLayout() {
<DropdownMenuItem onClick={() => void transitionTo(nav, '/profile')}> <DropdownMenuItem onClick={() => void transitionTo(nav, '/profile')}>
账号设置{typeof user.points === 'number' ? ` · ${user.points} 积分` : ''} 账号设置{typeof user.points === 'number' ? ` · ${user.points} 积分` : ''}
</DropdownMenuItem> </DropdownMenuItem>
<DropdownMenuItem onClick={() => void transitionTo(nav, '/messages')}> <DropdownMenuItem onClick={openMessages}>
站内消息{unreadMessages > 0 ? ` (${unreadMessages})` : ''} 站内消息{unreadMessages > 0 ? ` (${unreadMessages})` : ''}
</DropdownMenuItem> </DropdownMenuItem>
<DropdownMenuItem onClick={() => void transitionTo(nav, '/favorites')}>我的收藏</DropdownMenuItem> <DropdownMenuItem onClick={() => void transitionTo(nav, '/favorites')}>我的收藏</DropdownMenuItem>

1090
frontend/src/pages/MessagesPage.tsx
View File

File diff suppressed because it is too large Load Diff

155
frontend/src/pages/ShowcasePage.tsx
View File

@@ -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 { Spinner } from '@/components/ui/spinner';
import { api } from '../api/client'; import { api } from '../api/client';
import type { CommunityShowcaseItem } from '../api/types'; import type { CommunityShowcaseItem } from '../api/types';
@@ -7,12 +10,65 @@ import { getCachedSiteBranding, useSiteBranding } from '../hooks/useSiteBranding
import { InFlowSiteFooter } from '../components/SiteFooter'; import { InFlowSiteFooter } from '../components/SiteFooter';
import { useSessionResource } from '../hooks/useSessionResource'; 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() { export default function ShowcasePage() {
const nav = useNavigate();
const { branding } = useSiteBranding(); const { branding } = useSiteBranding();
const { data: items = [], loading } = useSessionResource<CommunityShowcaseItem[]>( const { data: items = [], loading } = useSessionResource<CommunityShowcaseItem[]>(
'showcase', 'showcase',
() => api.communityShowcase().then((r) => (Array.isArray(r.items) ? r.items : [])), () => api.communityShowcase().then((r) => (Array.isArray(r.items) ? r.items : [])),
{ revalidateEmpty: true },
); );
usePageSEO({ usePageSEO({
@@ -24,52 +80,65 @@ export default function ShowcasePage() {
return ( return (
<div className="page-wrap"> <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> </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>
</div> </div>
); );

14
frontend/src/pages/UserProfilePage.tsx
View File

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

54
frontend/src/pages/admin/AdminCommentsPage.tsx
View File

@@ -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 { Trash2, RotateCcw } from 'lucide-react';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { Badge } from '@/components/ui/badge'; import { Badge } from '@/components/ui/badge';
@@ -40,6 +40,8 @@ function formatAdminTime(iso: string) {
export default function AdminCommentsPage() { export default function AdminCommentsPage() {
const nav = useNavigate(); const nav = useNavigate();
const [searchParams, setSearchParams] = useSearchParams();
const focusId = Number(searchParams.get('id') || 0) || 0;
const { ready } = useAdminGuard(); const { ready } = useAdminGuard();
const [tab, setTab] = useState<Tab>('pending'); const [tab, setTab] = useState<Tab>('pending');
const [comments, setComments] = useState<Comment[]>([]); const [comments, setComments] = useState<Comment[]>([]);
@@ -49,6 +51,9 @@ export default function AdminCommentsPage() {
const [totalPages, setTotalPages] = useState(1); const [totalPages, setTotalPages] = useState(1);
const [pendingCount, setPendingCount] = useState(0); const [pendingCount, setPendingCount] = useState(0);
const [revComment, setRevComment] = useState<Comment | null>(null); 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) => { const loadList = (p = page, st: Tab = tab) => {
setLoading(true); setLoading(true);
@@ -90,6 +95,45 @@ export default function AdminCommentsPage() {
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [ready, tab]); }, [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) => { const approve = async (id: number) => {
try { try {
const r = await api.adminApproveComment(id); const r = await api.adminApproveComment(id);
@@ -268,7 +312,11 @@ export default function AdminCommentsPage() {
</thead> </thead>
<tbody> <tbody>
{comments.map(c => ( {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.id}</td>
<td>#{c.floor}</td> <td>#{c.floor}</td>
<td> <td>

52
frontend/src/pages/admin/AdminPostsPage.tsx
View File

@@ -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 { Search, Lock, LockOpen, MessageSquareOff, Trash2, RotateCcw } from 'lucide-react';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input'; import { Input } from '@/components/ui/input';
@@ -32,6 +32,8 @@ function formatAdminTime(iso: string) {
export default function AdminPostsPage() { export default function AdminPostsPage() {
const nav = useNavigate(); const nav = useNavigate();
const [searchParams, setSearchParams] = useSearchParams();
const focusId = Number(searchParams.get('id') || 0) || 0;
const { ready } = useAdminGuard(); const { ready } = useAdminGuard();
const [tab, setTab] = useState<Tab>('pending'); const [tab, setTab] = useState<Tab>('pending');
const [posts, setPosts] = useState<PostItem[]>([]); const [posts, setPosts] = useState<PostItem[]>([]);
@@ -42,6 +44,9 @@ export default function AdminPostsPage() {
const [pendingCount, setPendingCount] = useState(0); const [pendingCount, setPendingCount] = useState(0);
const [keyword, setKeyword] = useState(''); const [keyword, setKeyword] = useState('');
const [search, setSearch] = 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') => { const loadActive = (p = page, kw = search, status = tab === 'pending' ? 'pending' : 'all') => {
setLoading(true); setLoading(true);
@@ -92,6 +97,43 @@ export default function AdminPostsPage() {
// eslint-disable-next-line react-hooks/exhaustive-deps -- 仅随 tab/search/ready 刷新 // eslint-disable-next-line react-hooks/exhaustive-deps -- 仅随 tab/search/ready 刷新
}, [ready, search, tab]); }, [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) => { const switchTab = (next: Tab) => {
if (next === tab) return; if (next === tab) return;
setTab(next); setTab(next);
@@ -352,7 +394,11 @@ export default function AdminPostsPage() {
{posts.map(p => { {posts.map(p => {
const edited = p.updated_at && isTimeDiffSignificant(p.created_at, p.updated_at); const edited = p.updated_at && isTimeDiffSignificant(p.created_at, p.updated_at);
return ( 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>{p.id}</td>
<td className="max-w-[200px] truncate"> <td className="max-w-[200px] truncate">
<button type="button" className="admin-text-link" onClick={() => nav(`/post/${p.id}`)}> <button type="button" className="admin-text-link" onClick={() => nav(`/post/${p.id}`)}>

1137
frontend/src/styles/global.css
View File

File diff suppressed because it is too large Load Diff

28
frontend/src/utils/content.ts
View File

@@ -1,5 +1,6 @@
import DOMPurify from 'dompurify'; import DOMPurify from 'dompurify';
import { POST_CONTENT_PURIFY_CONFIG } from './postContent'; import { POST_CONTENT_PURIFY_CONFIG } from './postContent';
import { enhanceCodeBlocks } from './enhanceCodeBlocks';
/** 转义 HTML 并保留换行 */ /** 转义 HTML 并保留换行 */
function escapeWithBreaks(text: string): string { function escapeWithBreaks(text: string): string {
@@ -60,11 +61,15 @@ function processMentionsInHtml(html: string): string {
return div.innerHTML; return div.innerHTML;
} }
/** 渲染评论内容：HTML 净化 + @提及高亮，兼容旧版纯文本 */ /** 渲染评论内容：HTML 净化 + @提及高亮 + 代码块阅读态，兼容旧版纯文本 */
export function renderCommentContent(content: string): string { export function renderCommentContent(content: string): string {
if (isHtmlContent(content)) { if (isHtmlContent(content)) {
const sanitized = DOMPurify.sanitize(content, POST_CONTENT_PURIFY_CONFIG) as string; const sanitized = DOMPurify.sanitize(content, POST_CONTENT_PURIFY_CONFIG) as string;
return processMentionsInHtml(sanitized); const withMentions = processMentionsInHtml(sanitized);
const doc = new DOMParser().parseFromString(`<div id="j13-comment-root">${withMentions}</div>`, 'text/html');
const root = doc.getElementById('j13-comment-root') ?? doc.body;
enhanceCodeBlocks(root);
return root.innerHTML;
} }
return highlightMentions(content); return highlightMentions(content);
} }
@@ -89,6 +94,25 @@ export function formatTime(iso: string) {
return `${d.getFullYear()}年${d.getMonth() + 1}月${d.getDate()}日`; 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) { export function formatDateTime(iso: string) {
const d = new Date(iso); const d = new Date(iso);

41
frontend/src/utils/enhanceCodeBlocks.ts
View File

@@ -177,3 +177,44 @@ export function enhanceCodeBlocks(root: ParentNode): void {
if (display.lineNumbers) pre.classList.add('md-codeblock__pre--lines'); if (display.lineNumbers) pre.classList.add('md-codeblock__pre--lines');
}); });
} }
const CODE_FOLD_SHORT_LINES = 5;
/**
* 阅读态代码块：折叠 / 复制。由帖子与评论共用，点击已处理时返回 true。
*/
export async function handleMdCodeBlockUiClick(target: EventTarget | null): Promise<boolean> {
if (!(target instanceof Element)) return false;
const foldBtn = target.closest<HTMLElement>('[data-code-fold]');
if (foldBtn) {
const block = foldBtn.closest('.md-codeblock');
if (!block) return true;
const collapsed = block.classList.toggle('md-codeblock--collapsed');
const lineCount = parseInt(block.getAttribute('data-line-count') || '0', 10)
|| block.querySelectorAll('.md-code-line').length
|| 1;
if (collapsed && lineCount <= CODE_FOLD_SHORT_LINES) block.classList.add('md-codeblock--short');
else block.classList.remove('md-codeblock--short');
foldBtn.textContent = collapsed ? '展开' : '收起';
return true;
}
const copyBtn = target.closest<HTMLElement>('[data-code-copy]');
if (!copyBtn) return false;
const block = copyBtn.closest('.md-codeblock');
const bodies = block?.querySelectorAll('.md-code-line__body');
const text = bodies && bodies.length
? [...bodies].map(el => el.textContent ?? '').join('\n')
: (block?.querySelector('pre')?.textContent ?? '');
await navigator.clipboard.writeText(text);
const prev = copyBtn.textContent;
copyBtn.textContent = '已复制';
copyBtn.classList.add('is-copied');
window.setTimeout(() => {
copyBtn.textContent = prev || '复制';
copyBtn.classList.remove('is-copied');
}, 1600);
return true;
}

7
frontend/src/utils/homeBoot.ts
View File

@@ -44,7 +44,7 @@ export type HomeBootPayload = {
recent_comments: RecentComment[]; recent_comments: RecentComment[];
recent_users: RecentUser[]; recent_users: RecentUser[];
tags: TagCount[]; tags: TagCount[];
showcase: CommunityShowcaseItem[]; showcase?: CommunityShowcaseItem[];
pages: SitePageSummary[]; pages: SitePageSummary[];
limits: ForumLimitsPublic; limits: ForumLimitsPublic;
branding: SiteBranding; 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_comments)) setCachedRecentComments(boot.recent_comments);
if (Array.isArray(boot.recent_users)) setCachedRecentUsers(boot.recent_users); if (Array.isArray(boot.recent_users)) setCachedRecentUsers(boot.recent_users);
if (Array.isArray(boot.tags)) setCachedTags(boot.tags); 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 = 已确认访客） // 鉴权 / 签到：有 user 字段即种子（含 null = 已确认访客）
if ('user' in boot) { if ('user' in boot) {

11
handler/api.go
View File

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

14
handler/message.go
View File

@@ -136,6 +136,20 @@ func (h *Handlers) APIMarkNotificationsRead(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"message": "通知已全部标为已读"}) 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 发送私信 // APISendMessage 发送私信
func (h *Handlers) APISendMessage(c *gin.Context) { func (h *Handlers) APISendMessage(c *gin.Context) {
var req struct { var req struct {

11
handler/ssr_home.go
View File

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

24
model/models.go
View File

@@ -226,16 +226,20 @@ const (
// PrivateMessage 站内私信 // PrivateMessage 站内私信
type PrivateMessage struct { 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"` FromUser User `gorm:"foreignKey:FromUserID" json:"from_user,omitempty"`
ToUser User `gorm:"foreignKey:ToUserID" json:"to_user,omitempty"` ToUser User `gorm:"foreignKey:ToUserID" json:"to_user,omitempty"`

1
router/router.go
View File

@@ -195,6 +195,7 @@ func Setup(cfg *config.Config) (*gin.Engine, error) {
api.GET("/messages/unread-count", h.APIMessageUnreadCount) api.GET("/messages/unread-count", h.APIMessageUnreadCount)
api.GET("/messages/notifications", h.APIMessageNotifications) api.GET("/messages/notifications", h.APIMessageNotifications)
api.POST("/messages/notifications/read", h.APIMarkNotificationsRead) api.POST("/messages/notifications/read", h.APIMarkNotificationsRead)
api.POST("/messages/:id/read", h.APIMarkMessageRead)
api.GET("/messages/conversations", h.APIMessageConversations) api.GET("/messages/conversations", h.APIMessageConversations)
api.GET("/messages/conversations/:peerId", h.APIConversationMessages) api.GET("/messages/conversations/:peerId", h.APIConversationMessages)
api.POST("/messages/conversations/:peerId/read", h.APIMarkConversationRead) api.POST("/messages/conversations/:peerId/read", h.APIMarkConversationRead)

285
service/message.go
View File

@@ -3,11 +3,13 @@ package service
import ( import (
"errors" "errors"
"fmt" "fmt"
"regexp"
"strings" "strings"
"time" "time"
"unicode/utf8" "unicode/utf8"
"git.iioio.com/freefire/jiang13-forum/model" "git.iioio.com/freefire/jiang13-forum/model"
"gorm.io/gorm"
) )
var ( var (
@@ -24,13 +26,15 @@ func NewMessageService(filter *SensitiveFilter, settings *ForumSettingsService)
} }
type MessageSendInput struct { 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 发送私信（用户互发或系统通知） // Send 发送私信（用户互发或系统通知）
@@ -82,14 +86,16 @@ func (s *MessageService) Send(in MessageSendInput) (*model.PrivateMessage, error
} }
msg := &model.PrivateMessage{ 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 { if err := model.DB.Create(msg).Error; err != nil {
return nil, err return nil, err
@@ -98,22 +104,54 @@ func (s *MessageService) Send(in MessageSendInput) (*model.PrivateMessage, error
return msg, nil return msg, nil
} }
// SystemNotifyRefs 系统通知关联目标（帖子 / 评论 / 举报）
type SystemNotifyRefs struct {
PostID *uint
ReportID *uint
CommentID *uint
Floor *int
}
// SendSystem 系统私信（管理员/系统 → 用户） // SendSystem 系统私信（管理员/系统 → 用户）
func (s *MessageService) SendSystem(toUserID uint, subject, content, kind string, relatedPostID, relatedReportID *uint) (*model.PrivateMessage, error) { 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 == "" { if kind == "" {
kind = model.MessageKindSystem kind = model.MessageKindSystem
} }
return s.Send(MessageSendInput{ 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 全部标为已读 // MarkAllRead 全部标为已读
func (s *MessageService) MarkAllRead(userID uint) error { func (s *MessageService) MarkAllRead(userID uint) error {
return model.DB.Model(&model.PrivateMessage{}). return model.DB.Model(&model.PrivateMessage{}).
@@ -175,9 +213,212 @@ func (s *MessageService) ListNotifications(userID uint, page, size int, kind str
if list == nil { if list == nil {
list = []model.PrivateMessage{} list = []model.PrivateMessage{}
} }
s.enrichModerationStatus(list)
return list, total, nil 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 将系统通知全部标为已读 // MarkNotificationsRead 将系统通知全部标为已读
func (s *MessageService) MarkNotificationsRead(userID uint) error { func (s *MessageService) MarkNotificationsRead(userID uint) error {
return s.MarkConversationRead(userID, 0) return s.MarkConversationRead(userID, 0)

166
service/message_moderation.go Normal file
View File

@@ -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
}

61
service/message_moderation_integration_test.go Normal file
View File

@@ -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)
}
}

102
service/message_moderation_test.go Normal file
View File

@@ -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)
}
}

44
service/notify.go
View File

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

24
service/report.go
View File

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