API: follower lists, blocking, reports, admin; drop Spotify sign-in

- Followers/following lists (paginated), 'follows you', remove a follower
- Blocking severs follows both ways and hides each user from the other
  (profile 404s, search, follows); the blocker sees activity hidden
- Reports for moderation (App Store guideline 1.2)
- First account on a server becomes admin; admins see the report queue,
  resolve reports, and suspend accounts (signs out, blocks login, hides
  the profile, stops sharing). set-role script to promote/demote
- users.onboardedAt drives first-run onboarding; existing accounts are
  backfilled as already onboarded. Empty PATCH /me no longer 500s
- Remove Spotify account sign-in and polling: Spotify caps new apps at 5
  accounts, so Spotify arrives via its Last.fm/ListenBrainz link or the
  Android reader. App-level catalog search stays for exact links
- Shared: QR code generation and profile-link parsing (verified with jsQR)
- Integration test timeout raised; password hashing is slow by design

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MzFywujuH9TiuXbr9vjoX8
This commit is contained in:
2026-10-05 19:16:40 -04:00
co-authored by Claude Opus 5.5
parent 63d618f0e3
commit 586acdbeab
44 changed files with 4559 additions and 220 deletions
+65
View File
@@ -0,0 +1,65 @@
import { describe, expect, it } from 'vitest';
import { applyPollResult } from '../src/services/nowPlaying';
import { bearer, createUser, useTestApp } from './helpers';
const app = useTestApp();
const get = (url: string, token?: string) => app().inject({ url, headers: token ? bearer(token) : {} });
const post = (url: string, token: string, payload: object = {}) => app().inject({ method: 'POST', url, headers: bearer(token), payload });
describe('admin', () => {
it('makes the first account on a server the admin, and only the first', async () => {
const first = await createUser(app(), 'founder');
const second = await createUser(app(), 'second');
expect(first.user.role).toBe('admin');
expect(second.user.role).toBe('user');
});
it('keeps admin endpoints away from regular users', async () => {
await createUser(app(), 'founder');
const user = await createUser(app(), 'regular');
expect((await get('/admin/stats', user.token)).statusCode).toBe(403);
expect((await get('/admin/reports', user.token)).statusCode).toBe(403);
expect((await get('/admin/stats')).statusCode).toBe(401);
});
it('shows the report queue and resolves reports', async () => {
const admin = await createUser(app(), 'founder');
const alice = await createUser(app(), 'alice');
await createUser(app(), 'spammer');
await post('/users/spammer/report', alice.token, { reason: 'spam', note: 'links everywhere' });
const queue = (await get('/admin/reports', admin.token)).json();
expect(queue).toHaveLength(1);
expect(queue[0]).toMatchObject({ reason: 'spam', note: 'links everywhere', reporter: { username: 'alice' }, reported: { username: 'spammer', suspended: false } });
expect((await get('/admin/stats', admin.token)).json()).toMatchObject({ users: 3, openReports: 1 });
await post(`/admin/reports/${queue[0].id}/resolve`, admin.token);
expect((await get('/admin/reports', admin.token)).json()).toHaveLength(0);
expect((await get('/admin/reports?status=resolved', admin.token)).json()).toHaveLength(1);
});
it('suspension signs the user out, blocks login, hides them, and stops sharing', async () => {
const admin = await createUser(app(), 'founder');
const bad = await createUser(app(), 'troll');
const viewer = await createUser(app(), 'viewer');
await applyPollResult(bad.user.id, 'spotify', { track: { title: 'Loud', artist: 'X' }, isPlaying: true, progressMs: 0 });
expect((await post('/admin/users/troll/suspend', admin.token)).statusCode).toBe(200);
expect((await get('/me', bad.token)).statusCode).toBe(401);
const login = await app().inject({ method: 'POST', url: '/auth/login', payload: { email: 'troll@example.com', password: 'password123' } });
expect(login.statusCode).toBe(403);
expect((await get('/users/troll', viewer.token)).statusCode).toBe(404);
expect((await get('/users/search?q=tro', viewer.token)).json()).toEqual([]);
// Admins can still look them up.
expect((await get('/users/troll', admin.token)).json().nowPlaying.isPlaying).toBe(false);
await app().inject({ method: 'DELETE', url: '/admin/users/troll/suspend', headers: bearer(admin.token) });
const again = await app().inject({ method: 'POST', url: '/auth/login', payload: { email: 'troll@example.com', password: 'password123' } });
expect(again.statusCode).toBe(200);
});
it("can't suspend yourself or another admin", async () => {
const admin = await createUser(app(), 'founder');
expect((await post('/admin/users/founder/suspend', admin.token)).statusCode).toBe(400);
});
});
+11
View File
@@ -92,3 +92,14 @@ describe('auth', () => {
expect((await app().inject({ url: '/users/bob', headers: bearer(bob.token) })).json().followerCount).toBe(0);
});
});
describe('onboarding flag', () => {
it('new accounts start un-onboarded; finishing sets it once', async () => {
const { token, user } = await createUser(app(), 'newbie');
expect(user.onboardedAt).toBeNull();
const first = (await app().inject({ method: 'PATCH', url: '/me', headers: bearer(token), payload: { onboarded: true } })).json();
expect(first.onboardedAt).toEqual(expect.any(String));
const again = (await app().inject({ method: 'PATCH', url: '/me', headers: bearer(token), payload: { onboarded: true } })).json();
expect(again.onboardedAt).toBe(first.onboardedAt);
});
});
+1 -1
View File
@@ -17,7 +17,7 @@ function assertTestTargets() {
export async function resetState() {
assertTestTargets();
await sql`truncate users, tracks, track_links, sessions, follows, connections, now_playing, featured_songs, listens, devices restart identity cascade`;
await sql`truncate users, tracks, track_links, sessions, follows, connections, now_playing, featured_songs, listens, devices, blocks, reports restart identity cascade`;
await redis.flushdb();
}
-24
View File
@@ -61,27 +61,3 @@ describe('Last.fm sign-in', () => {
expect((await app().inject({ url: '/connections/lastfm/callback?state=forged&token=x' })).statusCode).toBe(400);
});
});
describe('Spotify sign-in during the limited beta', () => {
it('sends users who are not on the allowlist back with a friendly error instead of failing', async () => {
vi.stubGlobal(
'fetch',
routeFetch([
[/accounts\.spotify\.com\/api\/token/, () => json({ access_token: 'a', refresh_token: 'r', expires_in: 3600 })],
[/api\.spotify\.com\/v1\/me$/, () => json({ error: { status: 403, message: 'User not registered in the Developer Dashboard' } }, 403)],
]),
);
const { token } = await createUser(app(), 'alice');
const start = await app().inject({
method: 'POST',
url: '/connections/spotify/authorize',
headers: bearer(token),
payload: { client: 'mobile', returnTo: 'musicshare://settings' },
});
const state = new URL(start.json().url).searchParams.get('state');
const done = await app().inject({ url: `/connections/spotify/callback?state=${state}&code=abc` });
expect(done.statusCode).toBe(302);
expect(done.headers.location).toBe('musicshare://settings?error=spotify_limited');
expect(await db.select().from(schema.connections)).toHaveLength(0);
});
});
+127
View File
@@ -0,0 +1,127 @@
import { describe, expect, it } from 'vitest';
import { db, schema } from '../src/db';
import { applyPollResult } from '../src/services/nowPlaying';
import { bearer, createUser, follow, useTestApp } from './helpers';
const app = useTestApp();
const get = (url: string, token?: string) => app().inject({ url, headers: token ? bearer(token) : {} });
const post = (url: string, token: string, payload: object = {}) => app().inject({ method: 'POST', url, headers: bearer(token), payload });
const del = (url: string, token: string) => app().inject({ method: 'DELETE', url, headers: bearer(token) });
const names = (list: { users: { username: string }[] }) => list.users.map((u) => u.username);
describe('followers and following lists', () => {
it('lists followers and following, newest first, with the viewer’s follow state', async () => {
const alice = await createUser(app(), 'alice');
const bob = await createUser(app(), 'bob');
const carol = await createUser(app(), 'carol');
await follow(app(), bob.token, 'alice');
await follow(app(), carol.token, 'alice');
await follow(app(), alice.token, 'carol');
const followers = (await get('/users/alice/followers', alice.token)).json();
expect(names(followers)).toEqual(['carol', 'bob']);
expect(followers.users.find((u: { username: string }) => u.username === 'carol').isFollowing).toBe(true);
expect(followers.nextCursor).toBeNull();
expect(names((await get('/users/alice/following')).json())).toEqual(['carol']);
});
it('paginates', { timeout: 60_000 }, async () => {
const alice = await createUser(app(), 'alice');
for (let i = 0; i < 55; i++) {
const f = await createUser(app(), `fan${i}`);
await follow(app(), f.token, 'alice');
}
const first = (await get('/users/alice/followers', alice.token)).json();
expect(first.users).toHaveLength(50);
const second = (await get(`/users/alice/followers?cursor=${first.nextCursor}`, alice.token)).json();
expect(second.users).toHaveLength(5);
expect(second.nextCursor).toBeNull();
});
it('shows "follows you" on profiles', async () => {
const alice = await createUser(app(), 'alice');
const bob = await createUser(app(), 'bob');
await follow(app(), bob.token, 'alice');
expect((await get('/users/bob', alice.token)).json().followsYou).toBe(true);
expect((await get('/users/alice', bob.token)).json().followsYou).toBe(false);
});
it('removing a follower takes them off your list', async () => {
const alice = await createUser(app(), 'alice');
const bob = await createUser(app(), 'bob');
await follow(app(), bob.token, 'alice');
expect((await del('/me/followers/bob', alice.token)).statusCode).toBe(200);
expect(names((await get('/users/alice/followers', alice.token)).json())).toEqual([]);
expect((await get('/feed', bob.token)).json()).toEqual([]);
});
});
describe('blocking', () => {
async function blockedPair() {
const alice = await createUser(app(), 'alice');
const bob = await createUser(app(), 'bob');
await follow(app(), alice.token, 'bob');
await follow(app(), bob.token, 'alice');
await applyPollResult(alice.user.id, 'spotify', { track: { title: 'Secret', artist: 'X' }, isPlaying: true, progressMs: 0 });
expect((await post('/users/bob/block', alice.token)).statusCode).toBe(200);
return { alice, bob };
}
it('severs follows in both directions', async () => {
const { alice, bob } = await blockedPair();
expect(await db.select().from(schema.follows)).toHaveLength(0);
expect((await get('/feed', bob.token)).json()).toEqual([]);
expect((await get('/feed', alice.token)).json()).toEqual([]);
});
it('hides the blocker from the blocked person entirely', async () => {
const { bob } = await blockedPair();
expect((await get('/users/alice', bob.token)).statusCode).toBe(404);
expect((await get('/users/alice/followers', bob.token)).statusCode).toBe(404);
expect((await get('/users/search?q=ali', bob.token)).json()).toEqual([]);
expect((await post('/users/alice/follow', bob.token)).statusCode).toBe(404);
});
it('still shows them to everyone else', async () => {
await blockedPair();
const carol = await createUser(app(), 'carol');
expect((await get('/users/alice', carol.token)).json().nowPlaying.track.title).toBe('Secret');
});
it("the blocker sees a profile with activity hidden, and can unblock", async () => {
const { alice, bob } = await blockedPair();
await applyPollResult(bob.user.id, 'spotify', { track: { title: 'Bobs song', artist: 'Y' }, isPlaying: true, progressMs: 0 });
const profile = (await get('/users/bob', alice.token)).json();
expect(profile).toMatchObject({ isBlocked: true, nowPlaying: null, recent: [], featured: null });
expect((await post('/users/bob/follow', alice.token)).statusCode).toBe(400);
expect((await get('/me/blocks', alice.token)).json().map((u: { username: string }) => u.username)).toEqual(['bob']);
await del('/users/bob/block', alice.token);
expect((await get('/users/alice', bob.token)).statusCode).toBe(200);
expect((await post('/users/bob/follow', alice.token)).statusCode).toBe(200);
});
it("can't block yourself", async () => {
const alice = await createUser(app(), 'alice');
expect((await post('/users/alice/block', alice.token)).statusCode).toBe(400);
});
});
describe('reporting', () => {
it('stores a report for moderation', async () => {
const alice = await createUser(app(), 'alice');
await createUser(app(), 'spammer');
const res = await post('/users/spammer/report', alice.token, { reason: 'spam', note: 'posting links' });
expect(res.statusCode).toBe(200);
const [report] = await db.select().from(schema.reports);
expect(report).toMatchObject({ reason: 'spam', note: 'posting links', status: 'open', reporterId: alice.user.id });
});
it('validates the reason and refuses self-reports', async () => {
const alice = await createUser(app(), 'alice');
await createUser(app(), 'bob');
expect((await post('/users/bob/report', alice.token, { reason: 'boring' })).statusCode).toBe(400);
expect((await post('/users/alice/report', alice.token, { reason: 'spam' })).statusCode).toBe(400);
});
});