summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/kernel/block
diff options
context:
space:
mode:
Diffstat (limited to 'src/remote/activitypub/kernel/block')
-rw-r--r--src/remote/activitypub/kernel/block/index.ts7
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}`);