TheSunIsLeaking/recflare
3
0
Fork 0
mirror of https://github.com/djdevin/recflare.git synced 2026-10-25 23:18:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

[clubs] revert this call

Browse Source
This commit is contained in:
Devin Zuczek
2026-10-13 12:23:44 -04:00
parent 6d4156bd67
commit 33d235f8ad
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/clubs/src/clubs.app.ts
+7 -7
View File
@@ -214,9 +214,9 @@ const app = new Hono<App>()
.notFound(withNotFound())
// The player's home club — the one whose clubhouse they spawn into, stored on their
// account. Auth-gated. A literal JSON `null` (200) when they have no home club, the
// club is gone, or it has no clubhouse room — not a 404, and not an empty object.
// Returns the bare club (not the envelope), as the reference does.
// account. Auth-gated. 404 when they have no home club, the club is gone, or it has
// no clubhouse room: the client expects a 404 for "no home club" and errors on an
// empty object. Returns the bare club (not the envelope), as the reference does.
.get(
'/club/home/me',
describeRoute({
@@ -224,9 +224,9 @@ const app = new Hono<App>()
summary: 'The player’s home club',
description: [
'The club whose clubhouse the player spawns into (a field on their account row).',
'A literal JSON `null` when they have no home club, the club is gone, or it has no',
'clubhouse room — not a 404, and not an empty object. Returns the bare club, not',
'the envelope, as the reference does.',
'404 when they have no home club, the club is gone, or it has no clubhouse room —',
'the client expects a 404 for “no home club” and errors on an empty object. Returns',
'the bare club, not the envelope, as the reference does.',
].join(' '),
security: AUTHED,
responses: {
@@ -239,7 +239,7 @@ const app = new Hono<App>()
const id = await authedId(c)
if (id === null) return c.body(null, 401)
const club = await getHomeClub(c.env.DB, id)
return c.json(club)
return club === null ? c.notFound() : c.json(club)
}
)
apps/clubs/src/test/integration/api.test.ts
+11 -14
View File
@@ -78,11 +78,10 @@ describe('clubs endpoints', () => {
expect(res.status).toBe(401)
})
test('GET /club/home/me answers a literal null when the player has no home club', async () => {
// Not a 404, and not an empty object.
test('GET /club/home/me 404s when the player has no home club', async () => {
// The client expects a 404 here, and errors on an empty object.
const res = await exports.default.fetch(`${ORIGIN}/club/home/me`, { headers: await bearer() })
expect(res.status).toBe(200)
expect(await res.text()).toBe('null')
expect(res.status).toBe(404)
})
test('GET /subscription/details/:subscription returns an empty object', async () => {
@@ -778,12 +777,11 @@ describe('clubs endpoints', () => {
})
const clubId = ((await create.json()) as { value: { ClubId: number } }).value.ClubId
// No home club yet → null.
// No home club yet → 404.
const before = await exports.default.fetch(`${ORIGIN}/club/home/me`, {
headers: await bearer('9100'),
})
expect(before.status).toBe(200)
expect(await before.json()).toBeNull()
expect(before.status).toBe(404)
// You must be a member of the club you're making your home.
expect((await form('/club/home/me', 'PUT', `clubId=${clubId}`, '9101')).status).toBe(403)
@@ -795,11 +793,11 @@ describe('clubs endpoints', () => {
expect(set.status).toBe(200)
expect(await set.json()).toMatchObject({ error: '', success: true })
// The club has no clubhouse room yet, so there's still nowhere to spawn → null.
// The club has no clubhouse room yet, so there's still nowhere to spawn → 404.
const noClubhouse = await exports.default.fetch(`${ORIGIN}/club/home/me`, {
headers: await bearer('9100'),
})
expect(await noClubhouse.json()).toBeNull()
expect(noClubhouse.status).toBe(404)
// Give it a clubhouse → the home club now resolves.
const clubhouse = await form(`/club/${clubId}/clubhouse`, 'PUT', 'roomId=77', '9100')
@@ -827,7 +825,7 @@ describe('clubs endpoints', () => {
const cleared = await exports.default.fetch(`${ORIGIN}/club/home/me`, {
headers: await bearer('9100'),
})
expect(await cleared.json()).toBeNull()
expect(cleared.status).toBe(404)
// DELETE clears it too, ignoring any body it's sent.
await form(`/club/${clubId}/clubhouse`, 'PUT', 'roomId=88', '9100')
@@ -848,10 +846,9 @@ describe('clubs endpoints', () => {
expect(dropped.status).toBe(200)
expect(await dropped.json()).toEqual({ error: '', success: true, value: null })
expect(
await (
await exports.default.fetch(`${ORIGIN}/club/home/me`, { headers: await bearer('9100') })
).json()
).toBeNull()
(await exports.default.fetch(`${ORIGIN}/club/home/me`, { headers: await bearer('9100') }))
.status
).toBe(404)
// Still a member of the club they'd made their home.
const mine = (await (
await exports.default.fetch(`${ORIGIN}/club/mine/member`, { headers: await bearer('9100') })