diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-09-27 04:58:28 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-09-27 04:58:28 +0900 |
| commit | e14509574d534a74fcebf9515146b028bbdec153 (patch) | |
| tree | c49aa610bb703ce9b7903059235e69fec3eead11 /src/remote/activitypub/kernel/block | |
| parent | Use mk-frac (diff) | |
| download | sharkey-e14509574d534a74fcebf9515146b028bbdec153.tar.gz sharkey-e14509574d534a74fcebf9515146b028bbdec153.tar.bz2 sharkey-e14509574d534a74fcebf9515146b028bbdec153.zip | |
AP featured collectionの修正 / Collection Activityの対応 / typeの修正など (#5460)
* resolver type / fix updateFeatured
* type ApObject
* fix strange type
* AP Activity
* Collection Activityが失敗したらとりあえず無視
Diffstat (limited to 'src/remote/activitypub/kernel/block')
| -rw-r--r-- | src/remote/activitypub/kernel/block/index.ts | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/remote/activitypub/kernel/block/index.ts b/src/remote/activitypub/kernel/block/index.ts index 5c247326cb..24bc9d524f 100644 --- a/src/remote/activitypub/kernel/block/index.ts +++ b/src/remote/activitypub/kernel/block/index.ts @@ -1,5 +1,5 @@ import config from '../../../../config'; -import { IBlock } from '../../type'; +import { IBlock, getApId } from '../../type'; import block from '../../../../services/blocking/create'; import { apLogger } from '../../logger'; import { Users } from '../../../../models'; @@ -8,10 +8,9 @@ import { IRemoteUser } from '../../../../models/entities/user'; const logger = apLogger; export default async (actor: IRemoteUser, activity: IBlock): Promise<void> => { - const id = typeof activity.object == 'string' ? activity.object : activity.object.id; - if (id == null) throw new Error('missing id'); + const id = getApId(activity.object); - const uri = activity.id || activity; + const uri = getApId(activity); logger.info(`Block: ${uri}`); |