Move normalize functions in helpers

diff --git a/server/helpers/custom-validators/activitypub/actor.ts b/server/helpers/custom-validators/activitypub/actor.ts
index 9908be4d3221ebeeb9020722c22b79c44d855fa8..9a0bb32c16bd753d5c142e388fcba8ab8d19d3b3 100644 (file)
--- a/server/helpers/custom-validators/activitypub/actor.ts
+++ b/server/helpers/custom-validators/activitypub/actor.ts
@@ -1,7 +1,7 @@
 import * as validator from 'validator'
 import { CONSTRAINTS_FIELDS } from '../../../initializers'
-import { normalizeActor } from '../../../lib/activitypub'
 import { exists } from '../misc'
+import { truncate } from 'lodash'
 import { isActivityPubUrlValid, isBaseActivityValid, setValidAttributedTo } from './misc'
 
 function isActorEndpointsObjectValid (endpointObject: any) {
@@ -91,9 +91,28 @@ function isActorUpdateActivityValid (activity: any) {
     isActorObjectValid(activity.object)
 }
 
+function normalizeActor (actor: any) {
+  if (!actor) return
+
+  if (typeof actor.url !== 'string') {
+    actor.url = actor.url.href || actor.url.url
+  }
+
+  if (actor.summary && typeof actor.summary === 'string') {
+    actor.summary = truncate(actor.summary, { length: CONSTRAINTS_FIELDS.USERS.DESCRIPTION.max })
+
+    if (actor.summary.length < CONSTRAINTS_FIELDS.USERS.DESCRIPTION.min) {
+      actor.summary = null
+    }
+  }
+
+  return
+}
+
 // ---------------------------------------------------------------------------
 
 export {
+  normalizeActor,
   isActorEndpointsObjectValid,
   isActorPublicKeyObjectValid,
   isActorTypeValid,

diff --git a/server/helpers/custom-validators/activitypub/video-comments.ts b/server/helpers/custom-validators/activitypub/video-comments.ts
index 151d13075a8ced9bd3d43149010d39df29f25675..7a9f7326d1fd473bd6024075047054de87f21c44 100644 (file)
--- a/server/helpers/custom-validators/activitypub/video-comments.ts
+++ b/server/helpers/custom-validators/activitypub/video-comments.ts
@@ -46,7 +46,7 @@ function isCommentContentValid (content: any) {
 function normalizeComment (comment: any) {
   if (!comment) return
 
-  if (!comment.url || typeof comment.url !== 'string') {
+  if (typeof comment.url !== 'string') {
     comment.url = comment.url.href || comment.url.url
   }
 

diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts
index 5773fc34fc9d5c6987b18dda58deebab139a198e..4c336f26ebb2a4418e5c5c18119664b7313629b6 100644 (file)
--- a/server/lib/activitypub/actor.ts
+++ b/server/lib/activitypub/actor.ts
@@ -6,20 +6,19 @@ import * as uuidv4 from 'uuid/v4'
 import { ActivityPubActor, ActivityPubActorType } from '../../../shared/models/activitypub'
 import { ActivityPubAttributedTo } from '../../../shared/models/activitypub/objects'
 import { getActorUrl } from '../../helpers/activitypub'
-import { isActorObjectValid } from '../../helpers/custom-validators/activitypub/actor'
+import { isActorObjectValid, normalizeActor } from '../../helpers/custom-validators/activitypub/actor'
 import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
 import { retryTransactionWrapper, updateInstanceWithAnother } from '../../helpers/database-utils'
 import { logger } from '../../helpers/logger'
 import { createPrivateAndPublicKeys } from '../../helpers/peertube-crypto'
 import { doRequest, doRequestAndSaveToFile } from '../../helpers/requests'
 import { getUrlFromWebfinger } from '../../helpers/webfinger'
-import { IMAGE_MIMETYPE_EXT, CONFIG, sequelizeTypescript, CONSTRAINTS_FIELDS } from '../../initializers'
+import { CONFIG, IMAGE_MIMETYPE_EXT, sequelizeTypescript } from '../../initializers'
 import { AccountModel } from '../../models/account/account'
 import { ActorModel } from '../../models/activitypub/actor'
 import { AvatarModel } from '../../models/avatar/avatar'
 import { ServerModel } from '../../models/server/server'
 import { VideoChannelModel } from '../../models/video/video-channel'
-import { truncate } from 'lodash'
 
 // Set account keys, this could be long so process after the account creation and do not block the client
 function setAsyncActorKeys (actor: ActorModel) {
@@ -170,24 +169,6 @@ async function fetchAvatarIfExists (actorJSON: ActivityPubActor) {
   return undefined
 }
 
-function normalizeActor (actor: any) {
-  if (!actor) return
-
-  if (!actor.url || typeof actor.url !== 'string') {
-    actor.url = actor.url.href || actor.url.url
-  }
-
-  if (actor.summary && typeof actor.summary === 'string') {
-    actor.summary = truncate(actor.summary, { length: CONSTRAINTS_FIELDS.USERS.DESCRIPTION.max })
-
-    if (actor.summary.length < CONSTRAINTS_FIELDS.USERS.DESCRIPTION.min) {
-      actor.summary = null
-    }
-  }
-
-  return
-}
-
 export {
   getOrCreateActorAndServerAndModel,
   buildActorInstance,
@@ -195,8 +176,7 @@ export {
   fetchActorTotalItems,
   fetchAvatarIfExists,
   updateActorInstance,
-  updateActorAvatarInstance,
-  normalizeActor
+  updateActorAvatarInstance
 }
 
 // ---------------------------------------------------------------------------

diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts
index 2899acff3a7448fa96b0aa2433f3809aee0cc865..dbd7385a4ee0c6f4b9aca4bc1b5467448591fe26 100644 (file)
--- a/server/lib/activitypub/videos.ts
+++ b/server/lib/activitypub/videos.ts
@@ -306,7 +306,8 @@ export {
   videoFileActivityUrlToDBAttributes,
   getOrCreateVideo,
   getOrCreateVideoChannel,
-  addVideoShares}
+  addVideoShares
+}
 
 // ---------------------------------------------------------------------------