From 2e61fafe57783f7c4752e1824f23550a21bef3f4 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sun, 22 Jun 2025 15:34:37 -0400 Subject: [PATCH] pass "me" in a few places that lack it --- packages/backend/src/core/entities/ClipEntityService.ts | 2 +- packages/backend/src/server/api/endpoints/app/create.ts | 2 +- .../backend/src/server/api/endpoints/bubble-game/ranking.ts | 2 +- .../src/server/api/endpoints/chat/messages/room-timeline.ts | 2 +- .../backend/src/server/api/endpoints/chat/rooms/delete.ts | 2 +- .../backend/src/server/api/endpoints/notes/bubble-timeline.ts | 2 +- packages/backend/src/server/api/endpoints/notes/unrenote.ts | 4 ++-- .../server/api/endpoints/users/lists/create-from-public.ts | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/backend/src/core/entities/ClipEntityService.ts b/packages/backend/src/core/entities/ClipEntityService.ts index d915645906..b700fe2efb 100644 --- a/packages/backend/src/core/entities/ClipEntityService.ts +++ b/packages/backend/src/core/entities/ClipEntityService.ts @@ -47,7 +47,7 @@ export class ClipEntityService { createdAt: this.idService.parse(clip.id).date.toISOString(), lastClippedAt: clip.lastClippedAt ? clip.lastClippedAt.toISOString() : null, userId: clip.userId, - user: hint?.packedUser ?? this.userEntityService.pack(clip.user ?? clip.userId), + user: hint?.packedUser ?? this.userEntityService.pack(clip.user ?? clip.userId, me), name: clip.name, description: clip.description, isPublic: clip.isPublic, diff --git a/packages/backend/src/server/api/endpoints/app/create.ts b/packages/backend/src/server/api/endpoints/app/create.ts index 6d595289de..7a9db03951 100644 --- a/packages/backend/src/server/api/endpoints/app/create.ts +++ b/packages/backend/src/server/api/endpoints/app/create.ts @@ -70,7 +70,7 @@ export default class extends Endpoint { // eslint- secret: secret, }); - return await this.appEntityService.pack(app, null, { + return await this.appEntityService.pack(app, me, { detail: true, includeSecret: true, }); diff --git a/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts b/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts index 439c228207..1ac3488288 100644 --- a/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts +++ b/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts @@ -64,7 +64,7 @@ export default class extends Endpoint { // eslint- private userEntityService: UserEntityService, ) { - super(meta, paramDef, async (ps) => { + super(meta, paramDef, async (ps, me) => { const records = await this.bubbleGameRecordsRepository.find({ where: { gameMode: ps.gameMode, diff --git a/packages/backend/src/server/api/endpoints/chat/messages/room-timeline.ts b/packages/backend/src/server/api/endpoints/chat/messages/room-timeline.ts index c0e344b889..2bb7e93721 100644 --- a/packages/backend/src/server/api/endpoints/chat/messages/room-timeline.ts +++ b/packages/backend/src/server/api/endpoints/chat/messages/room-timeline.ts @@ -61,7 +61,7 @@ export default class extends Endpoint { // eslint- throw new ApiError(meta.errors.noSuchRoom); } - if (!await this.chatService.hasPermissionToViewRoomTimeline(me.id, room)) { + if (!await this.chatService.hasPermissionToViewRoomTimeline(me, room)) { throw new ApiError(meta.errors.noSuchRoom); } diff --git a/packages/backend/src/server/api/endpoints/chat/rooms/delete.ts b/packages/backend/src/server/api/endpoints/chat/rooms/delete.ts index 1ea81448c1..4ef90c1629 100644 --- a/packages/backend/src/server/api/endpoints/chat/rooms/delete.ts +++ b/packages/backend/src/server/api/endpoints/chat/rooms/delete.ts @@ -46,7 +46,7 @@ export default class extends Endpoint { // eslint- throw new ApiError(meta.errors.noSuchRoom); } - if (!await this.chatService.hasPermissionToDeleteRoom(me.id, room)) { + if (!await this.chatService.hasPermissionToDeleteRoom(me, room)) { throw new ApiError(meta.errors.noSuchRoom); } diff --git a/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts b/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts index cd97a7773b..12c897d9c8 100644 --- a/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts @@ -68,7 +68,7 @@ export default class extends Endpoint { // eslint- private activeUsersChart: ActiveUsersChart, ) { super(meta, paramDef, async (ps, me) => { - const policies = await this.roleService.getUserPolicies(me ? me.id : null); + const policies = await this.roleService.getUserPolicies(me); if (!policies.btlAvailable) { throw new ApiError(meta.errors.btlDisabled); } diff --git a/packages/backend/src/server/api/endpoints/notes/unrenote.ts b/packages/backend/src/server/api/endpoints/notes/unrenote.ts index f2a927f3c5..4a3ca8b656 100644 --- a/packages/backend/src/server/api/endpoints/notes/unrenote.ts +++ b/packages/backend/src/server/api/endpoints/notes/unrenote.ts @@ -69,9 +69,9 @@ export default class extends Endpoint { // eslint- // TODO inline this into the above query for (const note of renotes) { if (ps.quote) { - if (note.text) this.noteDeleteService.delete(await this.usersRepository.findOneByOrFail({ id: me.id }), note, false); + if (note.text) this.noteDeleteService.delete(me, note, false); } else { - if (!note.text) this.noteDeleteService.delete(await this.usersRepository.findOneByOrFail({ id: me.id }), note, false); + if (!note.text) this.noteDeleteService.delete(me, note, false); } } }); diff --git a/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts b/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts index 2be3197d88..94986d22ea 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts @@ -106,7 +106,7 @@ export default class extends Endpoint { // eslint- const currentCount = await this.userListsRepository.countBy({ userId: me.id, }); - if (currentCount >= (await this.roleService.getUserPolicies(me.id)).userListLimit) { + if (currentCount >= (await this.roleService.getUserPolicies(me)).userListLimit) { throw new ApiError(meta.errors.tooManyUserLists); }