aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/helpers
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-06-13 14:55:18 +0200
committerChocobozzz <me@florianbigard.com>2018-06-13 14:55:18 +0200
commitbcec136ee62ee9fcc0f0177e9dd0ac191a2cf5ee (patch)
tree2721b7308d670d1172a23f9dfbbbeac4ed689ddb /server/helpers
parent90d4bb8125e80c8060416d4d135ddeaf0a622ede (diff)
downloadPeerTube-bcec136ee62ee9fcc0f0177e9dd0ac191a2cf5ee.tar.gz
PeerTube-bcec136ee62ee9fcc0f0177e9dd0ac191a2cf5ee.tar.zst
PeerTube-bcec136ee62ee9fcc0f0177e9dd0ac191a2cf5ee.zip
Fix lint
Diffstat (limited to 'server/helpers')
-rw-r--r--server/helpers/custom-validators/activitypub/activity.ts2
1 files changed, 2 insertions, 0 deletions
diff --git a/server/helpers/custom-validators/activitypub/activity.ts b/server/helpers/custom-validators/activitypub/activity.ts
index 1d2ef2ac6..381a29e66 100644
--- a/server/helpers/custom-validators/activitypub/activity.ts
+++ b/server/helpers/custom-validators/activitypub/activity.ts
@@ -16,6 +16,7 @@ import {
16 sanitizeAndCheckVideoTorrentUpdateActivity 16 sanitizeAndCheckVideoTorrentUpdateActivity
17} from './videos' 17} from './videos'
18import { isViewActivityValid } from './view' 18import { isViewActivityValid } from './view'
19import { exists } from '../misc'
19 20
20function isRootActivityValid (activity: any) { 21function isRootActivityValid (activity: any) {
21 return Array.isArray(activity['@context']) && ( 22 return Array.isArray(activity['@context']) && (
@@ -26,6 +27,7 @@ function isRootActivityValid (activity: any) {
26 ) || 27 ) ||
27 ( 28 (
28 isActivityPubUrlValid(activity.id) && 29 isActivityPubUrlValid(activity.id) &&
30 exists(activity.actor) &&
29 (isActivityPubUrlValid(activity.actor) || isActivityPubUrlValid(activity.actor.id)) 31 (isActivityPubUrlValid(activity.actor) || isActivityPubUrlValid(activity.actor.id))
30 ) 32 )
31 ) 33 )