From 938d3fa0ffb4cf3e4c88f94dcfcae5eb2ce5e190 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 11 May 2018 15:55:39 +0200
Subject: Move normalize functions in helpers

---
 server/lib/activitypub/actor.ts  | 26 +++-----------------------
 server/lib/activitypub/videos.ts |  3 ++-
 2 files changed, 5 insertions(+), 24 deletions(-)

(limited to 'server/lib')

diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts
index 5773fc34f..4c336f26e 100644
--- 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 2899acff3..dbd7385a4 100644
--- a/server/lib/activitypub/videos.ts
+++ b/server/lib/activitypub/videos.ts
@@ -306,7 +306,8 @@ export {
   videoFileActivityUrlToDBAttributes,
   getOrCreateVideo,
   getOrCreateVideoChannel,
-  addVideoShares}
+  addVideoShares
+}
 
 // ---------------------------------------------------------------------------
 
-- 
cgit v1.2.3