feat: 调整 Feed 排序为新评论/新帖子/推荐帖
默认按新评论;推荐排序优先 featured,并将用户可见「精华」文案改为「推荐」。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { Sparkles } from 'lucide-react';
|
||||
import { BadgeCheck } from 'lucide-react';
|
||||
import { cn } from '@/lib/utils';
|
||||
|
||||
interface Props {
|
||||
@@ -6,13 +6,13 @@ interface Props {
|
||||
size?: number;
|
||||
}
|
||||
|
||||
/** 精华帖标识 */
|
||||
/** 推荐帖标识 */
|
||||
export default function FeaturedIcon({ className, size = 16 }: Props) {
|
||||
return (
|
||||
<Sparkles
|
||||
<BadgeCheck
|
||||
className={cn('post-featured-icon', className)}
|
||||
size={size}
|
||||
aria-label="精华"
|
||||
aria-label="推荐"
|
||||
role="img"
|
||||
/>
|
||||
);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useRef } from 'react';
|
||||
import { boardPath, type PermalinkOpts } from '../utils/permalink';
|
||||
import { getCachedForumLimits } from '../hooks/useForumLimits';
|
||||
import { Clock, MessageCircle, Flame } from 'lucide-react';
|
||||
import { Clock, MessageCircle, BadgeCheck } from 'lucide-react';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { moveTabIndex } from '../hooks/useOverlayA11y';
|
||||
|
||||
@@ -13,9 +13,9 @@ const SORT_OPTIONS: {
|
||||
hint: string;
|
||||
icon: typeof Clock;
|
||||
}[] = [
|
||||
{ key: 'latest', label: '最新发帖', hint: '按发布时间', icon: Clock },
|
||||
{ key: 'reply', label: '最新回复', hint: '最近有人回复', icon: MessageCircle },
|
||||
{ key: 'hot', label: '热门讨论', hint: '按互动热度', icon: Flame },
|
||||
{ key: 'reply', label: '新评论', hint: '最近有人评论', icon: MessageCircle },
|
||||
{ key: 'latest', label: '新帖子', hint: '按发帖时间', icon: Clock },
|
||||
{ key: 'hot', label: '推荐帖', hint: '站内推荐', icon: BadgeCheck },
|
||||
];
|
||||
|
||||
interface Props {
|
||||
@@ -24,14 +24,15 @@ interface Props {
|
||||
postTotal?: number;
|
||||
}
|
||||
|
||||
/** 解析 URL sort;缺省为新评论(reply) */
|
||||
export function parseFeedSort(raw: string | null): FeedSort {
|
||||
if (raw === 'reply' || raw === 'hot') return raw;
|
||||
return 'latest';
|
||||
if (raw === 'latest' || raw === 'hot') return raw;
|
||||
return 'reply';
|
||||
}
|
||||
|
||||
export function buildHomeUrl(
|
||||
boardId: number,
|
||||
sort: FeedSort = 'latest',
|
||||
sort: FeedSort = 'reply',
|
||||
opts?: { keyword?: string; tag?: string; author?: string; titleOnly?: boolean; permalink?: PermalinkOpts },
|
||||
) {
|
||||
const p = new URLSearchParams();
|
||||
@@ -47,7 +48,8 @@ export function buildHomeUrl(
|
||||
} else if (author) {
|
||||
p.set('author', author);
|
||||
}
|
||||
if (sort !== 'latest') p.set('sort', sort);
|
||||
// 默认 reply 不写进 URL;latest / hot 显式带上
|
||||
if (sort !== 'reply') p.set('sort', sort);
|
||||
const qs = p.toString();
|
||||
|
||||
if (boardId) {
|
||||
|
||||
@@ -70,9 +70,9 @@ function PostListItem({ post, sort = 'latest', boardId = 0, onSelect }: Props) {
|
||||
<span className="post-pin-badge post-pin-badge--board" title="板块置顶">板块置顶</span>
|
||||
)}
|
||||
{post.featured && (
|
||||
<span className="post-feature-badge" title="精华">
|
||||
<span className="post-feature-badge" title="推荐">
|
||||
<FeaturedIcon size={12} />
|
||||
精华
|
||||
推荐
|
||||
</span>
|
||||
)}
|
||||
{post.status === 'pending' && (
|
||||
|
||||
@@ -147,7 +147,7 @@ export default function PostManageMenu({
|
||||
<DropdownMenuLabel>展示</DropdownMenuLabel>
|
||||
<DropdownMenuItem onSelect={onFeature}>
|
||||
<Sparkles size={14} aria-hidden />
|
||||
{post.featured ? '取消精华' : '设为精华'}
|
||||
{post.featured ? '取消推荐' : '设为推荐'}
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem onSelect={onPin}>
|
||||
<Pin size={14} aria-hidden />
|
||||
|
||||
@@ -56,7 +56,7 @@ function getMobileFeedScrollEl(): HTMLElement | null {
|
||||
|
||||
export default function VirtualPostList({
|
||||
posts,
|
||||
sort = 'latest',
|
||||
sort = 'reply',
|
||||
loading,
|
||||
hasMore,
|
||||
showPagination,
|
||||
|
||||
@@ -216,7 +216,7 @@ export default function MainLayout() {
|
||||
};
|
||||
}, [refreshUnreadMessages]);
|
||||
|
||||
// 标签云:进页/离开发帖页时拉取;不跟 posts-refresh 联动(置顶/精华等不改标签)
|
||||
// 标签云:进页/离开发帖页时拉取;不跟 posts-refresh 联动(置顶/推荐等不改标签)
|
||||
useEffect(() => {
|
||||
if (isCompose || !showTagCloud) return;
|
||||
let cancelled = false;
|
||||
|
||||
@@ -230,7 +230,7 @@ export default function HomePage() {
|
||||
tag: tag || '',
|
||||
author: tag ? '' : author,
|
||||
title_only: !tag && titleOnly ? '1' : '',
|
||||
sort: sort === 'latest' ? '' : sort,
|
||||
sort,
|
||||
});
|
||||
const batch = Array.isArray(data.posts) ? data.posts : [];
|
||||
const total = data.total ?? 0;
|
||||
|
||||
@@ -245,7 +245,7 @@ export default function AdminDashboardPage() {
|
||||
) : '—'}
|
||||
</td>
|
||||
<td className="space-x-1">
|
||||
{p.featured ? <Badge variant="orange">精华</Badge> : null}
|
||||
{p.featured ? <Badge variant="orange">推荐</Badge> : null}
|
||||
{p.pinned ? <Badge variant="green">全局置顶</Badge> : null}
|
||||
{p.board_pinned ? <Badge variant="green">板块置顶</Badge> : null}
|
||||
{!p.featured && !p.pinned && !p.board_pinned ? '—' : null}
|
||||
|
||||
@@ -218,7 +218,7 @@ export default function AdminPostsPage() {
|
||||
? '回收站中的帖子可恢复或永久删除;永久删除后不可撤销'
|
||||
: tab === 'pending'
|
||||
? '审核普通用户提交的帖子;通过后公开,拒绝后仅作者可见并私信通知'
|
||||
: '精华、全局置顶、板块置顶、锁定编辑/讨论、删除(移入回收站);支持按标题、标签或正文搜索'}
|
||||
: '推荐、全局置顶、板块置顶、锁定编辑/讨论、删除(移入回收站);支持按标题、标签或正文搜索'}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -337,7 +337,7 @@ export default function AdminPostsPage() {
|
||||
<th>作者</th>
|
||||
<th>标签</th>
|
||||
<th>评论</th>
|
||||
<th>精华</th>
|
||||
<th>推荐</th>
|
||||
<th>全局置顶</th>
|
||||
<th>板块置顶</th>
|
||||
<th>编辑锁</th>
|
||||
@@ -396,7 +396,7 @@ export default function AdminPostsPage() {
|
||||
</Button>
|
||||
)}
|
||||
<Button size="sm" variant="outline" onClick={() => toggleFeature(p)}>
|
||||
{p.featured ? '取消精华' : '精华'}
|
||||
{p.featured ? '取消推荐' : '推荐'}
|
||||
</Button>
|
||||
<Button size="sm" variant="outline" onClick={() => togglePin(p)}>
|
||||
{p.pinned ? '取消全局置顶' : '全局置顶'}
|
||||
|
||||
@@ -2775,7 +2775,7 @@ body:has(.admin-topbar) .ptr-indicator {
|
||||
}
|
||||
|
||||
/*
|
||||
* 手机 Feed:主栏整页滚动,板块条 / 最新发帖·回复排序栏随列表滚走,
|
||||
* 手机 Feed:主栏整页滚动,板块条 / 新评论·新帖子排序栏随列表滚走,
|
||||
* 避免它们占住视口上半,给帖子列表更多空间。
|
||||
*/
|
||||
.main-content--feed-mobile-scroll {
|
||||
@@ -3468,15 +3468,15 @@ body:has(.admin-topbar) .ptr-indicator {
|
||||
|
||||
.post-feature-badge {
|
||||
padding: 0 7px 0 5px;
|
||||
color: #b45309;
|
||||
background: rgba(245, 158, 11, 0.12);
|
||||
border: 1px solid rgba(245, 158, 11, 0.22);
|
||||
color: var(--j13-green);
|
||||
background: var(--j13-green-bg);
|
||||
border: 1px solid color-mix(in srgb, var(--j13-green) 28%, transparent);
|
||||
}
|
||||
|
||||
.dark .post-feature-badge {
|
||||
color: #fbbf24;
|
||||
background: rgba(251, 191, 36, 0.14);
|
||||
border-color: rgba(251, 191, 36, 0.22);
|
||||
color: var(--j13-green);
|
||||
background: var(--j13-green-bg);
|
||||
border-color: color-mix(in srgb, var(--j13-green) 35%, transparent);
|
||||
}
|
||||
|
||||
.post-feature-badge .post-featured-icon {
|
||||
@@ -3611,12 +3611,12 @@ a.post-title:visited {
|
||||
display: inline-block;
|
||||
vertical-align: -0.15em;
|
||||
flex-shrink: 0;
|
||||
color: #d97706;
|
||||
color: var(--j13-green);
|
||||
stroke-width: 1.75;
|
||||
}
|
||||
|
||||
.dark .post-featured-icon {
|
||||
color: #fbbf24;
|
||||
color: var(--j13-green);
|
||||
}
|
||||
|
||||
.post-meta {
|
||||
|
||||
Reference in New Issue
Block a user