diff options
Diffstat (limited to 'server/lib/activitypub/process/process-delete.ts')
-rw-r--r-- | server/lib/activitypub/process/process-delete.ts | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/server/lib/activitypub/process/process-delete.ts b/server/lib/activitypub/process/process-delete.ts index 01751422d..07e6a0075 100644 --- a/server/lib/activitypub/process/process-delete.ts +++ b/server/lib/activitypub/process/process-delete.ts | |||
@@ -11,8 +11,9 @@ import { getOrCreateActorAndServerAndModel } from '../actor' | |||
11 | 11 | ||
12 | async function processDeleteActivity (activity: ActivityDelete) { | 12 | async function processDeleteActivity (activity: ActivityDelete) { |
13 | const actor = await getOrCreateActorAndServerAndModel(activity.actor) | 13 | const actor = await getOrCreateActorAndServerAndModel(activity.actor) |
14 | const objectUrl = typeof activity.object === 'string' ? activity.object : activity.object.id | ||
14 | 15 | ||
15 | if (actor.url === activity.object) { | 16 | if (actor.url === objectUrl) { |
16 | if (actor.type === 'Person') { | 17 | if (actor.type === 'Person') { |
17 | if (!actor.Account) throw new Error('Actor ' + actor.url + ' is a person but we cannot find it in database.') | 18 | if (!actor.Account) throw new Error('Actor ' + actor.url + ' is a person but we cannot find it in database.') |
18 | 19 | ||
@@ -25,14 +26,14 @@ async function processDeleteActivity (activity: ActivityDelete) { | |||
25 | } | 26 | } |
26 | 27 | ||
27 | { | 28 | { |
28 | const videoCommentInstance = await VideoCommentModel.loadByUrlAndPopulateAccount(activity.object) | 29 | const videoCommentInstance = await VideoCommentModel.loadByUrlAndPopulateAccount(objectUrl) |
29 | if (videoCommentInstance) { | 30 | if (videoCommentInstance) { |
30 | return processDeleteVideoComment(actor, videoCommentInstance) | 31 | return processDeleteVideoComment(actor, videoCommentInstance) |
31 | } | 32 | } |
32 | } | 33 | } |
33 | 34 | ||
34 | { | 35 | { |
35 | const videoInstance = await VideoModel.loadByUrlAndPopulateAccount(activity.object) | 36 | const videoInstance = await VideoModel.loadByUrlAndPopulateAccount(objectUrl) |
36 | if (videoInstance) { | 37 | if (videoInstance) { |
37 | return processDeleteVideo(actor, videoInstance) | 38 | return processDeleteVideo(actor, videoInstance) |
38 | } | 39 | } |