import * as validator from 'validator'
-import { ACTIVITY_PUB } from '../../../initializers'
-import { exists, isDateValid, isUUIDValid } from '../misc'
-import { isVideoChannelDescriptionValid, isVideoChannelNameValid } from '../video-channels'
+import { ACTIVITY_PUB, CONSTRAINTS_FIELDS } from '../../../initializers/constants'
+import { peertubeTruncate } from '../../core-utils'
+import { exists, isArray, isBooleanValid, isDateValid, isUUIDValid } from '../misc'
import {
- isVideoAbuseReasonValid,
isVideoDurationValid,
isVideoNameValid,
- isVideoNSFWValid,
+ isVideoStateValid,
isVideoTagValid,
isVideoTruncatedDescriptionValid,
- isVideoUrlValid,
isVideoViewsValid
} from '../videos'
-import { isActivityPubUrlValid, isBaseActivityValid } from './misc'
+import { isActivityPubUrlValid, isBaseActivityValid, setValidAttributedTo } from './misc'
+import { VideoState } from '../../../../shared/models/videos'
-function isVideoTorrentAddActivityValid (activity: any) {
- return isBaseActivityValid(activity, 'Add') &&
- isVideoTorrentObjectValid(activity.object)
-}
-
-function isVideoTorrentUpdateActivityValid (activity: any) {
+function sanitizeAndCheckVideoTorrentUpdateActivity (activity: any) {
return isBaseActivityValid(activity, 'Update') &&
- isVideoTorrentObjectValid(activity.object)
-}
-
-function isVideoTorrentDeleteActivityValid (activity: any) {
- return isBaseActivityValid(activity, 'Delete')
+ sanitizeAndCheckVideoTorrentObject(activity.object)
}
function isActivityPubVideoDurationValid (value: string) {
isVideoDurationValid(value.replace(/[^0-9]+/g, ''))
}
-function isVideoTorrentObjectValid (video: any) {
- return video.type === 'Video' &&
+function sanitizeAndCheckVideoTorrentObject (video: any) {
+ if (!video || video.type !== 'Video') return false
+
+ if (!setValidRemoteTags(video)) return false
+ if (!setValidRemoteVideoUrls(video)) return false
+ if (!setRemoteVideoTruncatedContent(video)) return false
+ if (!setValidAttributedTo(video)) return false
+ if (!setValidRemoteCaptions(video)) return false
+
+ // Default attributes
+ if (!isVideoStateValid(video.state)) video.state = VideoState.PUBLISHED
+ if (!isBooleanValid(video.waitTranscoding)) video.waitTranscoding = false
+ if (!isBooleanValid(video.downloadEnabled)) video.downloadEnabled = true
+
+ return isActivityPubUrlValid(video.id) &&
isVideoNameValid(video.name) &&
isActivityPubVideoDurationValid(video.duration) &&
isUUIDValid(video.uuid) &&
- setValidRemoteTags(video) &&
- isRemoteIdentifierValid(video.category) &&
- isRemoteIdentifierValid(video.licence) &&
- isRemoteIdentifierValid(video.language) &&
+ (!video.category || isRemoteNumberIdentifierValid(video.category)) &&
+ (!video.licence || isRemoteNumberIdentifierValid(video.licence)) &&
+ (!video.language || isRemoteStringIdentifierValid(video.language)) &&
isVideoViewsValid(video.views) &&
- isVideoNSFWValid(video.nsfw) &&
+ isBooleanValid(video.sensitive) &&
+ isBooleanValid(video.commentsEnabled) &&
+ isBooleanValid(video.downloadEnabled) &&
isDateValid(video.published) &&
isDateValid(video.updated) &&
- isRemoteVideoContentValid(video.mediaType, video.content) &&
+ (!video.originallyPublishedAt || isDateValid(video.originallyPublishedAt)) &&
+ (!video.content || isRemoteVideoContentValid(video.mediaType, video.content)) &&
isRemoteVideoIconValid(video.icon) &&
- setValidRemoteVideoUrls(video) &&
- video.url.length !== 0
-}
-
-function isVideoFlagValid (activity: any) {
- return isBaseActivityValid(activity, 'Flag') &&
- isVideoAbuseReasonValid(activity.content) &&
- isActivityPubUrlValid(activity.object)
-}
-
-function isVideoAnnounceValid (activity: any) {
- return isBaseActivityValid(activity, 'Announce') &&
- isVideoTorrentObjectValid(activity.object)
-}
-
-function isVideoChannelAnnounceValid (activity: any) {
- return isBaseActivityValid(activity, 'Announce') &&
- isVideoChannelObjectValid(activity.object)
-}
-
-function isVideoChannelCreateActivityValid (activity: any) {
- return isBaseActivityValid(activity, 'Create') &&
- isVideoChannelObjectValid(activity.object)
-}
-
-function isVideoChannelUpdateActivityValid (activity: any) {
- return isBaseActivityValid(activity, 'Update') &&
- isVideoChannelObjectValid(activity.object)
+ video.url.length !== 0 &&
+ video.attributedTo.length !== 0
}
-function isVideoChannelDeleteActivityValid (activity: any) {
- return isBaseActivityValid(activity, 'Delete')
-}
+function isRemoteVideoUrlValid (url: any) {
+ // FIXME: Old bug, we used the width to represent the resolution. Remove it in a few release (currently beta.11)
+ if (url.width && !url.height) url.height = url.width
-function isVideoChannelObjectValid (videoChannel: any) {
- return videoChannel.type === 'VideoChannel' &&
- isVideoChannelNameValid(videoChannel.name) &&
- isVideoChannelDescriptionValid(videoChannel.description) &&
- isUUIDValid(videoChannel.uuid)
+ return url.type === 'Link' &&
+ (
+ // TODO: remove mimeType (backward compatibility, introduced in v1.1.0)
+ ACTIVITY_PUB.URL_MIME_TYPES.VIDEO.indexOf(url.mediaType || url.mimeType) !== -1 &&
+ isActivityPubUrlValid(url.href) &&
+ validator.isInt(url.height + '', { min: 0 }) &&
+ validator.isInt(url.size + '', { min: 0 }) &&
+ (!url.fps || validator.isInt(url.fps + '', { min: -1 }))
+ ) ||
+ (
+ ACTIVITY_PUB.URL_MIME_TYPES.TORRENT.indexOf(url.mediaType || url.mimeType) !== -1 &&
+ isActivityPubUrlValid(url.href) &&
+ validator.isInt(url.height + '', { min: 0 })
+ ) ||
+ (
+ ACTIVITY_PUB.URL_MIME_TYPES.MAGNET.indexOf(url.mediaType || url.mimeType) !== -1 &&
+ validator.isLength(url.href, { min: 5 }) &&
+ validator.isInt(url.height + '', { min: 0 })
+ ) ||
+ (
+ (url.mediaType || url.mimeType) === 'application/x-mpegURL' &&
+ isActivityPubUrlValid(url.href) &&
+ isArray(url.tag)
+ )
}
// ---------------------------------------------------------------------------
export {
- isVideoTorrentAddActivityValid,
- isVideoChannelCreateActivityValid,
- isVideoTorrentUpdateActivityValid,
- isVideoChannelUpdateActivityValid,
- isVideoChannelDeleteActivityValid,
- isVideoTorrentDeleteActivityValid,
- isVideoFlagValid,
- isVideoAnnounceValid,
- isVideoChannelAnnounceValid
+ sanitizeAndCheckVideoTorrentUpdateActivity,
+ isRemoteStringIdentifierValid,
+ sanitizeAndCheckVideoTorrentObject,
+ isRemoteVideoUrlValid
}
// ---------------------------------------------------------------------------
function setValidRemoteTags (video: any) {
if (Array.isArray(video.tag) === false) return false
- const newTag = video.tag.filter(t => {
+ video.tag = video.tag.filter(t => {
return t.type === 'Hashtag' &&
isVideoTagValid(t.name)
})
- video.tag = newTag
return true
}
-function isRemoteIdentifierValid (data: any) {
+function setValidRemoteCaptions (video: any) {
+ if (!video.subtitleLanguage) video.subtitleLanguage = []
+
+ if (Array.isArray(video.subtitleLanguage) === false) return false
+
+ video.subtitleLanguage = video.subtitleLanguage.filter(caption => {
+ return isRemoteStringIdentifierValid(caption)
+ })
+
+ return true
+}
+
+function isRemoteNumberIdentifierValid (data: any) {
return validator.isInt(data.identifier, { min: 0 })
}
+function isRemoteStringIdentifierValid (data: any) {
+ return typeof data.identifier === 'string'
+}
+
function isRemoteVideoContentValid (mediaType: string, content: string) {
return mediaType === 'text/markdown' && isVideoTruncatedDescriptionValid(content)
}
function isRemoteVideoIconValid (icon: any) {
return icon.type === 'Image' &&
- isVideoUrlValid(icon.url) &&
+ isActivityPubUrlValid(icon.url) &&
icon.mediaType === 'image/jpeg' &&
validator.isInt(icon.width + '', { min: 0 }) &&
validator.isInt(icon.height + '', { min: 0 })
function setValidRemoteVideoUrls (video: any) {
if (Array.isArray(video.url) === false) return false
- const newUrl = video.url.filter(u => isRemoteVideoUrlValid(u))
- video.url = newUrl
+ video.url = video.url.filter(u => isRemoteVideoUrlValid(u))
return true
}
-function isRemoteVideoUrlValid (url: any) {
- return url.type === 'Link' &&
- ACTIVITY_PUB.VIDEO_URL_MIME_TYPES.indexOf(url.mimeType) !== -1 &&
- isVideoUrlValid(url.url) &&
- validator.isInt(url.width + '', { min: 0 }) &&
- validator.isInt(url.size + '', { min: 0 })
+function setRemoteVideoTruncatedContent (video: any) {
+ if (video.content) {
+ video.content = peertubeTruncate(video.content, CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max)
+ }
+
+ return true
}
projects / github / Chocobozzz / PeerTube.git / blobdiff