Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactor

Browse source
This commit is contained in:
syuilo 2022-03-25 01:51:34 +09:00
parent d0a346ed8a
commit 083b913dd2
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/backend/src/server/activitypub.ts
View file

@ -18,7 +18,6 @@ import { ILocalUser, User } from '@/models/entities/user.js';
import { In } from 'typeorm'; import { In } from 'typeorm';
import { renderLike } from '@/remote/activitypub/renderer/like.js'; import { renderLike } from '@/remote/activitypub/renderer/like.js';
import { getUserKeypair } from '@/misc/keypair-store.js'; import { getUserKeypair } from '@/misc/keypair-store.js';
import { noteCache, userCache } from './activitypub/cache.js';
// Init router // Init router
const router = new Router(); const router = new Router();
@ -66,13 +65,11 @@ router.post('/users/:user/inbox', json(), inbox);
router.get('/notes/:note', async (ctx, next) => { router.get('/notes/:note', async (ctx, next) => {
if (!isActivityPubReq(ctx)) return await next(); if (!isActivityPubReq(ctx)) return await next();
// TODO: typeorm 3.0にしたら .then(x => x || null) は消せる const note = await Notes.findOne({
// nginxとかでキャッシュしてくれそうだからそもそもnode側でのキャッシュ不要かも？
const note = await noteCache.fetch(ctx.params.note, () => Notes.findOne({
id: ctx.params.note, id: ctx.params.note,
visibility: In(['public' as const, 'home' as const]), visibility: In(['public' as const, 'home' as const]),
localOnly: false, localOnly: false,
}).then(x => x || null)); });
if (note == null) { if (note == null) {
ctx.status = 404; ctx.status = 404;
@ -167,13 +164,11 @@ router.get('/users/:user', async (ctx, next) => {
const userId = ctx.params.user; const userId = ctx.params.user;
// TODO: typeorm 3.0にしたら .then(x => x || null) は消せる const user = await Users.findOne({
// nginxとかでキャッシュしてくれそうだからそもそもnode側でのキャッシュ不要かも？
const user = await userCache.fetch(userId, () => Users.findOne({
id: userId, id: userId,
host: null, host: null,
isSuspended: false, isSuspended: false,
}).then(x => x || null)); });
await userInfo(ctx, user); await userInfo(ctx, user);
}); });