v3: the frontend stops trusting what it last saw — a review of src/ turned up counts that fell to zero, stale copies winning over fresh ones, sessions that tabs trampled on each other, and a player queue that outlived its listener, and this closes them. Voting or liking something with no live count yet started from 0, so a dump with five votes read 1 on the click and, with the socket down, 0 for good once the undo fired; the buttons now pass the count they show, which the optimistic update and its undo start from. After a reconnect the chat re-read its history as the truth, but the merge let the live copy of a message win, so an edit made while the socket was down never showed; the resync now replaces live copies with what it fetched. Every dump_updated added the dump to the live list if it wasn't there, so retitling a months-old dump put it at the top of New, Hot and Journal for everyone, while one that had arrived live kept its old title; an edit now refreshes a live entry in place and adds nothing, and the server announces a dump going public as a dump_created, which is the one case that is an arrival. The new-dump modal let a slow preview for the previous link land on the new one, title suggestion included; changing the link now aborts both lookups. Markdown found mentions by rewriting the source text with a rule that, unlike the server's, didn't skip an @ after a word character, so an email address linked its domain, a URL like mastodon.social/@bob was split, and @ in code came out as literal link syntax; mentions are now found by a remark step over text nodes only, by the server's rule. Changing the password in one tab stored fresh tokens that any other open tab wiped the moment its old token drew a 401; the session now lives behind utils/authStorage.ts, tabs follow each other through storage events (so a logout also signs out every tab), a 401 only forgets the stored session if it still holds that token, and in-place session updates go through a new updateSession() rather than re-reading localStorage. The persisted player queue carries media-token URLs yet survived logout for the next person to sign in; it is now stamped with its owner, not restored for anyone else, cleared on logout or account switch (a guest's queue survives signing in), and older unstamped queues holding a file are dropped. Playlist checkboxes in the new-dump and add-to-playlist modals flipped whether or not the server agreed and now wait for it. CommentThread and the Dump page's loads use authFetch like the rest, so a 401 there signs out consistently; isTokenExpired has one home; and the useScrollLock imports carry their extension so deno check passes.
All checks were successful
Build and Publish Docker Image / build-and-push (push) Successful in 42s

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
khannurien
2026-09-24 20:24:38 +00:00
parent 2ad8ae73d5
commit bfce3186f8
24 changed files with 360 additions and 215 deletions

View File

@@ -412,6 +412,8 @@ export async function updateDump(
}
if (updatedDump.isPrivate && !dump.isPrivate) broadcastDumpDeleted(dumpId);
else if (!updatedDump.isPrivate) broadcastDumpUpdated(updatedDump);
// Going public is an arrival for everyone who couldn't see it before.
if (dump.isPrivate && !updatedDump.isPrivate) broadcastNewDump(updatedDump);
if (updatedDump.comment) {
notifyMentions(
dump.userId,
@@ -489,6 +491,8 @@ export async function updateDump(
if (updatedDump.isPrivate && !dump.isPrivate) broadcastDumpDeleted(dumpId);
else if (!updatedDump.isPrivate) broadcastDumpUpdated(updatedDump);
// Going public is an arrival for everyone who couldn't see it before.
if (dump.isPrivate && !updatedDump.isPrivate) broadcastNewDump(updatedDump);
if (updatedDump.comment) {
notifyMentions(
dump.userId,

View File

@@ -37,27 +37,22 @@ export function AddToPlaylistModal(
const toggleMembership = async (membership: PlaylistMembership) => {
const { playlist, hasDump } = membership;
if (hasDump) {
await authFetch(
// The box only changes once the server agrees; a refusal or a dropped
// connection leaves it showing the truth.
try {
const res = await authFetch(
`${API_URL}/api/playlists/${playlist.id}/dumps/${dumpId}`,
{ method: "DELETE" },
);
setMemberships((prev) =>
prev.map((m) =>
m.playlist.id === playlist.id ? { ...m, hasDump: false } : m
)
);
} else {
await authFetch(
`${API_URL}/api/playlists/${playlist.id}/dumps/${dumpId}`,
{ method: "POST" },
);
setMemberships((prev) =>
prev.map((m) =>
m.playlist.id === playlist.id ? { ...m, hasDump: true } : m
)
{ method: hasDump ? "DELETE" : "POST" },
);
if (!res.ok) return;
} catch {
return;
}
setMemberships((prev) =>
prev.map((m) =>
m.playlist.id === playlist.id ? { ...m, hasDump: !hasDump } : m
)
);
};
return (

View File

@@ -3,7 +3,6 @@ import { t } from "@lingui/core/macro";
import { Trans } from "@lingui/react/macro";
import { API_URL, VALIDATION } from "../config/api.ts";
import { useAuth } from "../hooks/useAuth.ts";
import { deserializeAuthResponse } from "../model.ts";
import { Modal } from "./Modal.tsx";
import {
expectOk,
@@ -26,7 +25,7 @@ interface Values {
}
export function ChangePasswordModal({ onClose }: ChangePasswordModalProps) {
const { authFetch, login } = useAuth();
const { authFetch, updateSession } = useAuth();
const [done, setDone] = useState(false);
const form = useApiForm<Values>({
mode: "onChange",
@@ -43,10 +42,7 @@ export function ChangePasswordModal({ onClose }: ChangePasswordModalProps) {
body: JSON.stringify({ currentPassword, newPassword }),
}),
);
const storedRaw = localStorage.getItem("authResponse");
if (storedRaw) {
login({ ...deserializeAuthResponse(JSON.parse(storedRaw)), ...tokens });
}
updateSession(tokens);
setDone(true);
});

View File

@@ -22,6 +22,7 @@ import { Tooltip } from "./Tooltip.tsx";
import { ConfirmModal } from "./ConfirmModal.tsx";
import { useHeightTransition } from "../hooks/useHeightTransition.ts";
import { useWS } from "../hooks/useWS.ts";
import { useAuth } from "../hooks/useAuth.ts";
import {
expectOk,
FormError,
@@ -30,13 +31,6 @@ import {
useApiForm,
} from "./form/index.ts";
function authHeaders(token: string | null, json = true): HeadersInit {
const headers: Record<string, string> = {};
if (json) headers["Content-Type"] = "application/json";
if (token) headers["Authorization"] = `Bearer ${token}`;
return headers;
}
interface CommentFormProps {
/** Async submit; throw to surface a root error, resolve to clear/close. */
onSubmit: (body: string) => Promise<void>;
@@ -208,13 +202,13 @@ function CommentNode({
const editEditorRef = useRef<TextEditorHandle>(null);
const { likeCounts, myLikes, castCommentLike, removeCommentLike } = useWS();
const { authFetch } = useAuth();
const children = tree.get(comment.id) ?? [];
async function handleReply(body: string) {
const res = await fetch(`${API_URL}/api/dumps/${dumpId}/comments`, {
const res = await authFetch(`${API_URL}/api/dumps/${dumpId}/comments`, {
method: "POST",
headers: authHeaders(token),
body: JSON.stringify(
{ body, parentId: comment.id } satisfies CreateCommentRequest,
),
@@ -225,9 +219,8 @@ function CommentNode({
async function handleDelete() {
if (!token) return;
const res = await fetch(`${API_URL}/api/comments/${comment.id}`, {
const res = await authFetch(`${API_URL}/api/comments/${comment.id}`, {
method: "DELETE",
headers: { Authorization: `Bearer ${token}` },
}).catch(() => null);
if (res?.ok) {
onCommentDeleted(comment.id);
@@ -235,9 +228,8 @@ function CommentNode({
}
async function handleEditSave(body: string) {
const res = await fetch(`${API_URL}/api/comments/${comment.id}`, {
const res = await authFetch(`${API_URL}/api/comments/${comment.id}`, {
method: "PATCH",
headers: authHeaders(token),
body: JSON.stringify({ body } satisfies UpdateCommentRequest),
});
onCommentUpdated(deserializeComment(await expectOk<RawComment>(res)));
@@ -452,11 +444,11 @@ export function CommentThread({
}: CommentThreadProps) {
const tree = useMemo(() => buildTree(comments), [comments]);
const roots = tree.get("root") ?? [];
const { authFetch } = useAuth();
async function handleTopLevelSubmit(body: string) {
const res = await fetch(`${API_URL}/api/dumps/${dumpId}/comments`, {
const res = await authFetch(`${API_URL}/api/dumps/${dumpId}/comments`, {
method: "POST",
headers: authHeaders(token),
body: JSON.stringify({ body } satisfies CreateCommentRequest),
});
onCommentCreated(deserializeComment(await expectOk<RawComment>(res)));

View File

@@ -2,7 +2,7 @@ import { useEffect } from "react";
import { createPortal } from "react-dom";
import { t } from "@lingui/core/macro";
import { Trans } from "@lingui/react/macro";
import { useScrollLock } from "../hooks/useScrollLock";
import { useScrollLock } from "../hooks/useScrollLock.ts";
interface ConfirmModalProps {
message: string;

View File

@@ -19,8 +19,8 @@ interface DumpCardProps {
voteCount: number;
voted: boolean;
canVote: boolean;
castVote: (id: string) => void;
removeVote: (id: string) => void;
castVote: (id: string, shownCount?: number) => void;
removeVote: (id: string, shownCount?: number) => void;
className?: string;
isOwner?: boolean;
}

View File

@@ -386,12 +386,19 @@ export function DumpCreateModal(
// same timing for the user, just not in the same tick.
queueMicrotask(() => setUrlFetchState({ status: "loading" }));
// A preview can take seconds (the server fetches the page), so the link
// may have changed by the time one lands: the answer for the old link must
// not show, or suggest its title, under the new one.
const controller = new AbortController();
const { signal } = controller;
debounceRef.current = setTimeout(() => {
const encoded = encodeURIComponent(canonicalUrl);
authFetch(`${API_URL}/api/preview?url=${encoded}`)
authFetch(`${API_URL}/api/preview?url=${encoded}`, { signal })
.then((res) => res.json())
.then((body) => {
if (signal.aborted) return;
const data = body.success
? body.data as UrlPreviewResponse
: undefined;
@@ -402,14 +409,16 @@ export function DumpCreateModal(
});
})
.catch(() => {
if (signal.aborted) return;
setUrlFetchState({ status: "done", reached: false, richContent: null });
});
// Signed in, so that a private dump of the poster's own counts as a
// duplicate for them and for nobody else.
authFetch(`${API_URL}/api/dumps/by-url?url=${encoded}`)
authFetch(`${API_URL}/api/dumps/by-url?url=${encoded}`, { signal })
.then((res) => res.json())
.then((body) => {
if (signal.aborted) return;
setDuplicateState({
url: canonicalUrl,
matches: body.success
@@ -417,13 +426,16 @@ export function DumpCreateModal(
: [],
});
})
.catch(() =>
setDuplicateState({ url: canonicalUrl, matches: [] })
);
.catch(() => {
if (!signal.aborted) {
setDuplicateState({ url: canonicalUrl, matches: [] });
}
});
}, 600);
return () => {
if (debounceRef.current) clearTimeout(debounceRef.current);
controller.abort();
};
}, [canonicalUrl, authFetch]);
@@ -613,27 +625,22 @@ export function DumpCreateModal(
const toggleMembership = async (membership: PlaylistMembership) => {
if (!createdDump) return;
const { playlist, hasDump } = membership;
if (hasDump) {
await authFetch(
// The box only changes once the server agrees; a refusal or a dropped
// connection leaves it showing the truth.
try {
const res = await authFetch(
`${API_URL}/api/playlists/${playlist.id}/dumps/${createdDump.id}`,
{ method: "DELETE" },
);
setMemberships((prev) =>
prev.map((m) =>
m.playlist.id === playlist.id ? { ...m, hasDump: false } : m
)
);
} else {
await authFetch(
`${API_URL}/api/playlists/${playlist.id}/dumps/${createdDump.id}`,
{ method: "POST" },
);
setMemberships((prev) =>
prev.map((m) =>
m.playlist.id === playlist.id ? { ...m, hasDump: true } : m
)
{ method: hasDump ? "DELETE" : "POST" },
);
if (!res.ok) return;
} catch {
return;
}
setMemberships((prev) =>
prev.map((m) =>
m.playlist.id === playlist.id ? { ...m, hasDump: !hasDump } : m
)
);
};
const canProceed = !!file || !!canonicalUrl;

View File

@@ -24,8 +24,8 @@ interface JournalCardProps {
voteCount: number;
voted: boolean;
canVote: boolean;
castVote: (id: string) => void;
removeVote: (id: string) => void;
castVote: (id: string, shownCount?: number) => void;
removeVote: (id: string, shownCount?: number) => void;
isOwner?: boolean;
}

View File

@@ -8,8 +8,8 @@ interface LikeButtonProps {
count: number;
liked: boolean;
disabled?: boolean;
onLike: (commentId: string) => void;
onUnlike: (commentId: string) => void;
onLike: (commentId: string, shownCount?: number) => void;
onUnlike: (commentId: string, shownCount?: number) => void;
}
export function LikeButton(
@@ -25,7 +25,8 @@ export function LikeButton(
className={`comment-action-btn${
liked ? " comment-action-btn--liked" : ""
}`}
onClick={() => liked ? onUnlike(commentId) : onLike(commentId)}
onClick={() =>
liked ? onUnlike(commentId, count) : onLike(commentId, count)}
disabled={disabled}
aria-label={liked ? t`Remove like` : t`Like`}
title={disabled ? t`Log in to like` : undefined}

View File

@@ -1,4 +1,3 @@
import { useMemo } from "react";
import { Link } from "react-router";
import ReactMarkdown from "react-markdown";
import remarkGfm from "remark-gfm";
@@ -9,13 +8,57 @@ interface MarkdownProps {
inline?: boolean;
}
const REMARK_PLUGINS = [remarkGfm];
// The mention rule the server notifies by (see utils/chatText.ts): an `@` not
// preceded by a word character, so an email address isn't a mention.
const MENTION_RE = /(?<!\w)@(\w+)/g;
// Convert bare @username (not already inside a markdown link) to clickable links
function preprocessMentions(text: string): string {
return text.replace(/(?<![[(])@([\w]+)/g, "[@$1](/users/$1)");
interface MdNode {
type: string;
value?: string;
url?: string;
children?: MdNode[];
}
/**
* Turns bare @username into a link to that user. Works on the parsed tree
* rather than the source text, so code keeps its @s verbatim and a URL that
* contains one (`https://mastodon.social/@bob`) isn't split in two.
*/
function remarkMentions() {
const walk = (node: MdNode) => {
if (!node.children) return;
// Link text is already a link, whatever it says.
if (node.type === "link" || node.type === "linkReference") return;
node.children = node.children.flatMap((child) => {
if (child.type !== "text" || !child.value?.includes("@")) {
walk(child);
return [child];
}
const out: MdNode[] = [];
let last = 0;
for (const m of child.value.matchAll(MENTION_RE)) {
if (m.index > last) {
out.push({ type: "text", value: child.value.slice(last, m.index) });
}
out.push({
type: "link",
url: `/users/${m[1]}`,
children: [{ type: "text", value: m[0] }],
});
last = m.index + m[0].length;
}
if (last === 0) return [child];
if (last < child.value.length) {
out.push({ type: "text", value: child.value.slice(last) });
}
return out;
});
};
return (tree: MdNode) => walk(tree);
}
const REMARK_PLUGINS = [remarkGfm, remarkMentions];
type Components = React.ComponentProps<typeof ReactMarkdown>["components"];
// Static components objects — defined once at module scope to avoid recreation on every render
@@ -43,8 +86,6 @@ const INLINE_MARKDOWN_COMPONENTS: Components = {
export function Markdown(
{ children, className, inline = false }: MarkdownProps,
) {
const processed = useMemo(() => preprocessMentions(children), [children]);
return (
<div
className={`md${className ? ` ${className}` : ""}${
@@ -57,7 +98,7 @@ export function Markdown(
? INLINE_MARKDOWN_COMPONENTS
: MARKDOWN_COMPONENTS}
>
{processed}
{children}
</ReactMarkdown>
</div>
);

View File

@@ -1,7 +1,7 @@
import { type ReactNode, useCallback, useEffect, useRef } from "react";
import { createPortal } from "react-dom";
import { t } from "@lingui/core/macro";
import { useScrollLock } from "../hooks/useScrollLock";
import { useScrollLock } from "../hooks/useScrollLock.ts";
interface ModalProps {
title: string;

View File

@@ -8,8 +8,8 @@ interface VoteButtonProps {
count: number;
voted: boolean;
disabled?: boolean;
onCast: (dumpId: string) => void;
onRemove: (dumpId: string) => void;
onCast: (dumpId: string, shownCount?: number) => void;
onRemove: (dumpId: string, shownCount?: number) => void;
}
export function VoteButton(
@@ -23,7 +23,7 @@ export function VoteButton(
<button
type="button"
className={`vote-btn${voted ? " vote-btn--active" : ""}`}
onClick={() => voted ? onRemove(dumpId) : onCast(dumpId)}
onClick={() => voted ? onRemove(dumpId, count) : onCast(dumpId, count)}
disabled={disabled}
aria-label={voted ? t`Remove vote` : t`Upvote`}
title={disabled ? t`Log in to vote` : undefined}

View File

@@ -1,10 +1,10 @@
import { createContext } from "react";
import { createContext, type Dispatch, type SetStateAction } from "react";
import { type AuthResponse } from "../model.ts";
export interface AuthContextValue {
authResponse: AuthResponse | null;
setAuthResponse: (authResponse: AuthResponse | null) => void;
setAuthResponse: Dispatch<SetStateAction<AuthResponse | null>>;
}
export const AuthContext = createContext<AuthContextValue>({

View File

@@ -2,48 +2,31 @@ import { type ReactNode, useEffect, useState } from "react";
import { AuthContext, type AuthContextValue } from "./AuthContext.ts";
import {
type AuthResponse,
deserializeAuthResponse,
deserializePublicUser,
} from "../model.ts";
import { type AuthResponse, deserializePublicUser } from "../model.ts";
import { API_URL } from "../config/api.ts";
function isTokenExpired(token: string): boolean {
try {
const payload = JSON.parse(atob(token.split(".")[1]));
return typeof payload.exp === "number" && payload.exp * 1000 < Date.now();
} catch {
return true;
}
}
import {
AUTH_STORAGE_KEY,
forgetStoredSession,
readStoredSession,
storeSession,
} from "../utils/authStorage.ts";
export function AuthProvider({ children }: { children: ReactNode }) {
const [authResponse, setAuthResponse] = useState<AuthResponse | null>(() => {
const stored = localStorage.getItem("authResponse");
if (!stored) return null;
const [authResponse, setAuthResponse] = useState<AuthResponse | null>(
readStoredSession,
);
let parsed;
try {
parsed = deserializeAuthResponse(JSON.parse(stored));
} catch {
localStorage.removeItem("authResponse");
return null;
}
if (isTokenExpired(parsed.token)) {
localStorage.removeItem("authResponse");
return null;
}
// Sessions persisted before roles existed have no `role`; the server also
// rejects their tokens, but discard them here so the UI never renders with
// a roleless user.
if (!parsed.user.role) {
localStorage.removeItem("authResponse");
return null;
}
return parsed;
});
// Every tab shares the stored session, so follow it: a login, logout or
// password change in another tab applies here too, rather than this tab
// carrying on with a token the server has since revoked.
useEffect(() => {
const onStorage = (e: StorageEvent) => {
if (e.key !== AUTH_STORAGE_KEY && e.key !== null) return;
setAuthResponse(readStoredSession());
};
globalThis.addEventListener("storage", onStorage);
return () => globalThis.removeEventListener("storage", onStorage);
}, []);
// The `exp` pre-check above only catches expiry; it cannot detect a token the
// server rejects for another reason (e.g. a changed GERBEUR_JWT_SECRET, which
@@ -62,8 +45,10 @@ export function AuthProvider({ children }: { children: ReactNode }) {
cache: "no-store",
});
if (res.status === 401) {
localStorage.removeItem("authResponse");
setAuthResponse(null);
// Only this token is dead; the session may have moved on to a
// fresh one (another tab's password change) while we asked.
forgetStoredSession(token);
setAuthResponse((prev) => prev?.token === token ? null : prev);
return;
}
// The stored user is a snapshot from login time; the role (and other
@@ -77,7 +62,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {
setAuthResponse((prev) => {
if (!prev || prev.user.role === freshUser.role) return prev;
const updated = { ...prev, user: freshUser };
localStorage.setItem("authResponse", JSON.stringify(updated));
storeSession(updated);
return updated;
});
}
@@ -116,7 +101,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {
setAuthResponse((prev) => {
if (!prev || prev.token !== token) return prev;
const updated = { ...prev, mediaToken };
localStorage.setItem("authResponse", JSON.stringify(updated));
storeSession(updated);
return updated;
});
})

View File

@@ -5,6 +5,7 @@ import {
playerItemKey,
} from "./PlayerContext.ts";
import { isStreamStale, resolveStreamQueue } from "../utils/streamSources.ts";
import { useAuth } from "../hooks/useAuth.ts";
const STORAGE_KEY = "player";
@@ -20,6 +21,11 @@ interface StoredSession {
queue: PlayerItem[];
index: number;
time: number;
/**
* Whose queue this is (null for a guest). File URLs carry the listener's
* media token, so a queue must never be handed to whoever signs in next.
*/
owner?: string | null;
}
function isPlayerItem(value: unknown): value is PlayerItem {
@@ -28,13 +34,25 @@ function isPlayerItem(value: unknown): value is PlayerItem {
return kind === "embed" || kind === "file" || kind === "stream";
}
function readSession(): { queue: PlayerItem[]; index: number; time: number } | null {
function readSession(
owner: string | null,
): { queue: PlayerItem[]; index: number; time: number } | null {
try {
const raw = localStorage.getItem(STORAGE_KEY);
if (!raw) return null;
const parsed = JSON.parse(raw) as Record<string, unknown>;
const time = Number(parsed.time) || 0;
// Another account's queue, or one saved before queues had owners: the
// latter may be anybody's, and only file URLs hold a token worth keeping
// to themselves.
if (parsed.owner === undefined) {
const items = Array.isArray(parsed.queue) ? parsed.queue : [parsed.item];
if (items.some((i) => isPlayerItem(i) && i.kind === "file")) return null;
} else if (parsed.owner !== owner) {
return null;
}
const rawQueue = parsed.queue;
if (Array.isArray(rawQueue)) {
const queue = rawQueue.filter(isPlayerItem);
@@ -60,8 +78,10 @@ function readSession(): { queue: PlayerItem[]; index: number; time: number } | n
const RERESOLVE_COOLDOWN_MS = 30_000;
export function PlayerProvider({ children }: { children: React.ReactNode }) {
const { user } = useAuth();
const owner = user?.id ?? null;
// Lazy initialiser: readSession runs exactly once, on first render.
const [restored] = useState(readSession);
const [restored] = useState(() => readSession(owner));
const [queue, setQueue] = useState<PlayerItem[]>(restored?.queue ?? []);
const [queueIndex, setQueueIndex] = useState(restored?.index ?? 0);
@@ -323,7 +343,13 @@ export function PlayerProvider({ children }: { children: React.ReactNode }) {
localStorage.setItem(
STORAGE_KEY,
JSON.stringify(
{ v: 2, queue, index: queueIndex, time: currentTime } satisfies StoredSession,
{
v: 2,
queue,
index: queueIndex,
time: currentTime,
owner,
} satisfies StoredSession,
),
);
} else {
@@ -331,12 +357,23 @@ export function PlayerProvider({ children }: { children: React.ReactNode }) {
}
// currentTime intentionally omitted from deps — see pagehide writer below.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [queue, queueIndex]);
}, [queue, queueIndex, owner]);
// Signing out, or in as someone else, ends the listening session: the queue
// was built with the previous account's media token. Signing in keeps a
// guest's queue, which holds no token.
const [queueOwner, setQueueOwner] = useState(owner);
useEffect(() => {
if (owner === queueOwner) return;
// eslint-disable-next-line react-hooks/set-state-in-effect
setQueueOwner(owner);
if (queueOwner !== null) stop();
}, [owner, queueOwner, stop]);
const sessionRef = useRef<StoredSession | null>(null);
useEffect(() => {
sessionRef.current = queue.length > 0
? { v: 2, queue, index: queueIndex, time: currentTime }
? { v: 2, queue, index: queueIndex, time: currentTime, owner }
: null;
});

View File

@@ -101,10 +101,11 @@ export interface WSContextValue {
typingUsers: OnlineUser[];
/** Increments on each WS reconnect so pages can backfill missed events. */
connectionEpoch: number;
castVote: (dumpId: string) => void;
removeVote: (dumpId: string) => void;
castCommentLike: (commentId: string) => void;
removeCommentLike: (commentId: string) => void;
/** `shownCount`: the count on screen, used until a live one arrives. */
castVote: (dumpId: string, shownCount?: number) => void;
removeVote: (dumpId: string, shownCount?: number) => void;
castCommentLike: (commentId: string, shownCount?: number) => void;
removeCommentLike: (commentId: string, shownCount?: number) => void;
injectDump: (dump: Dump) => void;
clearUnreadNotifications: () => void;
sendChatMessage: (body: string, replyTo?: ChatReplyTarget) => void;

View File

@@ -450,9 +450,20 @@ export function WSProvider({ children }: WSProviderProps) {
}
case "dump_created": {
// Also sent when a dump goes from private to public: to everyone
// who couldn't see it, that's an arrival.
const dump = deserializeDump(msg.dump);
setDeletedDumpIds((prev) => {
if (!prev.has(dump.id)) return prev;
const next = new Set(prev);
next.delete(dump.id);
return next;
});
setRecentDumps((prev) =>
[dump, ...prev].slice(0, MAX_RECENT_DUMPS)
[dump, ...prev.filter((d) => d.id !== dump.id)].slice(
0,
MAX_RECENT_DUMPS,
)
);
break;
}
@@ -460,19 +471,13 @@ export function WSProvider({ children }: WSProviderProps) {
case "dump_updated": {
const dump = deserializeDump(msg.dump);
setLastDumpEvent(dump);
// Un-delete if this dump was previously removed from the feed
// (e.g. it was made private, and is now public again).
setDeletedDumpIds((prev) => {
if (!prev.has(dump.id)) return prev;
const next = new Set(prev);
next.delete(dump.id);
return next;
});
// Add to live feed if not already present (private→public).
// An edit is not an arrival: refresh a live entry in place, but
// don't pull an old dump to the top of the feeds (going public
// comes as a `dump_created`).
setRecentDumps((prev) =>
prev.some((d) => d.id === dump.id)
? prev
: [dump, ...prev].slice(0, MAX_RECENT_DUMPS)
? prev.map((d) => d.id === dump.id ? dump : d)
: prev
);
break;
}
@@ -745,9 +750,10 @@ export function WSProvider({ children }: WSProviderProps) {
token,
]);
const castVote = useCallback((dumpId: string) => {
// Optimistic update
const prevCount = voteCountsRef.current[dumpId] ?? 0;
const castVote = useCallback((dumpId: string, shownCount?: number) => {
// Optimistic update. Until a live event arrives there's no count here, only
// the one the caller got over REST and is showing.
const prevCount = voteCountsRef.current[dumpId] ?? shownCount ?? 0;
const prevVoted = myVotesRef.current.has(dumpId);
if (prevVoted) return; // already voted
@@ -778,9 +784,10 @@ export function WSProvider({ children }: WSProviderProps) {
// If socket is not OPEN, the revert timer will handle cleanup after ACK_TIMEOUT
}, [schedulePendingVote]);
const removeVote = useCallback((dumpId: string) => {
// Optimistic update
const prevCount = voteCountsRef.current[dumpId] ?? 0;
const removeVote = useCallback((dumpId: string, shownCount?: number) => {
// Optimistic update. Until a live event arrives there's no count here, only
// the one the caller got over REST and is showing.
const prevCount = voteCountsRef.current[dumpId] ?? shownCount ?? 0;
const prevVoted = myVotesRef.current.has(dumpId);
if (!prevVoted) return; // not voted
@@ -814,9 +821,10 @@ export function WSProvider({ children }: WSProviderProps) {
// If socket is not OPEN, the revert timer will handle cleanup after ACK_TIMEOUT
}, [schedulePendingVote]);
const castCommentLike = useCallback((commentId: string) => {
// Optimistic update
const prevCount = likeCountsRef.current[commentId] ?? 0;
const castCommentLike = useCallback((commentId: string, shownCount?: number) => {
// Optimistic update. Until a live event arrives there's no count here, only
// the one the caller got over REST and is showing.
const prevCount = likeCountsRef.current[commentId] ?? shownCount ?? 0;
const prevLiked = myLikesRef.current.has(commentId);
if (prevLiked) return; // already liked
@@ -847,9 +855,10 @@ export function WSProvider({ children }: WSProviderProps) {
// If socket is not OPEN, the revert timer will handle cleanup after ACK_TIMEOUT
}, [schedulePendingLike]);
const removeCommentLike = useCallback((commentId: string) => {
// Optimistic update
const prevCount = likeCountsRef.current[commentId] ?? 0;
const removeCommentLike = useCallback((commentId: string, shownCount?: number) => {
// Optimistic update. Until a live event arrives there's no count here, only
// the one the caller got over REST and is showing.
const prevCount = likeCountsRef.current[commentId] ?? shownCount ?? 0;
const prevLiked = myLikesRef.current.has(commentId);
if (!prevLiked) return; // not liked
@@ -1038,11 +1047,16 @@ export function WSProvider({ children }: WSProviderProps) {
const reconcileChat = useCallback(
(messages: ChatMessage[], from: Date, to: Date) => {
const ids = new Set(messages.map((m) => m.id));
// In that stretch the fetched copy is the truth: a live copy of a
// message edited while the socket was down is stale, and the merge in
// the chatbox would let it win.
const byId = new Map(messages.map((m) => [m.id, m]));
setChatMessages((prev) =>
prev.filter((m) =>
ids.has(m.id) || m.createdAt < from || m.createdAt > to
)
prev
.filter((m) =>
byId.has(m.id) || m.createdAt < from || m.createdAt > to
)
.map((m) => byId.get(m.id) ?? m)
);
// Failed sends that did land (only the echo was lost) are retired.
const mine = messages.filter((m) => m.userId === userIdRef.current);

View File

@@ -3,27 +3,37 @@ import { useCallback, useContext } from "react";
import { AuthContext } from "../contexts/AuthContext.ts";
import { type AuthResponse } from "../model.ts";
function isTokenExpired(token: string): boolean {
try {
const payload = JSON.parse(atob(token.split(".")[1]));
return typeof payload.exp === "number" && payload.exp * 1000 < Date.now();
} catch {
return true;
}
}
import {
forgetStoredSession,
isTokenExpired,
storeSession,
} from "../utils/authStorage.ts";
export const useAuth = () => {
const { authResponse, setAuthResponse } = useContext(AuthContext);
const login = useCallback((response: AuthResponse) => {
setAuthResponse(response);
localStorage.setItem("authResponse", JSON.stringify(response));
storeSession(response);
}, [setAuthResponse]);
// Ends the session this render holds. A 401 can land after the session has
// moved on to fresh tokens (a password change, here or in another tab), and
// must not sign those out.
const sessionToken = authResponse?.token;
const logout = useCallback(() => {
setAuthResponse(null);
localStorage.removeItem("authResponse");
setAuthResponse((prev) => prev?.token === sessionToken ? null : prev);
forgetStoredSession(sessionToken);
}, [setAuthResponse, sessionToken]);
/** Merge into the current session, in memory and in storage. */
const updateSession = useCallback((patch: Partial<AuthResponse>) => {
setAuthResponse((prev) => {
if (!prev) return prev;
const next = { ...prev, ...patch };
storeSession(next);
return next;
});
}, [setAuthResponse]);
const authFetch = useCallback(async (
@@ -122,19 +132,37 @@ export const useAuth = () => {
mediaToken: authResponse?.mediaToken ?? authResponse?.token ?? null,
login,
logout,
updateSession,
authFetch,
authUpload,
};
};
export const useRequiredAuth = () => {
const { user, token, mediaToken, login, logout, authFetch, authUpload } =
useAuth();
const {
user,
token,
mediaToken,
login,
logout,
updateSession,
authFetch,
authUpload,
} = useAuth();
if (!user) {
throw new Error(
"Invariant: useRequiredAuth called outside a protected route",
);
}
return { user, token, mediaToken, login, logout, authFetch, authUpload };
return {
user,
token,
mediaToken,
login,
logout,
updateSession,
authFetch,
authUpload,
};
};

View File

@@ -16,7 +16,7 @@ export function useScrollLock() {
useEffect(() => {
const root = document.documentElement;
if (locks++ === 0) {
if (window.innerWidth > root.clientWidth) {
if (globalThis.innerWidth > root.clientWidth) {
root.style.scrollbarGutter = "stable";
}
root.style.overflowY = "hidden";

View File

@@ -111,10 +111,9 @@ export function Dump() {
setDumpState({ status: "loading" });
setOp(null);
try {
const res = await fetch(`${API_URL}/api/dumps/${selectedDump}`, {
const res = await authFetch(`${API_URL}/api/dumps/${selectedDump}`, {
cache: "no-store",
signal: controller.signal,
headers: token ? { Authorization: `Bearer ${token}` } : {},
});
const apiResponse = parseAPIResponse<RawDump>(await res.json());
if (!apiResponse.success) {
@@ -135,7 +134,7 @@ export function Dump() {
}
})();
return () => controller.abort();
}, [selectedDump, preloaded, token]);
}, [selectedDump, preloaded, authFetch]);
useEffect(() => {
if (!lastDumpEvent) return;
@@ -154,9 +153,8 @@ export function Dump() {
useEffect(() => {
if (!selectedDump) return;
const controller = new AbortController();
fetch(`${API_URL}/api/dumps/${selectedDump}/comments`, {
authFetch(`${API_URL}/api/dumps/${selectedDump}/comments`, {
signal: controller.signal,
headers: token ? { Authorization: `Bearer ${token}` } : {},
})
.then((r) => r.json())
.then((body) => {
@@ -168,15 +166,14 @@ export function Dump() {
return () => controller.abort();
// connectionEpoch: re-fetch on reconnect to backfill comments missed while
// the socket was down.
}, [selectedDump, token, connectionEpoch]);
}, [selectedDump, authFetch, connectionEpoch]);
// Fetch related dumps (backlinks) when dump loads
useEffect(() => {
if (!selectedDump) return;
const controller = new AbortController();
fetch(`${API_URL}/api/dumps/${selectedDump}/related`, {
authFetch(`${API_URL}/api/dumps/${selectedDump}/related`, {
signal: controller.signal,
headers: token ? { Authorization: `Bearer ${token}` } : {},
})
.then((r) => r.json())
.then((body) => {
@@ -186,16 +183,15 @@ export function Dump() {
})
.catch(() => {});
return () => controller.abort();
}, [selectedDump, token]);
}, [selectedDump, authFetch]);
// Fetch the collections this dump appears in (public ones, plus the
// viewer's own private ones — the server does the filtering)
useEffect(() => {
if (!selectedDump) return;
const controller = new AbortController();
fetch(`${API_URL}/api/dumps/${selectedDump}/playlists`, {
authFetch(`${API_URL}/api/dumps/${selectedDump}/playlists`, {
signal: controller.signal,
headers: token ? { Authorization: `Bearer ${token}` } : {},
})
.then((r) => r.json())
.then((body) => {
@@ -208,7 +204,7 @@ export function Dump() {
// lastPlaylistEvent: adding/removing this dump, flipping a collection's
// visibility or deleting it all change the list — playlist events are rare
// enough to just refetch on any of them.
}, [selectedDump, token, lastPlaylistEvent]);
}, [selectedDump, authFetch, lastPlaylistEvent]);
// Scroll to and highlight a comment when navigating to #comment-{id}
useEffect(() => {

View File

@@ -19,7 +19,6 @@ import type {
Role,
} from "../model.ts";
import {
deserializeAuthResponse,
deserializeDump,
deserializeInviteTreeEntry,
deserializePublicUser,
@@ -235,7 +234,7 @@ function buildInviteTree(
export function UserPublicProfile() {
const { username } = useParams();
const navigate = useNavigate();
const { user: me, authFetch, login, logout, token } = useAuth();
const { user: me, authFetch, updateSession, logout, token } = useAuth();
const { style, colorScheme, setStyle, setColorScheme } = useTheme();
const [soundsEnabled, setSoundsEnabled] = useSoundsEnabled();
const [defaultFeedTab, setDefaultFeedTab] = useDefaultFeedTab();
@@ -734,13 +733,7 @@ export function UserPublicProfile() {
return;
}
const storedRaw = localStorage.getItem("authResponse");
if (storedRaw) {
login({
...deserializeAuthResponse(JSON.parse(storedRaw)),
user: deserializePublicUser(body.data),
});
}
updateSession({ user: deserializePublicUser(body.data) });
setState((prev) =>
prev.status === "loaded"
@@ -756,11 +749,7 @@ export function UserPublicProfile() {
};
const handleEmailSaved = (email: string) => {
const storedRaw = localStorage.getItem("authResponse");
if (storedRaw) {
const prev = deserializeAuthResponse(JSON.parse(storedRaw));
login({ ...prev, user: { ...prev.user, email } });
}
if (me) updateSession({ user: { ...me, email } });
setEmailEditing(false);
};
@@ -1403,8 +1392,8 @@ function DumpList(
voteCounts: Record<string, number>;
myVotes: Set<string>;
canVote: boolean;
castVote: (id: string) => void;
removeVote: (id: string) => void;
castVote: (id: string, shownCount?: number) => void;
removeVote: (id: string, shownCount?: number) => void;
isOwnProfile?: boolean;
viewAllHref: string;
},
@@ -1482,8 +1471,8 @@ function UpvotedDumpList(
voteCounts: Record<string, number>;
myVotes: Set<string>;
canVote: boolean;
castVote: (id: string) => void;
removeVote: (id: string) => void;
castVote: (id: string, shownCount?: number) => void;
removeVote: (id: string, shownCount?: number) => void;
viewAllHref: string;
},
) {

View File

@@ -38,8 +38,8 @@ interface FollowedFeedProps {
voteCounts: Record<string, number>;
myVotes: Set<string>;
user: User;
castVote: (id: string) => void;
removeVote: (id: string) => void;
castVote: (id: string, shownCount?: number) => void;
removeVote: (id: string, shownCount?: number) => void;
deletedDumpIds: Set<string>;
}
@@ -50,8 +50,8 @@ interface FollowedSubFeedProps {
voteCounts: Record<string, number>;
myVotes: Set<string>;
user: User;
castVote: (id: string) => void;
removeVote: (id: string) => void;
castVote: (id: string, shownCount?: number) => void;
removeVote: (id: string, shownCount?: number) => void;
deletedDumpIds: Set<string>;
emptyMessage: string;
onLoadMore: () => void;

View File

@@ -11,6 +11,6 @@ export interface MainFeedProps {
voteCounts: Record<string, number>;
myVotes: Set<string>;
user: User | null;
castVote: (id: string) => void;
removeVote: (id: string) => void;
castVote: (id: string, shownCount?: number) => void;
removeVote: (id: string, shownCount?: number) => void;
}

59
src/utils/authStorage.ts Normal file
View File

@@ -0,0 +1,59 @@
import { type AuthResponse, deserializeAuthResponse } from "../model.ts";
// The session is shared by every tab through this one localStorage entry.
export const AUTH_STORAGE_KEY = "authResponse";
export function isTokenExpired(token: string): boolean {
try {
const payload = JSON.parse(atob(token.split(".")[1]));
return typeof payload.exp === "number" && payload.exp * 1000 < Date.now();
} catch {
return true;
}
}
/** The stored session, or null — discarding one that can no longer be used. */
export function readStoredSession(): AuthResponse | null {
const stored = localStorage.getItem(AUTH_STORAGE_KEY);
if (!stored) return null;
let parsed;
try {
parsed = deserializeAuthResponse(JSON.parse(stored));
} catch {
localStorage.removeItem(AUTH_STORAGE_KEY);
return null;
}
if (isTokenExpired(parsed.token)) {
localStorage.removeItem(AUTH_STORAGE_KEY);
return null;
}
// Sessions persisted before roles existed have no `role`; the server also
// rejects their tokens, but discard them here so the UI never renders with
// a roleless user.
if (!parsed.user.role) {
localStorage.removeItem(AUTH_STORAGE_KEY);
return null;
}
return parsed;
}
export function storeSession(session: AuthResponse): void {
localStorage.setItem(AUTH_STORAGE_KEY, JSON.stringify(session));
}
/**
* Forget the stored session, but only if it is still the one holding `token`.
* Another tab may already have replaced it — a password change there hands out
* fresh tokens — and a 401 for the old token here must not wipe those.
*/
export function forgetStoredSession(token: string | undefined): void {
const stored = localStorage.getItem(AUTH_STORAGE_KEY);
if (!stored) return;
try {
if (JSON.parse(stored)?.token !== token) return;
} catch {
// Unreadable: nobody can use it.
}
localStorage.removeItem(AUTH_STORAGE_KEY);
}