diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-03-13 23:27:21 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-03-13 23:27:21 +0900 |
| commit | b157e9535eb7559b74426fabdb610c2d0b64a39a (patch) | |
| tree | 19e6c901cb24004cc4296882fb52d1dba9690845 /src/server | |
| parent | :art: (diff) | |
| parent | Add languages (#4452) (diff) | |
| download | sharkey-b157e9535eb7559b74426fabdb610c2d0b64a39a.tar.gz sharkey-b157e9535eb7559b74426fabdb610c2d0b64a39a.tar.bz2 sharkey-b157e9535eb7559b74426fabdb610c2d0b64a39a.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/api/endpoints/ap/show.ts | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server/api/endpoints/ap/show.ts b/src/server/api/endpoints/ap/show.ts index db02ecb8ea..861c8bce2e 100644 --- a/src/server/api/endpoints/ap/show.ts +++ b/src/server/api/endpoints/ap/show.ts @@ -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([ |