Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions api-directory.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
- GET `/api/account/profile`:当前用户资料;GET `/api/account/profile?username=...`:公开资料。
- 字段:`id`、`username`、`nickname`、`email`、`introduction`、`avatarId`、`joinDate`。其他用户的 `email` 为 null。
- POST `/api/account/profile`:FormData,可提交 `nickname`、`introduction`、`avatar`,返回更新后的资料。
- GET `/api/avatar/{avatarId}`:头像。有资料对象时直接使用此路径;只有用户名时保留后端仍支持的 `/api/account/icon?username=...` 重定向。
- GET `/api/avatar/{avatarId}`:头像,前端只用这一个接口(`UserAvatar` 组件 / `useAvatarUrl`)。已知 `avatarId` 时直接使用、不发请求:资料对象自带 `avatarId`;总分榜(`/api/maiscore/sum/...` 的 `players[].player`)、季赛榜(`/api/maiscore/leaderboard/period` 每条的 `player`)和评论(`authorProfile`)附带精简资料 `UserBrief` = `{ id, username, nickname, avatarId }`(未上传头像时 `avatarId` 为 `default`,`nickname` 可能为空串;账号已删除或评论为占位符时为 null);单曲排行榜 `scores[][].player` 的 `id`、`avatarId` 也已填充。只有谱面上传者(谱面响应不带资料)以及上述资料为 null 或缺失时,才按用户名读 GET `/api/account/profile?username=...` 取 `avatarId`,同名只请求一次并与个人空间共用缓存;用户不存在或无用户名时用 `default`。这些榜单和评论仍显示用户名,不换成昵称。`/api/account/icon?username=...` 仅留给 MajdataPlay,前端不再调用。
- 头像和简介上传后刷新资料,避免旧头像缓存;昵称用于显示,用户名继续用于链接、归属判断和 API 查询。
- GET `/api/account/recent?username=...`、GET `/api/account/scores` 的已有调用协议保持兼容。

Expand All @@ -34,8 +34,10 @@
| 功能 | 对齐结果 |
| --- | --- |
| 全站总分榜 | 改用 GET `/api/maiscore/sum/all?page=0&pageSize=...` |
| 上传者榜 | 继续使用已实现的 GET `/api/stats/score-sums?uploader=...&page=...&pageSize=...`;新 `/maiscore/sum/chart/by-uploader/...` 仍为空实现,不切换 |
| 总分返回值 | 从旧数组和 `dxAccSum` 改为 `{ geneTime, players: [{ userId, username, acc: { dx, classic } }] }` |
| 上传者榜 | 改用 GET `/api/maiscore/sum/chart/by-uploader/{uploader}?page=0&pageSize=...`(`uploader` 作为路径段转义);旧 `/api/stats/score-sums` 已废弃 |
| 单曲排行榜/成绩卡排名 | 改用 GET `/api/maiscore/leaderboard/chart/by-id/{chartId}`;旧 GET `/api/maichart/{chartId}/score` 已废弃 |
| 季赛榜 | 改用 POST `/api/maiscore/leaderboard/period`,请求体不变;旧 POST `/api/playhistory/ranking` 已废弃 |
| 总分返回值 | 从旧数组和 `dxAccSum` 改为 `{ geneTime, players: [{ userId, username, acc: { dx, classic }, player }] }`,`player` 为 `UserBrief \| null` |
| 收藏歌单列表 | GET `/api/account/favorite/collection/list` 返回 `songHashs`,卡片的 `count` 从数组长度计算 |
| 谱面投票 | PUT `/api/maichart/{chartId}/vote`,JSON `{ value: 1 \| 0 \| -1 }`,返回 `{ score, upvotes, downvotes, myVote }`;旧的 like/dislike Form 接口只保留给游戏客户端 |
| 列表计数 | GET `/api/maichart/{chartId}/interactsum` 返回 `{ chartId, plays, score, upvotes, downvotes, comments, myVote }`;列表一页用 POST `/api/maichart/interactsum`(请求体为 ID 数组)一次取回 |
Expand All @@ -50,7 +52,7 @@

以下是目标提交本身的问题,前端未通过修改查询含义、吞掉失败或重复写入来绕过:

1. `src/WebApplication2/Controllers/StatisticsController.cs:34`:`page` 限制为至少 1,但默认值为 0,且服务按 `Skip(page * pageSize)` 做零起点分页。`page=0` 会被校验拒绝,改成 1 会漏掉第一页。影响上传者榜;应允许 `page >= 0`。全站榜已改用允许 0 的新接口。
1. ~~`src/WebApplication2/Controllers/StatisticsController.cs:34`:`page` 限制为至少 1,但默认值为 0,且服务按 `Skip(page * pageSize)` 做零起点分页。~~ 已解决:上传者榜已改用 `/api/maiscore/sum/chart/by-uploader/{uploader}`,该接口允许 `page >= 0`。
2. `src/WebApplication2/Controllers/MaiChartApi/InteractController.cs:175`:评论/回复分支声明 `newInteract` 后没有接收 `AddCommentAsync` / `ReplyCommentAsync` 的返回值,写入后仍检查 null 并返回 400。应接收返回值并据此判断结果,否则用户可能因错误提示重复提交。
3. `src/WebApplication2/Controllers/AccountApi/AccountController.cs:218`:旧的待激活账号登录仍发送激活链接,但 `GET /account/verify` 已移除。前端提示旧账号联系管理员;需要后端提供旧账户迁移或新的激活流程。
4. `src/WebApplication2/Controllers/CollectionController.cs:209`:空字符串描述被 `SetIf(!string.IsNullOrEmpty(...))` 忽略,现有歌单不能清空描述。需要将“未传字段”与“传入空字符串”区分。资料简介也有相同限制,前端继续禁止空简介提交。
Expand Down
23 changes: 17 additions & 6 deletions e2e/live2d-mascot.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,31 @@ const songs = Array.from({ length: 6 }, (_, index) => ({
publicTags: [],
timestamp: '2026-09-20T00:00:00Z',
}));
// A 1×1 transparent PNG: covers and avatars load without depending on any file in public/.
const placeholderImage = Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=', 'base64');
const interactSummary = (chartId: string) => ({ chartId, plays: 0, score: 0, upvotes: 0, downvotes: 0, comments: 0, myVote: 0 });

async function mockApi(page: Page) {
await page.route('**/api3/**', async (route) => {
const path = new URL(route.request().url()).pathname;
if (path.endsWith('/image') || path.endsWith('/Icon')) {
await route.fulfill({ path: 'public/xxlb.jpg', contentType: 'image/jpeg' });
if (path.endsWith('/image') || path.includes('/avatar/')) {
await route.fulfill({ body: placeholderImage, contentType: 'image/png' });
return;
}
const body = path.includes('/account/info') ? {}
if (path.endsWith('/maichart/interactsum')) {
// The song list reads the counts of a whole page with one POST of the chart IDs.
const chartIds = route.request().postDataJSON() as string[];
await route.fulfill({ json: chartIds.map(interactSummary) });
return;
}
const body = path.endsWith('/account/profile') ? {}
: path.endsWith('/maichart/list') ? songs
: path.endsWith('/summary') ? songs[0]
: path.endsWith('/interactsum') ? { likeCount: 0, commentCount: 0, playCount: 0 }
: path.endsWith('/score') ? { scores: [] }
: [];
: path.endsWith('/interactsum') ? interactSummary(path.split('/').at(-2) ?? '')
: path.includes('/maiscore/leaderboard/chart/by-id/') ? { scores: [] }
// The comment section reads a page object; an array would crash the whole song page.
: path.endsWith('/comments') ? { items: [], total: 0, page: 1, pageSize: 20, sort: 'best' }
: [];
await route.fulfill({ json: body });
});
// The player itself is outside this feature; keep its real DOM/stacking surface
Expand Down
8 changes: 4 additions & 4 deletions src/components/header/UserMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { useTranslation } from 'react-i18next';
import { useState, useRef } from 'react';
import { Link } from 'react-router-dom';
import { useUserContext } from '@/hooks';
import UserAvatar from '@/components/user/UserAvatar';
import { handleLogout as logoutUtil } from '@/utils';
import { endpoints } from '@/config/api';
import { DIVIDER } from './styles';
import Dropdown from './Dropdown';

Expand Down Expand Up @@ -46,10 +46,10 @@ export default function UserMenu({ username }: UserMenuProps) {
aria-expanded={isOpen}
aria-label={t("shared/UserMenu.UserMenu")}
>
<img
<UserAvatar
className={`w-7 h-7 md:w-9 md:h-9 rounded-full border-2 object-cover ${isOpen ? 'border-white/60' : 'border-white/30 hover:border-white/60'}`}
src={user?.avatarId ? endpoints.account.avatar(user.avatarId) : endpoints.account.icon(username)}
alt={username}
username={username}
avatarId={user?.avatarId}
/>
<span className="hidden md:inline max-w-30 overflow-hidden font-medium text-ellipsis whitespace-nowrap">{user?.nickname || username}</span>
</button>
Expand Down
8 changes: 4 additions & 4 deletions src/components/score/ScoreCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import useSWR from 'swr';
import { Link } from 'react-router-dom';
import { CoverPic, Level, LazyLoad } from '@/components';
import { ChartVoteBadge } from '@/components/song/SongInteraction';
import UserAvatar from '@/components/user/UserAvatar';
import { apiFetcher } from '@/utils/apiClient';
import { endpoints } from '@/config/api';
import { getComboState } from '@/utils';
Expand Down Expand Up @@ -68,7 +69,7 @@ export function ScoreCard({
const targetUsername = rankUsername || currentUsername;

const { data: chartScores } = useSWR(
showRank && targetUsername ? endpoints.maichart.score(score.chartInfo.id) : null,
showRank && targetUsername ? endpoints.maiscore.chartLeaderboard(score.chartInfo.id) : null,
apiFetcher
);

Expand Down Expand Up @@ -138,10 +139,9 @@ export function ScoreCard({

<div className="mb-2 text-[0.8rem] truncate">
<Link to={'/space?id=' + score.chartInfo.uploader}>
<img
<UserAvatar
className="inline-block mx-[0.1rem] rounded-[1.3rem] w-[1.3rem] h-[1.3rem] overflow-hidden cursor-pointer select-none"
src={endpoints.account.icon(score.chartInfo.uploader)}
alt={score.chartInfo.uploader}
username={score.chartInfo.uploader}
/>
{score.chartInfo.designer}
</Link>
Expand Down
12 changes: 7 additions & 5 deletions src/components/score/ScoreCount.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useTranslation } from 'react-i18next';
import { endpoints } from '@/config/api';
import useSWR from 'swr';
import { LoadingSpinner } from '@/components';
import UserAvatar from '@/components/user/UserAvatar';
import type { ScoreCardProps, ScoreCountProps, ScoreSumResponse } from '@/types';
import { Link } from 'react-router-dom';

Expand All @@ -16,7 +17,7 @@ export default function ScoreCount({ uploader, page = 0, pageSize = 10 }: ScoreC
const { t } = useTranslation();

const { data: response, error, isLoading } = useSWR<ScoreSumResponse>(
endpoints.stats.scoreSums(uploader, page, pageSize),
endpoints.maiscore.scoreSums(uploader, page, pageSize),
fetcher,
{ refreshInterval: 30000 } // 每30秒刷新一次
);
Expand Down Expand Up @@ -54,6 +55,7 @@ export default function ScoreCount({ uploader, page = 0, pageSize = 10 }: ScoreC
key={player.username}
rank={page * pageSize + index + 1}
username={player.username}
avatarId={player.player?.avatarId}
scoresum={player.acc.dx}
maxscore={maxScore}
/>
Expand All @@ -66,7 +68,7 @@ export default function ScoreCount({ uploader, page = 0, pageSize = 10 }: ScoreC
/**
* 单个分数卡片组件
*/
export function ScoreCard({ rank, username, scoresum, maxscore, footer }: ScoreCardProps) {
export function ScoreCard({ rank, username, avatarId, scoresum, maxscore, footer }: ScoreCardProps) {
const percentage = maxscore > 0 ? (scoresum / maxscore) * 100 : 0;
const isFirst = rank === 1;

Expand Down Expand Up @@ -119,14 +121,14 @@ export function ScoreCard({ rank, username, scoresum, maxscore, footer }: ScoreC

{/* 玩家头像 */}
<div className="flex justify-center mb-2">
<img
<UserAvatar
className="border-2 rounded-full w-16 h-16 object-cover transition-all duration-300"
style={{
borderColor: isFirst ? 'rgba(255, 215, 0, 0.6)' : 'rgb(255 255 255 / 20%)',
aspectRatio: '1',
}}
src={endpoints.account.icon(username)}
alt={username}
username={username}
avatarId={avatarId}
/>
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/components/season/SeasonLeaderboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export default function SeasonLeaderboard({ event, status, chartState }: SeasonL
<li key={player.playerId} data-season-rank={player.rank} className="min-w-0">
<p className="mb-2 text-white/70 text-sm text-center"><span className="sr-only">{t('season/SeasonLeaderboard.Rank')} </span>#{player.rank}</p>
<SeasonScoreDetails event={event} chartState={chartState} player={player} status={status}>
<TotalScoreCard rank={player.rank} username={player.username} scoresum={player.score} maxscore={entries?.[0]?.score ?? 0}
<TotalScoreCard rank={player.rank} username={player.username} avatarId={player.player?.avatarId} scoresum={player.score} maxscore={entries?.[0]?.score ?? 0}
footer={<SeasonLastPlayed username={player.username} event={event} chartState={chartState} status={status} />} />
</SeasonScoreDetails>
</li>
Expand Down
8 changes: 5 additions & 3 deletions src/components/song/ScoreRanking.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { motion, AnimatePresence } from 'framer-motion';
import { endpoints } from '@/config/api';
import { getComboState, getLevelName } from '@/utils';
import { LoadingSpinner } from '@/components';
import UserAvatar from '@/components/user/UserAvatar';
import { Link } from 'react-router-dom';
import type { ChartScore, ScoreListProps } from '@/types';

Expand Down Expand Up @@ -225,14 +226,15 @@ function RankingCard({
>
{/* 头像 */}
<div className="relative shrink-0">
<img
<UserAvatar
className={`
w-10 h-10 rounded-full object-cover
border-2 transition-all duration-200
group-hover:scale-105
${rank <= 3 ? topThreeAvatarClass : 'border-white/20 group-hover:border-white/40'}
`}
src={score.player.avatarId ? endpoints.account.avatar(score.player.avatarId) : endpoints.account.icon(score.player.username)}
username={score.player.username}
avatarId={score.player.avatarId}
alt={score.player.nickname || score.player.username}
/>
</div>
Expand Down Expand Up @@ -356,7 +358,7 @@ export function ScoreRanking({ songid }: ScoreListProps) {
const [transitionDirection, setTransitionDirection] = useState<1 | -1>(1);

const { data, error, isLoading } = useSWR(
endpoints.maichart.score(songid),
endpoints.maiscore.chartLeaderboard(songid),
fetcher,
{ revalidateOnFocus: true }
);
Expand Down
9 changes: 5 additions & 4 deletions src/components/song/SongComments.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
} from 'react-icons/pi';
import { endpoints } from '@/config/api';
import { LoadingSpinner } from '@/components';
import UserAvatar from '@/components/user/UserAvatar';
import { useIsAdministrator, useUserContext } from '@/hooks';
import { apiFetcher, apiRequest, jsonRequest } from '@/utils/apiClient';
import { VoteControl } from './VoteControl';
Expand Down Expand Up @@ -219,8 +220,8 @@ function foldFrom(policy: FoldPolicy, level: number, maxDepth: number): FoldPoli
return { ...policy, depth: Math.min(policy.depth, maxDepth - level) };
}

function Avatar({ username, className }: { username: string; className: string }) {
return <img className={`${className} rounded-full object-cover border border-white/20`} src={endpoints.account.icon(username)} alt={username} />;
function Avatar({ username, avatarId, className }: { username: string; avatarId?: string | null; className: string }) {
return <UserAvatar className={`${className} rounded-full object-cover border border-white/20`} username={username} avatarId={avatarId} />;
}

function CommentNode({ comment, level }: { comment: Comment; level: number }) {
Expand Down Expand Up @@ -301,7 +302,7 @@ function CommentNode({ comment, level }: { comment: Comment; level: number }) {
<span className="bg-white/10 rounded-full w-6 h-6" aria-hidden="true" />
) : (
<Link to={`/space?id=${encodeURIComponent(comment.author)}`} tabIndex={-1} aria-hidden="true">
<Avatar username={comment.author} className="w-6 h-6" />
<Avatar username={comment.author} avatarId={comment.authorProfile?.avatarId} className="w-6 h-6" />
</Link>
)}
{!collapsed && comment.replies.length > 0 && (
Expand Down Expand Up @@ -699,7 +700,7 @@ function CommentSummary({ comment }: { comment: Comment }) {
<article className="space-y-2 bg-white/6 p-4 border border-white/10 rounded-xl min-w-0">
<header className="flex flex-wrap items-center gap-x-2 gap-y-1 text-white/50 text-xs">
<Link to={`/space?id=${encodeURIComponent(comment.author)}`} className="inline-flex items-center gap-1.5 font-medium text-white/90 hover:underline">
<Avatar username={comment.author} className="w-5 h-5" />
<Avatar username={comment.author} avatarId={comment.authorProfile?.avatarId} className="w-5 h-5" />
{comment.author || t("song/SongComments.UnknownUser")}
</Link>
<span aria-hidden="true">·</span>
Expand Down
2 changes: 1 addition & 1 deletion src/components/song/commentTree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function countTree(items: Comment[]): number {

/** 把评论变成占位符:正文、作者清空,标记删除或移除。 */
export function toPlaceholder(comment: Comment, removed: boolean): Comment {
return { ...comment, body: '', author: '', authorId: null, deleted: !removed, removed };
return { ...comment, body: '', author: '', authorId: null, authorProfile: null, deleted: !removed, removed };
}

/** 评论的永久链接:歌曲页加 comment 参数。 */
Expand Down
5 changes: 4 additions & 1 deletion src/components/user/AvatarUploader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { toast } from 'react-toastify';
import axios from 'axios';
import { endpoints } from '@/config/api';
import { useUserContext } from '@/hooks';
import { useAvatarUrl } from '@/hooks/useAvatarUrl';
import { getDisplayMessage } from '@/utils';
import { LoadingSpinner } from '@/components';

Expand Down Expand Up @@ -122,12 +123,14 @@ export default function AvatarUploader() {
fileInputRef.current?.click();
}, []);

// hook 必须在提前返回之前调用
const currentAvatarUrl = useAvatarUrl(user?.username, user?.avatarId) ?? undefined;

// 如果用户还在加载中,返回加载状态
if (userLoading || !user) {
return <div className="flex justify-center items-center py-12"><LoadingSpinner size="50px" /></div>;
}

const currentAvatarUrl = user.avatarId ? endpoints.account.avatar(user.avatarId) : endpoints.account.icon(user.username);
const previewAvatarUrl = previewUrl || currentAvatarUrl;

return (
Expand Down
29 changes: 29 additions & 0 deletions src/components/user/UserAvatar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import type { ImgHTMLAttributes } from 'react';
import { useAvatarUrl } from '@/hooks/useAvatarUrl';

interface UserAvatarProps extends Omit<ImgHTMLAttributes<HTMLImageElement>, 'src'> {
/** 用户名;只有它时会先按用户名查 avatarId */
username: string | null | undefined;
/** 已知的头像 ID,有它就不再查询 */
avatarId?: string | null;
}

/**
* 用户头像。查询 avatarId 期间渲染同尺寸的占位,查到后换成图片。
* alt 默认为用户名。
*/
export default function UserAvatar({ username, avatarId, alt, className, style, ...rest }: UserAvatarProps) {
const src = useAvatarUrl(username, avatarId);

if (!src) {
return (
<span
className={className}
style={{ display: 'inline-block', backgroundColor: 'rgb(255 255 255 / 0.1)', ...style }}
aria-hidden="true"
data-testid="avatar-placeholder"
/>
);
}
return <img className={className} style={style} src={src} alt={alt ?? username ?? ''} {...rest} />;
}
Loading
Loading