From 938d3fa0ffb4cf3e4c88f94dcfcae5eb2ce5e190 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 11 May 2018 15:55:39 +0200 Subject: Move normalize functions in helpers --- .../helpers/custom-validators/activitypub/actor.ts | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'server/helpers/custom-validators/activitypub/actor.ts') diff --git a/server/helpers/custom-validators/activitypub/actor.ts b/server/helpers/custom-validators/activitypub/actor.ts index 9908be4d3..9a0bb32c1 100644 --- 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, -- cgit v1.2.3