v4: every page and API URL follows one of two rules, written down in API.md — pages are a hierarchy where @name is a user and any other root word a category or an app page, tabs and views are plain segments and a default view is the bare path; API resources are /api/<plural>/<key>, a user's key being an id or @name, the caller's things under /api/me, media a sub-resource, lookups by another key a query filter. ~ is gone: the feed is /, /hot, /new, /journal, /follow and /music/hot, a profile /@bob with its overview and the tabs dumps, upvoted, playlists (her own only), follow (users, and /follow/playlists), invitees and manage (role and name, for user:manage), which replace the separate UserDumps, UserUpvoted and UserPlaylists pages; /settings holds the account (now with the username) and /manage the category manager, both linked from the user menu and one's profile. Dumps and playlists live under their owner, /@bob/dumps/<slug> and /@bob/playlists/<slug>, named by slug alone: migration 0021 re-slugs them to the bare slugify(title), unique per owner and kind (the oldest keeps it, clashes get -2), renames the categories whose slug v4 reserves (hot, follow, settings…), and rewrites this site's v3 links in dump notes, comments, chat, and playlist and profile descriptions. A slug changes only when edited, through the edit forms' new link field, which proposes slugify(title) as the title changes; a username changes from /settings or, for user:manage, from /@name/manage. Every slug or name left behind stays an alias of its item or user for good (dump_slug_aliases, playlist_slug_aliases, user_aliases), so old links redirect without chaining and nobody else can take one; slugs change 3 times a day per item, names once in 30 days, moderators exempt. An alias, or a name in another case, answers the item with its current path: the pages put it in their URL (useCanonicalPath, without fetching again), and the OG middleware answers a 301. shared/paths.ts builds and parses every page path, for the client's links, the emails' (digest-service lost its own builders and its id fallbacks, and links /follow and /settings) and the server's matchers (OG tags, self previews, backlinks, self-url); shared/slug.ts holds slugify and the format categories share. Dumps and playlists carry ownerUsername and a required slug, and notifications join their users' current names and their items' paths each time they are sent or read, so renames reach them and a deleted item's has no link. The API was renamed per the plan's table: POST /api/users and /api/sessions, /api/password-resets, /api/me (with settings, password, avatar, media-token, playlists?contains=, follow, feed?from=, notifications), /api/users/:key/{dumps,upvoted,playlists,follow/users,follow/playlists,invitees,avatar} and by path /api/users/:key/{dumps,playlists}/:slug, /api/dumps?url= and ?category=, /api/dumps/:id/{file,thumbnail,metadata}, /api/playlists/:id/cover, /api/remote/{preview,image,bandcamp,youtube} (one router), and /api/unsubscribe, the v3 POST /api/users/unsubscribe staying for the digests already sent. A stored default feed tab "followed" reads as "follow" once. dumps.slug and playlists.slug stay nullable, since SQLite can't add NOT NULL without rebuilding tables others reference; every writer sets them and unique (user_id, slug) indexes hold them. 254 backend tests (new: migration 0021 on a v3 fixture, slug aliases, swaps and rate limits, username renames, aliases and limits, reads by path and their privacy, the OG 301s, both unsubscribe paths, v4-shaped digest links with no ids, notification joins, shared paths and slugs) and 668 frontend tests (new: the profile's tabs and follow views, Settings, Manage, the link field, canonical URLs on the dump, playlist and profile pages, bare default feed paths) pass, and tsc, eslint, deno check, deno lint, deno fmt and doc:lint are clean; the migration was also run on a copy of the development database.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -23,7 +23,7 @@ import {
|
||||
userApiToRow,
|
||||
userRowToApi,
|
||||
} from "../model/user.ts";
|
||||
import { db } from "../db/connection.ts";
|
||||
import { db, transaction } from "../db/connection.ts";
|
||||
import { closeUserSockets } from "./ws-service.ts";
|
||||
|
||||
import { hashPassword } from "../lib/password.ts";
|
||||
@@ -32,6 +32,11 @@ import { LIKE, likePattern } from "../lib/like.ts";
|
||||
import { parseRows } from "../model/rows.ts";
|
||||
import { isEmailEnabled, sendEmail } from "./email-service.ts";
|
||||
import { renderWelcomeEmail } from "../mail/welcome.ts";
|
||||
import {
|
||||
RENAME_LIMITS,
|
||||
USERNAME_RE,
|
||||
VALIDATION,
|
||||
} from "../../shared/validation.ts";
|
||||
|
||||
/** Selects full `UserRow`s from `users u`, with the inviter's name joined. */
|
||||
const USER_SELECT =
|
||||
@@ -40,13 +45,34 @@ const USER_SELECT =
|
||||
FROM users u
|
||||
LEFT JOIN users i ON i.id = u.invited_by`;
|
||||
|
||||
/**
|
||||
* Throws a 409 when `username` is, in any case, the name or a former name of
|
||||
* an account other than `exceptUserId`. A former name stays its user's for
|
||||
* good, so that old links and old @mentions can't be taken over.
|
||||
*/
|
||||
function assertUsernameAvailable(
|
||||
username: string,
|
||||
exceptUserId?: string,
|
||||
): void {
|
||||
const row = db.prepare(
|
||||
`SELECT id FROM users WHERE lower(username) = lower(?) AND id != ?
|
||||
UNION ALL
|
||||
SELECT user_id FROM user_aliases
|
||||
WHERE lower(username) = lower(?) AND user_id != ?
|
||||
LIMIT 1;`,
|
||||
).get(username, exceptUserId ?? "", username, exceptUserId ?? "");
|
||||
if (row) {
|
||||
throw new APIException(409, "Username already exists");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a user with the `user` role, invited by `inviterId`, for
|
||||
* `POST /api/users/register`. The caller has validated `request` and claimed
|
||||
* the invite.
|
||||
* `POST /api/users`. The caller has validated `request` and claimed the
|
||||
* invite.
|
||||
*
|
||||
* @throws {APIException} 409 when the username or the email is taken, in any
|
||||
* case.
|
||||
* case, or the username is someone's former name.
|
||||
*/
|
||||
export async function createUser(
|
||||
request: RegisterUserRequest,
|
||||
@@ -55,14 +81,7 @@ export async function createUser(
|
||||
const userId = crypto.randomUUID();
|
||||
const createdAt = new Date();
|
||||
|
||||
const existingUser = db.prepare(
|
||||
"SELECT id FROM users WHERE lower(username) = lower(?);",
|
||||
).get(request.username);
|
||||
|
||||
if (existingUser) {
|
||||
throw new APIException(409, "Username already exists");
|
||||
}
|
||||
|
||||
assertUsernameAvailable(request.username);
|
||||
assertEmailAvailable(request.email);
|
||||
|
||||
const passwordHash = await hashPassword(request.password);
|
||||
@@ -144,14 +163,14 @@ export function getSessionState(
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the user named `username`, with their hash and email. The name
|
||||
* matches case-sensitively.
|
||||
* Returns the user named `username` now, in any case, with their hash and
|
||||
* email. Signing in takes it: a former name doesn't sign in.
|
||||
*
|
||||
* @throws {APIException} 404 when there is no such user.
|
||||
*/
|
||||
export function getUserByUsername(username: string): User {
|
||||
const userRow = db.prepare(
|
||||
`${USER_SELECT} WHERE u.username = ?`,
|
||||
`${USER_SELECT} WHERE lower(u.username) = lower(?)`,
|
||||
).get(username);
|
||||
|
||||
if (!userRow || !isUserRow(userRow)) {
|
||||
@@ -161,6 +180,90 @@ export function getUserByUsername(username: string): User {
|
||||
return userRowToApi(userRow);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the user who is or was named `username`, in any case: a page or an
|
||||
* API path naming a user by a former name reaches them, and the caller sends
|
||||
* the client on to the current one.
|
||||
*
|
||||
* @throws {APIException} 404 when nobody is or was.
|
||||
*/
|
||||
export function resolveUsername(username: string): User {
|
||||
const alias = db.prepare(
|
||||
`SELECT user_id FROM user_aliases WHERE lower(username) = lower(?);`,
|
||||
).get(username) as { user_id: string } | undefined;
|
||||
return alias ? getUserById(alias.user_id) : getUserByUsername(username);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the user an API path's key names: `@name` by their name, current or
|
||||
* former ({@link resolveUsername}), anything else by their id. Every route
|
||||
* under `/api/users/:key` resolves its key with it.
|
||||
*
|
||||
* @throws {APIException} 404 when there is no such user.
|
||||
*/
|
||||
export function resolveUserKey(key: string): User {
|
||||
return key.startsWith("@") ? resolveUsername(key.slice(1)) : getUserById(key);
|
||||
}
|
||||
|
||||
/**
|
||||
* Renames user `userId` to `username`, for `PATCH /api/me` and, by a
|
||||
* moderator, `PATCH /api/users/:key/username`, and returns them renamed. The
|
||||
* old name becomes an alias of theirs for good, so `/@old/…` still reaches
|
||||
* them and nobody else may take it; a change of case alone leaves none, since
|
||||
* names are looked up in any case. Taking back a former name of one's own is
|
||||
* allowed. Their dumps' and playlists' slugs belong to their id, so their
|
||||
* paths follow the new name. Unless `exempt` (a moderator), a user may change
|
||||
* names once in `RENAME_LIMITS.USERNAME`'s window.
|
||||
*
|
||||
* @throws {APIException} 400 when `username` isn't a valid name, 404 when
|
||||
* there is no such user, 409 when the name is or was someone else's, 429 when
|
||||
* the user changed names too recently.
|
||||
*/
|
||||
export function renameUser(
|
||||
userId: string,
|
||||
username: string,
|
||||
exempt: boolean,
|
||||
): User {
|
||||
if (!USERNAME_RE.test(username)) {
|
||||
throw new APIException(
|
||||
400,
|
||||
`Username must be ${VALIDATION.USERNAME_MIN}–${VALIDATION.USERNAME_MAX} characters and contain only letters, numbers, or underscores`,
|
||||
);
|
||||
}
|
||||
const user = getUserById(userId);
|
||||
if (username === user.username) return user;
|
||||
|
||||
const now = new Date();
|
||||
transaction(() => {
|
||||
assertUsernameAvailable(username, userId);
|
||||
if (username.toLowerCase() !== user.username.toLowerCase()) {
|
||||
const { count, windowMs } = RENAME_LIMITS.USERNAME;
|
||||
const recent = (db.prepare(
|
||||
`SELECT COUNT(*) AS n FROM user_aliases WHERE user_id = ? AND created_at > ?;`,
|
||||
).get(userId, new Date(now.getTime() - windowMs).toISOString()) as {
|
||||
n: number;
|
||||
}).n;
|
||||
if (!exempt && recent >= count) {
|
||||
throw new APIException(
|
||||
429,
|
||||
`A username can only be changed once every ${
|
||||
windowMs / 86_400_000
|
||||
} days`,
|
||||
);
|
||||
}
|
||||
db.prepare(
|
||||
`DELETE FROM user_aliases WHERE user_id = ? AND lower(username) = lower(?);`,
|
||||
).run(userId, username);
|
||||
db.prepare(
|
||||
`INSERT INTO user_aliases (username, user_id, created_at) VALUES (?, ?, ?);`,
|
||||
).run(user.username, userId, now.toISOString());
|
||||
}
|
||||
db.prepare(`UPDATE users SET username = ?, updated_at = ? WHERE id = ?;`)
|
||||
.run(username, now.toISOString(), userId);
|
||||
});
|
||||
return getUserById(userId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Throws a 409 when an account other than `exceptUserId` has `email`, in any
|
||||
* case. Password resets are looked up by email, so an address must belong to
|
||||
@@ -201,7 +304,7 @@ export function getUserByEmail(email: string): User | null {
|
||||
|
||||
/**
|
||||
* Returns up to `limit` users whose name starts with `query`, for the editor's
|
||||
* @mention suggestions (`GET /api/users/search`). An empty query returns none.
|
||||
* @mention suggestions (`GET /api/users?q=`). An empty query returns none.
|
||||
*/
|
||||
export function searchUsers(
|
||||
query: string,
|
||||
@@ -237,7 +340,9 @@ export function searchUsersGlobal(query: string, limit: number): PublicUser[] {
|
||||
|
||||
/**
|
||||
* Applies `request` to user `userId` and returns the updated user. It trusts
|
||||
* `request`: the routes pick the fields a caller may change. A new password
|
||||
* `request`: the routes pick the fields a caller may change. The username
|
||||
* changes through {@link renameUser} alone, which keeps the old one as an
|
||||
* alias, so a `username` here is ignored. A new password
|
||||
* also ends every session opened before it and closes the user's sockets, so
|
||||
* the caller must issue fresh tokens if the user is to stay signed in. A
|
||||
* `description` of null keeps the current one.
|
||||
@@ -251,7 +356,8 @@ export async function updateUser(
|
||||
): Promise<User> {
|
||||
const user = getUserById(userId);
|
||||
|
||||
const { password, description, email, ...requestFields } = request;
|
||||
const { password, description, email, username: _, ...requestFields } =
|
||||
request;
|
||||
if (email !== undefined && email !== user.email) {
|
||||
assertEmailAvailable(email, userId);
|
||||
}
|
||||
@@ -271,9 +377,8 @@ export async function updateUser(
|
||||
let userResult;
|
||||
try {
|
||||
userResult = db.prepare(
|
||||
`UPDATE users SET username = ?, password_hash = ?, role = ?, description = ?, email = ?, updated_at = ? WHERE id = ?`,
|
||||
`UPDATE users SET password_hash = ?, role = ?, description = ?, email = ?, updated_at = ? WHERE id = ?`,
|
||||
).run(
|
||||
updatedUserRow.username,
|
||||
updatedUserRow.password_hash,
|
||||
updatedUserRow.role,
|
||||
updatedUserRow.description,
|
||||
@@ -306,7 +411,7 @@ export async function updateUser(
|
||||
|
||||
/**
|
||||
* Records that user `userId` now has an avatar of type `mime`, once
|
||||
* `POST /api/avatars/me` has written the file. It bumps `updated_at`, which
|
||||
* `PUT /api/me/avatar` has written the file. It bumps `updated_at`, which
|
||||
* the client uses to reload the image.
|
||||
*
|
||||
* @throws {APIException} 404 when there is no such user.
|
||||
@@ -324,7 +429,7 @@ export function updateUserAvatar(userId: string, mime: string): void {
|
||||
/**
|
||||
* Returns everyone `userId` invited, and everyone they invited in turn, eleven
|
||||
* levels deep at most, in sign-up order, for the profile page's invite tree
|
||||
* (`GET /api/users/:username/invitees`).
|
||||
* (`GET /api/users/:key/invitees`).
|
||||
*/
|
||||
export function getInviteTree(userId: string): Invitee[] {
|
||||
const rows = db.prepare(`
|
||||
|
||||
Reference in New Issue
Block a user