diff options
author | Chocobozzz <me@florianbigard.com> | 2017-12-14 17:38:41 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2017-12-19 10:53:16 +0100 |
commit | 50d6de9c286abcb34ff4234d56d9cbb803db7665 (patch) | |
tree | f1732b27edcd05c7877a8358b8312f1e38c287ed /server/helpers/custom-validators/activitypub/misc.ts | |
parent | fadf619ad61a016c1c7fc53de5a8f398a4f77519 (diff) | |
download | PeerTube-50d6de9c286abcb34ff4234d56d9cbb803db7665.tar.gz PeerTube-50d6de9c286abcb34ff4234d56d9cbb803db7665.tar.zst PeerTube-50d6de9c286abcb34ff4234d56d9cbb803db7665.zip |
Begin moving video channel to actor
Diffstat (limited to 'server/helpers/custom-validators/activitypub/misc.ts')
-rw-r--r-- | server/helpers/custom-validators/activitypub/misc.ts | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/server/helpers/custom-validators/activitypub/misc.ts b/server/helpers/custom-validators/activitypub/misc.ts index 65f5ca809..3ca4e4ff4 100644 --- a/server/helpers/custom-validators/activitypub/misc.ts +++ b/server/helpers/custom-validators/activitypub/misc.ts | |||
@@ -17,7 +17,7 @@ function isActivityPubUrlValid (url: string) { | |||
17 | isURLOptions.require_tld = false | 17 | isURLOptions.require_tld = false |
18 | } | 18 | } |
19 | 19 | ||
20 | return exists(url) && validator.isURL(url, isURLOptions) && validator.isLength(url, CONSTRAINTS_FIELDS.ACCOUNTS.URL) | 20 | return exists(url) && validator.isURL(url, isURLOptions) && validator.isLength(url, CONSTRAINTS_FIELDS.ACTOR.URL) |
21 | } | 21 | } |
22 | 22 | ||
23 | function isBaseActivityValid (activity: any, type: string) { | 23 | function isBaseActivityValid (activity: any, type: string) { |
@@ -35,7 +35,23 @@ function isBaseActivityValid (activity: any, type: string) { | |||
35 | ) | 35 | ) |
36 | } | 36 | } |
37 | 37 | ||
38 | function setValidAttributedTo (obj: any) { | ||
39 | if (Array.isArray(obj.attributedTo) === false) { | ||
40 | obj.attributedTo = [] | ||
41 | return true | ||
42 | } | ||
43 | |||
44 | const newAttributesTo = obj.attributedTo.filter(a => { | ||
45 | return (a.type === 'Group' || a.type === 'Person') && isActivityPubUrlValid(a.id) | ||
46 | }) | ||
47 | |||
48 | obj.attributedTo = newAttributesTo | ||
49 | |||
50 | return true | ||
51 | } | ||
52 | |||
38 | export { | 53 | export { |
39 | isActivityPubUrlValid, | 54 | isActivityPubUrlValid, |
40 | isBaseActivityValid | 55 | isBaseActivityValid, |
56 | setValidAttributedTo | ||
41 | } | 57 | } |