diff options
| author | Julien Maulny <julien.maulny@protonmail.com> | 2019-11-15 19:05:08 +0100 |
|---|---|---|
| committer | Chocobozzz <chocobozzz@cpy.re> | 2019-12-04 09:36:45 +0100 |
| commit | 69222afac8f8c41d90295b33f0695bbff352851e (patch) | |
| tree | 63fe1faea94dd3bfc54e633631eecb275c969e54 /server/controllers/activitypub | |
| parent | 69c7f7525ddf13b7ced787d8b72ac74b43665517 (diff) | |
| download | PeerTube-69222afac8f8c41d90295b33f0695bbff352851e.tar.gz PeerTube-69222afac8f8c41d90295b33f0695bbff352851e.tar.zst PeerTube-69222afac8f8c41d90295b33f0695bbff352851e.zip | |
Soft delete video comments instead of detroy
Diffstat (limited to 'server/controllers/activitypub')
| -rw-r--r-- | server/controllers/activitypub/client.ts | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts index 453ced8bf..5ed0435ff 100644 --- a/server/controllers/activitypub/client.ts +++ b/server/controllers/activitypub/client.ts | |||
| @@ -308,13 +308,16 @@ async function videoCommentController (req: express.Request, res: express.Respon | |||
| 308 | 308 | ||
| 309 | const threadParentComments = await VideoCommentModel.listThreadParentComments(videoComment, undefined) | 309 | const threadParentComments = await VideoCommentModel.listThreadParentComments(videoComment, undefined) |
| 310 | const isPublic = true // Comments are always public | 310 | const isPublic = true // Comments are always public |
| 311 | const audience = getAudience(videoComment.Account.Actor, isPublic) | 311 | let videoCommentObject = videoComment.toActivityPubObject(threadParentComments) |
| 312 | 312 | ||
| 313 | const videoCommentObject = audiencify(videoComment.toActivityPubObject(threadParentComments), audience) | 313 | if (videoComment.Account) { |
| 314 | const audience = getAudience(videoComment.Account.Actor, isPublic) | ||
| 315 | videoCommentObject = audiencify(videoCommentObject, audience) | ||
| 314 | 316 | ||
| 315 | if (req.path.endsWith('/activity')) { | 317 | if (req.path.endsWith('/activity')) { |
| 316 | const data = buildCreateActivity(videoComment.url, videoComment.Account.Actor, videoCommentObject, audience) | 318 | const data = buildCreateActivity(videoComment.url, videoComment.Account.Actor, videoCommentObject, audience) |
| 317 | return activityPubResponse(activityPubContextify(data), res) | 319 | return activityPubResponse(activityPubContextify(data), res) |
| 320 | } | ||
| 318 | } | 321 | } |
| 319 | 322 | ||
| 320 | return activityPubResponse(activityPubContextify(videoCommentObject), res) | 323 | return activityPubResponse(activityPubContextify(videoCommentObject), res) |