diff --git a/packages/backend/src/server/activitypub/cache.ts b/packages/backend/src/server/activitypub/cache.ts index 00199ee2536433fd67f69d82dc721a9322d48900..eb20d00787a75df43ff41f875adba6fa0f6f2238 100644 --- a/packages/backend/src/server/activitypub/cache.ts +++ b/packages/backend/src/server/activitypub/cache.ts @@ -1,6 +1,4 @@ import { Cache } from "@/misc/cache.js"; -import { Note } from "@/models/entities/note.js"; import { User } from "@/models/entities/user.js"; export const userCache = new Cache<User | null>(1000 * 60 * 30); -export const noteCache = new Cache<Note | null>(1000 * 60 * 30); diff --git a/packages/backend/src/server/activitypub/featured.ts b/packages/backend/src/server/activitypub/featured.ts index d06a28a9cafba13c105756544d9b5071519719f2..5dc8792a9ab3d303eb7979ae7ce7488db7bca552 100644 --- a/packages/backend/src/server/activitypub/featured.ts +++ b/packages/backend/src/server/activitypub/featured.ts @@ -5,16 +5,14 @@ import renderOrderedCollection from '@/remote/activitypub/renderer/ordered-colle import { setResponseType } from '../activitypub.js'; import renderNote from '@/remote/activitypub/renderer/note.js'; import { Users, Notes, UserNotePinings } from '@/models/index.js'; -import { userCache } from './cache.js'; export default async (ctx: Router.RouterContext) => { const userId = ctx.params.user; - // TODO: typeorm 3.0ã«ã—ãŸã‚‰ .then(x => x || null) ã¯æ¶ˆã›ã‚‹ - const user = await userCache.fetch(userId, () => Users.findOne({ + const user = await Users.findOne({ id: userId, host: null, - }).then(x => x || null)); + }); if (user == null) { ctx.status = 404; diff --git a/packages/backend/src/server/api/endpoints/notes/reactions.ts b/packages/backend/src/server/api/endpoints/notes/reactions.ts index 43e5d1ef6fc0fc166ffc566dc2f035d90595cffa..70db12fb14bd7cf568fc301ba52d1708bf11a37c 100644 --- a/packages/backend/src/server/api/endpoints/notes/reactions.ts +++ b/packages/backend/src/server/api/endpoints/notes/reactions.ts @@ -44,13 +44,8 @@ export const paramDef = { // eslint-disable-next-line import/no-default-export export default define(meta, paramDef, async (ps, user) => { - const note = await getNote(ps.noteId).catch(e => { - if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote); - throw e; - }); - const query = { - noteId: note.id, + noteId: ps.noteId, } as DeepPartial<NoteReaction>; if (ps.type) { diff --git a/packages/backend/src/server/api/endpoints/users/report-abuse.ts b/packages/backend/src/server/api/endpoints/users/report-abuse.ts index e091b8e1b1c1b5cce4c721ff533f9c70e98af323..57f6a465fea0faf639bcd1b0883ed2788dc82750 100644 --- a/packages/backend/src/server/api/endpoints/users/report-abuse.ts +++ b/packages/backend/src/server/api/endpoints/users/report-abuse.ts @@ -70,7 +70,7 @@ export default define(meta, paramDef, async (ps, me) => { }).then(x => AbuseUserReports.findOneOrFail(x.identifiers[0])); // Publish event to moderators - setTimeout(async () => { + setImmediate(async () => { const moderators = await Users.find({ where: [{ isAdmin: true, @@ -94,5 +94,5 @@ export default define(meta, paramDef, async (ps, me) => { sanitizeHtml(ps.comment), sanitizeHtml(ps.comment)); } - }, 1); + }); });