From 57511f26d9abf75b5a448ca8f6a34853af115120 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Wed, 1 Oct 2025 12:20:01 -0400 Subject: [PATCH] commit missed changes --- packages/backend/src/core/NoteCreateService.ts | 7 +------ packages/backend/src/core/NoteEditService.ts | 7 +------ .../backend/src/server/api/endpoints/admin/captcha/save.ts | 3 ++- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts index a168126a2f..4bcf2b8e08 100644 --- a/packages/backend/src/core/NoteCreateService.ts +++ b/packages/backend/src/core/NoteCreateService.ts @@ -966,12 +966,7 @@ export class NoteCreateService implements OnApplicationShutdown { // eslint-disable-next-line prefer-const let [followings, userListMemberships] = await Promise.all([ this.cacheService.getNonHibernatedFollowers(user.id), - this.userListMembershipsRepository.find({ - where: { - userId: user.id, - }, - select: ['userListId', 'userListUserId', 'withReplies'], - }), + this.cacheService.userListMembershipsCache.fetch(user.id).then(ms => ms.values().toArray()), ]); if (note.visibility === 'followers') { diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts index af9538dc50..e9b404d084 100644 --- a/packages/backend/src/core/NoteEditService.ts +++ b/packages/backend/src/core/NoteEditService.ts @@ -830,12 +830,7 @@ export class NoteEditService implements OnApplicationShutdown { // eslint-disable-next-line prefer-const let [followings, userListMemberships] = await Promise.all([ this.cacheService.getNonHibernatedFollowers(user.id), - this.userListMembershipsRepository.find({ - where: { - userId: user.id, - }, - select: ['userListId', 'userListUserId', 'withReplies'], - }), + this.cacheService.userListMembershipsCache.fetch(user.id).then(ms => ms.values().toArray()), ]); if (note.visibility === 'followers') { diff --git a/packages/backend/src/server/api/endpoints/admin/captcha/save.ts b/packages/backend/src/server/api/endpoints/admin/captcha/save.ts index 98ec278ebe..12b2fdcdf1 100644 --- a/packages/backend/src/server/api/endpoints/admin/captcha/save.ts +++ b/packages/backend/src/server/api/endpoints/admin/captcha/save.ts @@ -5,8 +5,9 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; -import { captchaErrorCodes, CaptchaService, supportedCaptchaProviders } from '@/core/CaptchaService.js'; +import { CaptchaService, supportedCaptchaProviders } from '@/core/CaptchaService.js'; import { ApiError } from '@/server/api/error.js'; +import { captchaErrorCodes } from '@/misc/captcha-error.js'; export const meta = { tags: ['admin', 'captcha'],