feat: 站点单页、时间线导入与行级 BBCode 短代码
首页右栏接入单页入口与公告置顶/全部页;Markdown 编辑器支持可视化时间线与 Git 导入;隐藏块改为 [hide]/[timeline] 命名闭合,并修复单页/公告 GORM 更新只改 updated_at 的问题。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
// Package markdown 提供帖子正文隐藏块(:::hide)的解析、校验与脱敏。
|
||||
// Package markdown 提供帖子正文隐藏块(行级 BBCode [hide]…[/hide])的解析、校验与脱敏。
|
||||
package markdown
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"unicode/utf8"
|
||||
@@ -43,22 +44,25 @@ type DerivedAccess struct {
|
||||
|
||||
// ViewerCaps 读者对隐藏块的能力(由 service 填充)
|
||||
type ViewerCaps struct {
|
||||
Bypass bool // 作者 / 版主
|
||||
LoggedIn bool
|
||||
HasReplied bool
|
||||
PointsPaid bool // 已支付本帖积分解锁
|
||||
PasswordUnlocked map[int]bool // 已凭密码解锁的隐藏块下标
|
||||
Bypass bool // 作者 / 版主
|
||||
LoggedIn bool
|
||||
HasReplied bool
|
||||
PointsPaid bool // 已支付本帖积分解锁
|
||||
PasswordUnlocked map[int]bool // 已凭密码解锁的隐藏块下标
|
||||
}
|
||||
|
||||
var (
|
||||
ErrHideNested = errors.New("隐藏块不可嵌套")
|
||||
ErrHideUnclosed = errors.New("隐藏块未正确闭合")
|
||||
ErrHideInvalid = errors.New("隐藏块语法无效")
|
||||
ErrHidePointsNeed = errors.New("积分可见块须指定 1–100000 的积分")
|
||||
ErrHidePasswordNeed = errors.New("密码可见块须设置 1–64 字符且不含空格的密码")
|
||||
ErrHideNested = errors.New("隐藏块不可嵌套")
|
||||
ErrHideUnclosed = errors.New("隐藏块未正确闭合")
|
||||
ErrHideInvalid = errors.New("隐藏块语法无效")
|
||||
ErrHidePointsNeed = errors.New("积分可见块须指定 1–100000 的积分")
|
||||
ErrHidePasswordNeed = errors.New("密码可见块须设置 1–64 字符且不含空格的密码")
|
||||
)
|
||||
|
||||
// ParseHideBlocks 扫描正文中的 :::hide 块(忽略代码围栏内伪语法)。
|
||||
// 开标记:整行 [hide <kind> …];闭标记:整行 [/hide]
|
||||
var hideOpenRe = regexp.MustCompile(`(?i)^\[hide(?:\s+(.+))?\]$`)
|
||||
|
||||
// ParseHideBlocks 扫描正文中的 [hide]…[/hide] 块(忽略代码围栏内伪语法)。
|
||||
func ParseHideBlocks(content string) ([]HideBlock, error) {
|
||||
lines := splitLines(content)
|
||||
var blocks []HideBlock
|
||||
@@ -175,7 +179,7 @@ func DeriveAccessFromContent(content string) (DerivedAccess, error) {
|
||||
}
|
||||
|
||||
// SanitizeForViewer 按读者能力脱敏:未满足条件的块清空正文并加 locked。
|
||||
// 密码块即使已解锁,也不向读者回传明文密码(开标记写成 :::hide password)。
|
||||
// 密码块即使已解锁,也不向读者回传明文密码(开标记写成 [hide password] 或 [hide password locked])。
|
||||
func SanitizeForViewer(content string, caps ViewerCaps) (sanitized string, fullyLocked bool) {
|
||||
blocks, err := ParseHideBlocks(content)
|
||||
if err != nil {
|
||||
@@ -209,10 +213,10 @@ func SanitizeForViewer(content string, caps ViewerCaps) (sanitized string, fully
|
||||
anyVisible = true
|
||||
}
|
||||
}
|
||||
out = append(out, ":::")
|
||||
out = append(out, "[/hide]")
|
||||
} else {
|
||||
out = append(out, openMarkerLine(b.Kind, b.Points, "", true))
|
||||
out = append(out, ":::")
|
||||
out = append(out, "[/hide]")
|
||||
}
|
||||
cursor = b.End + 1
|
||||
}
|
||||
@@ -249,16 +253,16 @@ func WrapContentAsHide(kind string, points int, content string) string {
|
||||
body := strings.TrimRight(content, "\n")
|
||||
open := openMarkerLine(kind, points, "", false)
|
||||
if body == "" {
|
||||
return open + "\n:::\n"
|
||||
return open + "\n[/hide]\n"
|
||||
}
|
||||
return open + "\n" + body + "\n:::\n"
|
||||
return open + "\n" + body + "\n[/hide]\n"
|
||||
}
|
||||
|
||||
// HasHideBlocks 快速判断正文是否已含隐藏块(迁移幂等)
|
||||
func HasHideBlocks(content string) bool {
|
||||
blocks, err := ParseHideBlocks(content)
|
||||
if err != nil {
|
||||
return strings.Contains(content, ":::hide")
|
||||
return strings.Contains(strings.ToLower(content), "[hide")
|
||||
}
|
||||
return len(blocks) > 0
|
||||
}
|
||||
@@ -281,28 +285,30 @@ func blockUnlocked(b HideBlock, caps ViewerCaps) bool {
|
||||
// openMarkerLine 生成开标记。密码仅在原文存储时写入;对外脱敏输出传空 password。
|
||||
func openMarkerLine(kind string, points int, password string, locked bool) string {
|
||||
var b strings.Builder
|
||||
b.WriteString(":::hide ")
|
||||
b.WriteString("[hide ")
|
||||
b.WriteString(kind)
|
||||
if kind == HideKindPoints && points > 0 {
|
||||
b.WriteByte(' ')
|
||||
b.WriteString("=")
|
||||
b.WriteString(strconv.Itoa(points))
|
||||
}
|
||||
if kind == HideKindPassword && password != "" && !locked {
|
||||
b.WriteByte(' ')
|
||||
b.WriteString("=")
|
||||
b.WriteString(password)
|
||||
}
|
||||
if locked {
|
||||
b.WriteString(" locked")
|
||||
}
|
||||
b.WriteByte(']')
|
||||
return b.String()
|
||||
}
|
||||
|
||||
// parseOpenMarker 解析 :::hide <kind> [points|password] [locked]
|
||||
// parseOpenMarker 解析 [hide <kind>[=arg] [locked]]
|
||||
func parseOpenMarker(trimmed string) (kind string, points int, password string, locked bool, ok bool) {
|
||||
if !strings.HasPrefix(trimmed, ":::hide") {
|
||||
m := hideOpenRe.FindStringSubmatch(trimmed)
|
||||
if m == nil {
|
||||
return "", 0, "", false, false
|
||||
}
|
||||
rest := strings.TrimSpace(trimmed[len(":::hide"):])
|
||||
rest := strings.TrimSpace(m[1])
|
||||
if rest == "" {
|
||||
return "", 0, "", false, false
|
||||
}
|
||||
@@ -310,32 +316,43 @@ func parseOpenMarker(trimmed string) (kind string, points int, password string,
|
||||
if len(parts) == 0 {
|
||||
return "", 0, "", false, false
|
||||
}
|
||||
kind = parts[0]
|
||||
|
||||
head := parts[0]
|
||||
kind = head
|
||||
arg := ""
|
||||
if i := strings.IndexByte(head, '='); i >= 0 {
|
||||
kind = head[:i]
|
||||
arg = head[i+1:]
|
||||
}
|
||||
kind = strings.ToLower(kind)
|
||||
switch kind {
|
||||
case HideKindLogin, HideKindReply, HideKindPoints, HideKindPassword:
|
||||
default:
|
||||
return "", 0, "", false, false
|
||||
}
|
||||
|
||||
idx := 1
|
||||
if kind == HideKindPoints {
|
||||
if idx >= len(parts) {
|
||||
if arg == "" {
|
||||
return "", 0, "", false, false
|
||||
}
|
||||
n, err := strconv.Atoi(parts[idx])
|
||||
n, err := strconv.Atoi(arg)
|
||||
if err != nil {
|
||||
return "", 0, "", false, false
|
||||
}
|
||||
points = n
|
||||
idx++
|
||||
} else if kind == HideKindPassword {
|
||||
// 允许::::hide password locked(脱敏)或 :::hide password <pwd> [locked]
|
||||
if idx < len(parts) && parts[idx] != "locked" {
|
||||
password = parts[idx]
|
||||
idx++
|
||||
// [hide password=secret] 或脱敏 [hide password locked]
|
||||
if arg != "" {
|
||||
password = arg
|
||||
}
|
||||
} else if arg != "" {
|
||||
// login/reply 不应带 =arg
|
||||
return "", 0, "", false, false
|
||||
}
|
||||
|
||||
for ; idx < len(parts); idx++ {
|
||||
if parts[idx] == "locked" {
|
||||
if strings.EqualFold(parts[idx], "locked") {
|
||||
locked = true
|
||||
} else {
|
||||
return "", 0, "", false, false
|
||||
@@ -356,7 +373,7 @@ func validatePassword(pwd string) error {
|
||||
}
|
||||
|
||||
func isCloseMarker(trimmed string) bool {
|
||||
return trimmed == ":::"
|
||||
return strings.EqualFold(trimmed, "[/hide]")
|
||||
}
|
||||
|
||||
func splitLines(s string) []string {
|
||||
@@ -378,7 +395,7 @@ func ValidateHideContent(content string) error {
|
||||
case errors.Is(err, ErrHideNested):
|
||||
return fmt.Errorf("隐藏块不可嵌套")
|
||||
case errors.Is(err, ErrHideUnclosed):
|
||||
return fmt.Errorf("隐藏块未正确闭合,请检查 ::: 标记")
|
||||
return fmt.Errorf("隐藏块未正确闭合,请检查 [/hide] 标记")
|
||||
case errors.Is(err, ErrHidePointsNeed):
|
||||
return fmt.Errorf("积分可见块须指定 1–100000 的积分")
|
||||
case errors.Is(err, ErrHidePasswordNeed):
|
||||
|
||||
Reference in New Issue
Block a user