yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 02:39:33 +02:00
Code Issues Releases Wiki Activity

Move normalize functions in helpers

Browse source
This commit is contained in:
Chocobozzz 2018-05-11 15:55:39 +02:00
parent 5cf1350011
commit 938d3fa0ff
No known key found for this signature in database
GPG key ID: 583A612D890159BE
4 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

21
server/helpers/custom-validators/activitypub/actor.ts
View file

@ -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,

2
server/helpers/custom-validators/activitypub/video-comments.ts
View file

@ -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
}