Refractor user quota SQL queries

[github/Chocobozzz/PeerTube.git] / server / helpers / custom-validators / activitypub / misc.ts

diff --git a/server/helpers/custom-validators/activitypub/misc.ts b/server/helpers/custom-validators/activitypub/misc.ts
index 3ca4e4ff4be93222d78445660168a351f3468c1a..6c5c7abca671efc61035cd99d91dcb9f196e488a 100644 (file)
--- a/server/helpers/custom-validators/activitypub/misc.ts
+++ b/server/helpers/custom-validators/activitypub/misc.ts
@@ -17,14 +17,14 @@ function isActivityPubUrlValid (url: string) {
     isURLOptions.require_tld = false
   }
 
-  return exists(url) && validator.isURL(url, isURLOptions) && validator.isLength(url, CONSTRAINTS_FIELDS.ACTOR.URL)
+  return exists(url) && validator.isURL('' + url, isURLOptions) && validator.isLength('' + url, CONSTRAINTS_FIELDS.ACTORS.URL)
 }
 
 function isBaseActivityValid (activity: any, type: string) {
   return (activity['@context'] === undefined || Array.isArray(activity['@context'])) &&
     activity.type === type &&
     isActivityPubUrlValid(activity.id) &&
-    isActivityPubUrlValid(activity.actor) &&
+    (isActivityPubUrlValid(activity.actor) || isActivityPubUrlValid(activity.actor.id)) &&
     (
       activity.to === undefined ||
       (Array.isArray(activity.to) && activity.to.every(t => isActivityPubUrlValid(t)))
@@ -41,12 +41,10 @@ function setValidAttributedTo (obj: any) {
     return true
   }
 
-  const newAttributesTo = obj.attributedTo.filter(a => {
+  obj.attributedTo = obj.attributedTo.filter(a => {
     return (a.type === 'Group' || a.type === 'Person') && isActivityPubUrlValid(a.id)
   })
 
-  obj.attributedTo = newAttributesTo
-
   return true
 }