From c73e83da283c6d4eb094e384d59c4f8eb221507d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 28 Mar 2018 11:00:02 +0200 Subject: Truncate correctly video descriptions --- server/helpers/custom-validators/activitypub/videos.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'server/helpers/custom-validators/activitypub') diff --git a/server/helpers/custom-validators/activitypub/videos.ts b/server/helpers/custom-validators/activitypub/videos.ts index 10588423a..3af587a32 100644 --- a/server/helpers/custom-validators/activitypub/videos.ts +++ b/server/helpers/custom-validators/activitypub/videos.ts @@ -1,5 +1,6 @@ import * as validator from 'validator' -import { ACTIVITY_PUB } from '../../../initializers' +import { ACTIVITY_PUB, CONSTRAINTS_FIELDS } from '../../../initializers' +import { peertubeTruncate } from '../../core-utils' import { exists, isBooleanValid, isDateValid, isUUIDValid } from '../misc' import { isVideoAbuseReasonValid, @@ -56,6 +57,7 @@ function isVideoTorrentObjectValid (video: any) { isBooleanValid(video.commentsEnabled) && isDateValid(video.published) && isDateValid(video.updated) && + setTruncatedContent(video) && (!video.content || isRemoteVideoContentValid(video.mediaType, video.content)) && isRemoteVideoIconValid(video.icon) && setValidRemoteVideoUrls(video) && @@ -111,6 +113,14 @@ function setValidRemoteVideoUrls (video: any) { return true } +function setTruncatedContent (video: any) { + if (video.content) { + video.content = peertubeTruncate(video.content, CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max) + } + + return true +} + function isRemoteVideoUrlValid (url: any) { return url.type === 'Link' && ( -- cgit v1.2.3