fix(player): related marks survive, Restart restarts, and refused pages offer nothing to click
- Every state and Watch-later write goes through features/video/videoWrites, which marks the never-refetched lists (related lists, live searches) once the server has it; a contract test holds it. The Notification Center's undo, the feed's reset and the Watch-later toggles skipped it before. - Confirmed marks are also kept apart (qk.videoMarks) and laid over the related rows: a Show more page landing later rebuilt them from the pages it read when it started, and dropped a mark made meanwhile. - Restart on a related video starts at 0 (the session's stored position won before), and on the one already playing it seeks. - The watched toggle remembers each video's mark: Back showed the opened video's launch-time state after a related one was marked. - The help sheet leaves out the player's keys while a layer above it has them waiting. - After a refusal a retry cannot answer, neither Show more (related) nor Load more (live search) is offered; a failed live-search page keeps the results already read and says why under them. - The related cap message counts requests, as the cap does.
This commit is contained in:
@@ -25,6 +25,8 @@ import { RelatedVideos } from "./RelatedVideos";
|
||||
import { api, HttpError, type RelatedVideo, type Video } from "../../lib/api";
|
||||
import { clearAll, getNotifications } from "../../lib/notifications";
|
||||
import { qk } from "../../lib/queryKeys";
|
||||
import { setHintsEnabled } from "../../lib/hints";
|
||||
import { writeVideoState } from "../video/videoWrites";
|
||||
|
||||
beforeAll(() => {
|
||||
class Stub {
|
||||
@@ -65,7 +67,7 @@ const page = (items: RelatedVideo[], next: string | null = null) => ({
|
||||
});
|
||||
|
||||
function setup(
|
||||
onPlay: (v: Video, startAt: number) => void = () => {},
|
||||
onPlay: (v: Video, startAt: number | null) => void = () => {},
|
||||
onWrite?: (write: Promise<unknown>) => void,
|
||||
) {
|
||||
vi.spyOn(api, "comfortPins").mockResolvedValue({ items: [] } as never);
|
||||
@@ -116,12 +118,17 @@ describe("RelatedVideos", () => {
|
||||
expect(saved).toHaveBeenCalledWith({ relatedRegion: "hu" });
|
||||
});
|
||||
|
||||
// A plain pick resumes (null: the player knows the freshest position); the row's own position
|
||||
// travels on the video it hands over.
|
||||
it("plays a row from where the user left it", async () => {
|
||||
vi.spyOn(api, "related").mockResolvedValue(page([row("A", { position_seconds: 95 })]));
|
||||
const onPlay = vi.fn();
|
||||
setup(onPlay);
|
||||
fireEvent.click(await title("Video A"));
|
||||
expect(onPlay).toHaveBeenCalledWith(expect.objectContaining({ id: "A" }), 95);
|
||||
expect(onPlay).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ id: "A", position_seconds: 95 }),
|
||||
null,
|
||||
);
|
||||
});
|
||||
|
||||
it("drops a video hidden here at once, and brings it back when the server refuses", async () => {
|
||||
@@ -308,6 +315,71 @@ describe("RelatedVideos", () => {
|
||||
expect(await screen.findByText("player.related.followed")).toBeTruthy();
|
||||
});
|
||||
|
||||
// An infinite query builds its next page from the pages it read when that fetch started: a mark
|
||||
// that landed in between was dropped with them, for the session.
|
||||
it("keeps a hide that landed while Show more was on its way", async () => {
|
||||
let land: (p: ReturnType<typeof page>) => void = () => {};
|
||||
vi.spyOn(api, "related")
|
||||
.mockResolvedValueOnce(page([row("A"), row("C")], "CUR1"))
|
||||
.mockReturnValueOnce(new Promise((r) => (land = r)) as never);
|
||||
const write = vi.spyOn(api, "setState").mockResolvedValue({ ok: true } as never);
|
||||
setup();
|
||||
await title("Video A");
|
||||
fireEvent.click(screen.getByRole("button", { name: "player.related.more" }));
|
||||
fireEvent.contextMenu((await title("Video A")).closest("[data-video-id]")!);
|
||||
fireEvent.click(menuItem("card.hide"));
|
||||
await waitFor(() => expect(write).toHaveBeenCalledWith("A", "hidden"));
|
||||
await act(async () => {});
|
||||
await act(async () => land(page([row("B")])));
|
||||
await title("Video B");
|
||||
expect(titles()).toEqual(["Video C", "Video B"]);
|
||||
});
|
||||
|
||||
// The Notification Center's undo, the feed's reset, a card elsewhere: every write reaches it.
|
||||
it("follows a video's state written anywhere else", async () => {
|
||||
vi.spyOn(api, "related").mockResolvedValue(page([row("A"), row("B")]));
|
||||
vi.spyOn(api, "setState").mockResolvedValue({ ok: true } as never);
|
||||
const { qc } = setup();
|
||||
await title("Video A");
|
||||
await act(async () => void (await writeVideoState(qc, "A", "hidden")));
|
||||
await waitFor(() => expect(titles()).toEqual(["Video B"]));
|
||||
await act(async () => void (await writeVideoState(qc, "A", "new")));
|
||||
await waitFor(() => expect(titles()).toEqual(["Video A", "Video B"]));
|
||||
});
|
||||
|
||||
// Show more is the request Retry would make: refused for good, it is not offered either.
|
||||
it("offers no Show more once the next page was refused for good", async () => {
|
||||
vi.spyOn(api, "related")
|
||||
.mockResolvedValueOnce(page([row("A")], "CUR1"))
|
||||
.mockRejectedValueOnce(
|
||||
new HttpError(429, "Limit", { code: "refused", reason: "related_daily_limit", limit: 3 }),
|
||||
);
|
||||
setup();
|
||||
await title("Video A");
|
||||
fireEvent.click(screen.getByRole("button", { name: "player.related.more" }));
|
||||
expect((await screen.findByRole("alert")).textContent).toContain("Limit");
|
||||
expect(screen.queryByRole("button", { name: "player.related.more" })).toBeNull();
|
||||
expect(screen.queryByRole("button", { name: "common.retry" })).toBeNull();
|
||||
expect(titles()).toEqual(["Video A"]);
|
||||
});
|
||||
|
||||
it("names the followed mark on hover with hints turned off too", async () => {
|
||||
setHintsEnabled(false);
|
||||
try {
|
||||
vi.spyOn(api, "related").mockResolvedValue(page([row("A", { followed: true })]));
|
||||
setup();
|
||||
await title("Video A");
|
||||
const mark = screen.getByRole("img", { name: "player.related.followed" });
|
||||
fireEvent.mouseEnter(mark.parentElement!);
|
||||
fireEvent.pointerEnter(mark.parentElement!, { pointerType: "mouse" });
|
||||
expect(await screen.findByText("player.related.followed")).toBeTruthy();
|
||||
} catch (e) {
|
||||
setHintsEnabled(true);
|
||||
throw e;
|
||||
}
|
||||
setHintsEnabled(true);
|
||||
});
|
||||
|
||||
it("says when nothing is left that the user has not seen", async () => {
|
||||
vi.spyOn(api, "related").mockResolvedValue(page([]));
|
||||
setup();
|
||||
|
||||
Reference in New Issue
Block a user