From 2890b615f31ab7d519d8be66b49ff8712df90c51 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 4 Jan 2018 17:50:30 +0100
Subject: Handle HTML is comments
---
server/lib/activitypub/process/process-delete.ts | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'server/lib')
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'
async function processDeleteActivity (activity: ActivityDelete) {
const actor = await getOrCreateActorAndServerAndModel(activity.actor)
+ const objectUrl = typeof activity.object === 'string' ? activity.object : activity.object.id
- if (actor.url === activity.object) {
+ if (actor.url === objectUrl) {
if (actor.type === 'Person') {
if (!actor.Account) throw new Error('Actor ' + actor.url + ' is a person but we cannot find it in database.')
@@ -25,14 +26,14 @@ async function processDeleteActivity (activity: ActivityDelete) {
}
{
- const videoCommentInstance = await VideoCommentModel.loadByUrlAndPopulateAccount(activity.object)
+ const videoCommentInstance = await VideoCommentModel.loadByUrlAndPopulateAccount(objectUrl)
if (videoCommentInstance) {
return processDeleteVideoComment(actor, videoCommentInstance)
}
}
{
- const videoInstance = await VideoModel.loadByUrlAndPopulateAccount(activity.object)
+ const videoInstance = await VideoModel.loadByUrlAndPopulateAccount(objectUrl)
if (videoInstance) {
return processDeleteVideo(actor, videoInstance)
}
--
cgit v1.2.3