profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #4486 (#4487)

Browse source
This commit is contained in:
MeiMei 2019-03-13 11:21:16 +09:00 • committed by syuilo
parent f5be8fd313
commit 69a0d9034f
4 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/server/api/endpoints/ap/show.ts
View file

@ -8,6 +8,8 @@ import Note, { pack as packNote, INote } from '../../../../models/note';
import { createNote } from '../../../../remote/activitypub/models/note';
import Resolver from '../../../../remote/activitypub/resolver';
import { ApiError } from '../../error';
import Instance from '../../../../models/instance';
import { extractDbHost } from '../../../../misc/convert-host';
export const meta = {
tags: ['federation'],
@ -61,6 +63,10 @@ async function fetchAny(uri: string) {
if (packed !== null) return packed;
}
// ブロックしてたら中断
const instance = await Instance.findOne({ host: extractDbHost(uri) });
if (instance && instance.isBlocked) return null;
// URI(AP Object id)としてDB検索
{
const [user, note] = await Promise.all([