import {
AfterDestroy,
AllowNull,
+ BeforeDestroy,
BelongsTo,
BelongsToMany,
Column,
Table,
UpdatedAt
} from 'sequelize-typescript'
-import { IIncludeOptions } from 'sequelize-typescript/lib/interfaces/IIncludeOptions'
import { VideoPrivacy, VideoResolution } from '../../../shared'
import { VideoTorrentObject } from '../../../shared/models/activitypub/objects'
import { Video, VideoDetails } from '../../../shared/models/videos'
-import {
- activityPubCollection,
- createTorrentPromise,
- generateImageFromVideoFile,
- getVideoFileHeight,
- logger,
- renamePromise,
- statPromise,
- transcode,
- unlinkPromise,
- writeFilePromise
-} from '../../helpers'
-import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub'
+import { VideoFilter } from '../../../shared/models/videos/video-query.type'
+import { activityPubCollection } from '../../helpers/activitypub'
+import { createTorrentPromise, renamePromise, statPromise, unlinkPromise, writeFilePromise } from '../../helpers/core-utils'
+import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
+import { isBooleanValid } from '../../helpers/custom-validators/misc'
import {
isVideoCategoryValid,
isVideoDescriptionValid,
isVideoLanguageValid,
isVideoLicenceValid,
isVideoNameValid,
- isVideoNSFWValid,
- isVideoPrivacyValid
+ isVideoPrivacyValid,
+ isVideoSupportValid
} from '../../helpers/custom-validators/videos'
+import { generateImageFromVideoFile, getVideoFileResolution, transcode } from '../../helpers/ffmpeg-utils'
+import { logger } from '../../helpers/logger'
+import { getServerActor } from '../../helpers/utils'
import {
API_VERSION,
CONFIG,
VIDEO_LICENCES,
VIDEO_PRIVACIES
} from '../../initializers'
-import { getAnnounceActivityPubUrl } from '../../lib/activitypub'
-import { sendDeleteVideo } from '../../lib/index'
+import {
+ getVideoCommentsActivityPubUrl,
+ getVideoDislikesActivityPubUrl,
+ getVideoLikesActivityPubUrl,
+ getVideoSharesActivityPubUrl
+} from '../../lib/activitypub'
+import { sendDeleteVideo } from '../../lib/activitypub/send'
import { AccountModel } from '../account/account'
import { AccountVideoRateModel } from '../account/account-video-rate'
+import { ActorModel } from '../activitypub/actor'
+import { AvatarModel } from '../avatar/avatar'
import { ServerModel } from '../server/server'
import { getSort, throwIfNotValid } from '../utils'
import { TagModel } from './tag'
import { VideoAbuseModel } from './video-abuse'
import { VideoChannelModel } from './video-channel'
+import { VideoCommentModel } from './video-comment'
import { VideoFileModel } from './video-file'
import { VideoShareModel } from './video-share'
import { VideoTagModel } from './video-tag'
enum ScopeNames {
- NOT_IN_BLACKLIST = 'NOT_IN_BLACKLIST',
- PUBLIC = 'PUBLIC',
- WITH_ACCOUNT = 'WITH_ACCOUNT',
+ AVAILABLE_FOR_LIST = 'AVAILABLE_FOR_LIST',
+ WITH_ACCOUNT_DETAILS = 'WITH_ACCOUNT_DETAILS',
WITH_TAGS = 'WITH_TAGS',
WITH_FILES = 'WITH_FILES',
WITH_SHARES = 'WITH_SHARES',
- WITH_RATES = 'WITH_RATES'
+ WITH_RATES = 'WITH_RATES',
+ WITH_COMMENTS = 'WITH_COMMENTS'
}
@Scopes({
- [ScopeNames.NOT_IN_BLACKLIST]: {
+ [ScopeNames.AVAILABLE_FOR_LIST]: (actorId: number, filter?: VideoFilter) => ({
where: {
id: {
[Sequelize.Op.notIn]: Sequelize.literal(
'(SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")'
+ ),
+ [ Sequelize.Op.in ]: Sequelize.literal(
+ '(' +
+ 'SELECT "videoShare"."videoId" AS "id" FROM "videoShare" ' +
+ 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' +
+ 'WHERE "actorFollow"."actorId" = ' + parseInt(actorId.toString(), 10) +
+ ' UNION ' +
+ 'SELECT "video"."id" AS "id" FROM "video" ' +
+ 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' +
+ 'INNER JOIN "account" ON "account"."id" = "videoChannel"."accountId" ' +
+ 'INNER JOIN "actor" ON "account"."actorId" = "actor"."id" ' +
+ 'LEFT JOIN "actorFollow" ON "actorFollow"."targetActorId" = "actor"."id" ' +
+ 'WHERE "actor"."serverId" IS NULL OR "actorFollow"."actorId" = ' + parseInt(actorId.toString(), 10) +
+ ')'
)
- }
- }
- },
- [ScopeNames.PUBLIC]: {
- where: {
+ },
privacy: VideoPrivacy.PUBLIC
- }
- },
- [ScopeNames.WITH_ACCOUNT]: {
+ },
+ include: [
+ {
+ attributes: [ 'name', 'description' ],
+ model: VideoChannelModel.unscoped(),
+ required: true,
+ include: [
+ {
+ attributes: [ 'name' ],
+ model: AccountModel.unscoped(),
+ required: true,
+ include: [
+ {
+ attributes: [ 'preferredUsername', 'url', 'serverId' ],
+ model: ActorModel.unscoped(),
+ required: true,
+ where: VideoModel.buildActorWhereWithFilter(filter),
+ include: [
+ {
+ attributes: [ 'host' ],
+ model: ServerModel.unscoped(),
+ required: false
+ },
+ {
+ model: AvatarModel.unscoped(),
+ required: false
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }),
+ [ScopeNames.WITH_ACCOUNT_DETAILS]: {
include: [
{
- model: () => VideoChannelModel,
+ model: () => VideoChannelModel.unscoped(),
required: true,
include: [
{
- model: () => AccountModel,
+ attributes: {
+ exclude: [ 'privateKey', 'publicKey' ]
+ },
+ model: () => ActorModel.unscoped(),
required: true,
include: [
{
- model: () => ServerModel,
+ attributes: [ 'host' ],
+ model: () => ServerModel.unscoped(),
required: false
}
]
+ },
+ {
+ model: () => AccountModel.unscoped(),
+ required: true,
+ include: [
+ {
+ model: () => ActorModel.unscoped(),
+ attributes: {
+ exclude: [ 'privateKey', 'publicKey' ]
+ },
+ required: true,
+ include: [
+ {
+ attributes: [ 'host' ],
+ model: () => ServerModel.unscoped(),
+ required: false
+ },
+ {
+ model: () => AvatarModel.unscoped(),
+ required: false
+ }
+ ]
+ }
+ ]
}
]
}
include: [
{
model: () => VideoShareModel,
- include: [ () => AccountModel ]
+ include: [ () => ActorModel ]
}
]
},
include: [ () => AccountModel ]
}
]
+ },
+ [ScopeNames.WITH_COMMENTS]: {
+ include: [
+ {
+ model: () => VideoCommentModel
+ }
+ ]
}
})
@Table({
},
{
fields: [ 'channelId' ]
+ },
+ {
+ fields: [ 'id', 'privacy' ]
+ },
+ {
+ fields: [ 'url'],
+ unique: true
}
]
})
privacy: number
@AllowNull(false)
- @Is('VideoNSFW', value => throwIfNotValid(value, isVideoNSFWValid, 'NSFW boolean'))
+ @Is('VideoNSFW', value => throwIfNotValid(value, isBooleanValid, 'NSFW boolean'))
@Column
nsfw: boolean
@Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.DESCRIPTION.max))
description: string
+ @AllowNull(true)
+ @Default(null)
+ @Is('VideoSupport', value => throwIfNotValid(value, isVideoSupportValid, 'support'))
+ @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.SUPPORT.max))
+ support: string
+
@AllowNull(false)
@Is('VideoDuration', value => throwIfNotValid(value, isVideoDurationValid, 'duration'))
@Column
@Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.URL.max))
url: string
+ @AllowNull(false)
+ @Column
+ commentsEnabled: boolean
+
@CreatedAt
createdAt: Date
@BelongsTo(() => VideoChannelModel, {
foreignKey: {
- allowNull: false
+ allowNull: true
},
onDelete: 'cascade'
})
})
AccountVideoRates: AccountVideoRateModel[]
+ @HasMany(() => VideoCommentModel, {
+ foreignKey: {
+ name: 'videoId',
+ allowNull: false
+ },
+ onDelete: 'cascade',
+ hooks: true
+ })
+ VideoComments: VideoCommentModel[]
+
+ @BeforeDestroy
+ static async sendDelete (instance: VideoModel, options) {
+ if (instance.isOwned()) {
+ if (!instance.VideoChannel) {
+ instance.VideoChannel = await instance.$get('VideoChannel', {
+ include: [
+ {
+ model: AccountModel,
+ include: [ ActorModel ]
+ }
+ ],
+ transaction: options.transaction
+ }) as VideoChannelModel
+ }
+
+ logger.debug('Sending delete of video %s.', instance.url)
+
+ return sendDeleteVideo(instance, options.transaction)
+ }
+
+ return undefined
+ }
+
@AfterDestroy
- static removeFilesAndSendDelete (instance: VideoModel) {
- const tasks = []
+ static async removeFilesAndSendDelete (instance: VideoModel) {
+ const tasks: Promise<any>[] = []
- tasks.push(
- instance.removeThumbnail()
- )
+ tasks.push(instance.removeThumbnail())
if (instance.isOwned()) {
- tasks.push(
- instance.removePreview(),
- sendDeleteVideo(instance, undefined)
- )
+ if (!Array.isArray(instance.VideoFiles)) {
+ instance.VideoFiles = await instance.$get('VideoFiles') as VideoFileModel[]
+ }
+
+ tasks.push(instance.removePreview())
// Remove physical files and torrents
instance.VideoFiles.forEach(file => {
return VideoModel.scope(ScopeNames.WITH_FILES).findAll()
}
- static listAllAndSharedByAccountForOutbox (accountId: number, start: number, count: number) {
+ static listAllAndSharedByActorForOutbox (actorId: number, start: number, count: number) {
function getRawQuery (select: string) {
const queryVideo = 'SELECT ' + select + ' FROM "video" AS "Video" ' +
'INNER JOIN "videoChannel" AS "VideoChannel" ON "VideoChannel"."id" = "Video"."channelId" ' +
- 'WHERE "VideoChannel"."accountId" = ' + accountId
+ 'INNER JOIN "account" AS "Account" ON "Account"."id" = "VideoChannel"."accountId" ' +
+ 'WHERE "Account"."actorId" = ' + actorId
const queryVideoShare = 'SELECT ' + select + ' FROM "videoShare" AS "VideoShare" ' +
'INNER JOIN "video" AS "Video" ON "Video"."id" = "VideoShare"."videoId" ' +
- 'WHERE "VideoShare"."accountId" = ' + accountId
+ 'WHERE "VideoShare"."actorId" = ' + actorId
return `(${queryVideo}) UNION (${queryVideoShare})`
}
distinct: true,
offset: start,
limit: count,
- order: [ getSort('createdAt'), [ 'Tags', 'name', 'ASC' ] ],
+ order: getSort('createdAt', [ 'Tags', 'name', 'ASC' ]),
where: {
id: {
[Sequelize.Op.in]: Sequelize.literal('(' + rawQuery + ')')
- }
+ },
+ [Sequelize.Op.or]: [
+ { privacy: VideoPrivacy.PUBLIC },
+ { privacy: VideoPrivacy.UNLISTED }
+ ]
},
include: [
{
- model: VideoShareModel,
+ attributes: [ 'id', 'url' ],
+ model: VideoShareModel.unscoped(),
required: false,
where: {
[Sequelize.Op.and]: [
}
},
{
- accountId
+ actorId
}
]
},
- include: [ AccountModel ]
+ include: [
+ {
+ attributes: [ 'id', 'url' ],
+ model: ActorModel.unscoped()
+ }
+ ]
},
{
- model: VideoChannelModel,
+ model: VideoChannelModel.unscoped(),
required: true,
include: [
{
- model: AccountModel,
+ attributes: [ 'name' ],
+ model: AccountModel.unscoped(),
+ required: true,
+ include: [
+ {
+ attributes: [ 'id', 'url' ],
+ model: ActorModel.unscoped(),
+ required: true
+ }
+ ]
+ },
+ {
+ attributes: [ 'id', 'url' ],
+ model: ActorModel.unscoped(),
required: true
}
]
},
{
+ attributes: [ 'type' ],
model: AccountVideoRateModel,
- include: [ AccountModel ]
+ required: false,
+ include: [
+ {
+ attributes: [ 'id' ],
+ model: AccountModel.unscoped(),
+ include: [
+ {
+ attributes: [ 'url' ],
+ model: ActorModel.unscoped(),
+ include: [
+ {
+ attributes: [ 'host' ],
+ model: ServerModel,
+ required: false
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ attributes: [ 'url' ],
+ model: VideoCommentModel,
+ required: false
},
VideoFileModel,
TagModel
const query = {
offset: start,
limit: count,
- order: [ getSort(sort) ],
+ order: getSort(sort),
include: [
{
model: VideoChannelModel,
})
}
- static listForApi (start: number, count: number, sort: string) {
+ static async listForApi (start: number, count: number, sort: string, filter?: VideoFilter) {
const query = {
offset: start,
limit: count,
- order: [ getSort(sort) ]
+ order: getSort(sort)
}
- return VideoModel.scope([ ScopeNames.NOT_IN_BLACKLIST, ScopeNames.PUBLIC, ScopeNames.WITH_ACCOUNT ])
+ const serverActor = await getServerActor()
+
+ return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST, serverActor.id, filter ] })
.findAndCountAll(query)
.then(({ rows, count }) => {
return {
})
}
+ static async searchAndPopulateAccountAndServerAndTags (value: string, start: number, count: number, sort: string) {
+ const query: IFindOptions<VideoModel> = {
+ offset: start,
+ limit: count,
+ order: getSort(sort),
+ where: {
+ name: {
+ [Sequelize.Op.iLike]: '%' + value + '%'
+ }
+ }
+ }
+
+ const serverActor = await getServerActor()
+
+ return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST, serverActor.id ] })
+ .findAndCountAll(query).then(({ rows, count }) => {
+ return {
+ data: rows,
+ total: count
+ }
+ })
+ }
+
static load (id: number) {
return VideoModel.findById(id)
}
if (t !== undefined) query.transaction = t
- return VideoModel.scope([ ScopeNames.WITH_ACCOUNT, ScopeNames.WITH_FILES ]).findOne(query)
+ return VideoModel.scope([ ScopeNames.WITH_ACCOUNT_DETAILS, ScopeNames.WITH_FILES ]).findOne(query)
}
- static loadByUUIDOrURL (uuid: string, url: string, t?: Sequelize.Transaction) {
+ static loadByUUIDOrURLAndPopulateAccount (uuid: string, url: string, t?: Sequelize.Transaction) {
const query: IFindOptions<VideoModel> = {
where: {
[Sequelize.Op.or]: [
if (t !== undefined) query.transaction = t
- return VideoModel.scope(ScopeNames.WITH_FILES).findOne(query)
+ return VideoModel.scope([ ScopeNames.WITH_ACCOUNT_DETAILS, ScopeNames.WITH_FILES ]).findOne(query)
}
static loadAndPopulateAccountAndServerAndTags (id: number) {
}
return VideoModel
- .scope([ ScopeNames.WITH_RATES, ScopeNames.WITH_SHARES, ScopeNames.WITH_TAGS, ScopeNames.WITH_FILES, ScopeNames.WITH_ACCOUNT ])
+ .scope([ ScopeNames.WITH_TAGS, ScopeNames.WITH_FILES, ScopeNames.WITH_ACCOUNT_DETAILS ])
.findById(id, options)
}
+ static loadByUUID (uuid: string) {
+ const options = {
+ where: {
+ uuid
+ }
+ }
+
+ return VideoModel
+ .scope([ ScopeNames.WITH_FILES ])
+ .findOne(options)
+ }
+
static loadByUUIDAndPopulateAccountAndServerAndTags (uuid: string) {
const options = {
order: [ [ 'Tags', 'name', 'ASC' ] ],
}
return VideoModel
- .scope([ ScopeNames.WITH_RATES, ScopeNames.WITH_SHARES, ScopeNames.WITH_TAGS, ScopeNames.WITH_FILES, ScopeNames.WITH_ACCOUNT ])
+ .scope([ ScopeNames.WITH_TAGS, ScopeNames.WITH_FILES, ScopeNames.WITH_ACCOUNT_DETAILS ])
.findOne(options)
}
- static searchAndPopulateAccountAndServerAndTags (value: string, start: number, count: number, sort: string) {
- const serverInclude: IIncludeOptions = {
- model: ServerModel,
- required: false
+ static loadAndPopulateAll (id: number) {
+ const options = {
+ order: [ [ 'Tags', 'name', 'ASC' ] ],
+ where: {
+ id
+ }
}
- const accountInclude: IIncludeOptions = {
- model: AccountModel,
- include: [ serverInclude ]
- }
+ return VideoModel
+ .scope([
+ ScopeNames.WITH_RATES,
+ ScopeNames.WITH_SHARES,
+ ScopeNames.WITH_TAGS,
+ ScopeNames.WITH_FILES,
+ ScopeNames.WITH_ACCOUNT_DETAILS,
+ ScopeNames.WITH_COMMENTS
+ ])
+ .findOne(options)
+ }
- const videoChannelInclude: IIncludeOptions = {
- model: VideoChannelModel,
- include: [ accountInclude ],
- required: true
- }
+ static async getStats () {
+ const totalLocalVideos = await VideoModel.count({
+ where: {
+ remote: false
+ }
+ })
+ const totalVideos = await VideoModel.count()
- const tagInclude: IIncludeOptions = {
- model: TagModel
- }
+ let totalLocalVideoViews = await VideoModel.sum('views', {
+ where: {
+ remote: false
+ }
+ })
+ // Sequelize could return null...
+ if (!totalLocalVideoViews) totalLocalVideoViews = 0
- const query: IFindOptions<VideoModel> = {
- distinct: true, // Because we have tags
- offset: start,
- limit: count,
- order: [ getSort(sort) ],
- where: {}
+ return {
+ totalLocalVideos,
+ totalLocalVideoViews,
+ totalVideos
}
+ }
- // TODO: search on tags too
- // const escapedValue = Video['sequelize'].escape('%' + value + '%')
- // query.where['id'][Sequelize.Op.in] = Video['sequelize'].literal(
- // `(SELECT "VideoTags"."videoId"
- // FROM "Tags"
- // INNER JOIN "VideoTags" ON "Tags"."id" = "VideoTags"."tagId"
- // WHERE name ILIKE ${escapedValue}
- // )`
- // )
-
- // TODO: search on account too
- // accountInclude.where = {
- // name: {
- // [Sequelize.Op.iLike]: '%' + value + '%'
- // }
- // }
- query.where['name'] = {
- [Sequelize.Op.iLike]: '%' + value + '%'
+ private static buildActorWhereWithFilter (filter?: VideoFilter) {
+ if (filter && filter === 'local') {
+ return {
+ serverId: null
+ }
}
- query.include = [
- videoChannelInclude, tagInclude
- ]
+ return {}
+ }
- return VideoModel.scope([ ScopeNames.NOT_IN_BLACKLIST, ScopeNames.PUBLIC ])
- .findAndCountAll(query).then(({ rows, count }) => {
- return {
- data: rows,
- total: count
- }
- })
+ private static getCategoryLabel (id: number) {
+ let categoryLabel = VIDEO_CATEGORIES[id]
+ if (!categoryLabel) categoryLabel = 'Misc'
+
+ return categoryLabel
+ }
+
+ private static getLicenceLabel (id: number) {
+ let licenceLabel = VIDEO_LICENCES[id]
+ if (!licenceLabel) licenceLabel = 'Unknown'
+
+ return licenceLabel
+ }
+
+ private static getLanguageLabel (id: number) {
+ let languageLabel = VIDEO_LANGUAGES[id]
+ if (!languageLabel) languageLabel = 'Unknown'
+
+ return languageLabel
}
getOriginalFile () {
}
createPreview (videoFile: VideoFileModel) {
- const imageSize = PREVIEWS_SIZE.width + 'x' + PREVIEWS_SIZE.height
-
return generateImageFromVideoFile(
this.getVideoFilePath(videoFile),
CONFIG.STORAGE.PREVIEWS_DIR,
this.getPreviewName(),
- imageSize
+ PREVIEWS_SIZE
)
}
createThumbnail (videoFile: VideoFileModel) {
- const imageSize = THUMBNAILS_SIZE.width + 'x' + THUMBNAILS_SIZE.height
-
return generateImageFromVideoFile(
this.getVideoFilePath(videoFile),
CONFIG.STORAGE.THUMBNAILS_DIR,
this.getThumbnailName(),
- imageSize
+ THUMBNAILS_SIZE
)
}
createTorrentAndSetInfoHash = async function (videoFile: VideoFileModel) {
const options = {
announceList: [
- [ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ]
+ [ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ],
+ [ CONFIG.WEBSERVER.URL + '/tracker/announce' ]
],
urlList: [
CONFIG.WEBSERVER.URL + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile)
return join(STATIC_PATHS.PREVIEWS, this.getPreviewName())
}
- toFormattedJSON () {
- let serverHost
-
- if (this.VideoChannel.Account.Server) {
- serverHost = this.VideoChannel.Account.Server.host
- } else {
- // It means it's our video
- serverHost = CONFIG.WEBSERVER.HOST
- }
+ toFormattedJSON (): Video {
+ const formattedAccount = this.VideoChannel.Account.toFormattedJSON()
return {
id: this.id,
uuid: this.uuid,
name: this.name,
- category: this.category,
- categoryLabel: this.getCategoryLabel(),
- licence: this.licence,
- licenceLabel: this.getLicenceLabel(),
- language: this.language,
- languageLabel: this.getLanguageLabel(),
+ category: {
+ id: this.category,
+ label: VideoModel.getCategoryLabel(this.category)
+ },
+ licence: {
+ id: this.licence,
+ label: VideoModel.getLicenceLabel(this.licence)
+ },
+ language: {
+ id: this.language,
+ label: VideoModel.getLanguageLabel(this.language)
+ },
nsfw: this.nsfw,
description: this.getTruncatedDescription(),
- serverHost,
isLocal: this.isOwned(),
- accountName: this.VideoChannel.Account.name,
duration: this.duration,
views: this.views,
likes: this.likes,
previewPath: this.getPreviewPath(),
embedPath: this.getEmbedPath(),
createdAt: this.createdAt,
- updatedAt: this.updatedAt
- } as Video
+ updatedAt: this.updatedAt,
+ account: {
+ name: formattedAccount.name,
+ displayName: formattedAccount.displayName,
+ url: formattedAccount.url,
+ host: formattedAccount.host,
+ avatar: formattedAccount.avatar
+ }
+ }
}
- toFormattedDetailsJSON () {
+ toFormattedDetailsJSON (): VideoDetails {
const formattedJson = this.toFormattedJSON()
// Maybe our server is not up to date and there are new privacy settings since our version
if (!privacyLabel) privacyLabel = 'Unknown'
const detailsJson = {
- privacyLabel,
- privacy: this.privacy,
+ privacy: {
+ id: this.privacy,
+ label: privacyLabel
+ },
+ support: this.support,
descriptionPath: this.getDescriptionPath(),
channel: this.VideoChannel.toFormattedJSON(),
account: this.VideoChannel.Account.toFormattedJSON(),
tags: map<TagModel, string>(this.Tags, 'name'),
+ commentsEnabled: this.commentsEnabled,
files: []
}
let resolutionLabel = videoFile.resolution + 'p'
return {
- resolution: videoFile.resolution,
- resolutionLabel,
+ resolution: {
+ id: videoFile.resolution,
+ label: resolutionLabel
+ },
magnetUri: this.generateMagnetUri(videoFile, baseUrlHttp, baseUrlWs),
size: videoFile.size,
torrentUrl: this.getTorrentUrl(videoFile, baseUrlHttp),
return -1
})
- return Object.assign(formattedJson, detailsJson) as VideoDetails
+ return Object.assign(formattedJson, detailsJson)
}
toActivityPubObject (): VideoTorrentObject {
let language
if (this.language) {
language = {
- identifier: this.language + '',
- name: this.getLanguageLabel()
+ id: this.language + '',
+ name: VideoModel.getLanguageLabel(this.language)
}
}
if (this.category) {
category = {
identifier: this.category + '',
- name: this.getCategoryLabel()
+ name: VideoModel.getCategoryLabel(this.category)
}
}
if (this.licence) {
licence = {
identifier: this.licence + '',
- name: this.getLicenceLabel()
+ name: VideoModel.getLicenceLabel(this.licence)
}
}
let dislikesObject
if (Array.isArray(this.AccountVideoRates)) {
- const likes: string[] = []
- const dislikes: string[] = []
-
- for (const rate of this.AccountVideoRates) {
- if (rate.type === 'like') {
- likes.push(rate.Account.url)
- } else if (rate.type === 'dislike') {
- dislikes.push(rate.Account.url)
- }
- }
-
- likesObject = activityPubCollection(likes)
- dislikesObject = activityPubCollection(dislikes)
+ const res = this.toRatesActivityPubObjects()
+ likesObject = res.likesObject
+ dislikesObject = res.dislikesObject
}
let sharesObject
if (Array.isArray(this.VideoShares)) {
- const shares: string[] = []
-
- for (const videoShare of this.VideoShares) {
- const shareUrl = getAnnounceActivityPubUrl(this.url, videoShare.Account)
- shares.push(shareUrl)
- }
+ sharesObject = this.toAnnouncesActivityPubObject()
+ }
- sharesObject = activityPubCollection(shares)
+ let commentsObject
+ if (Array.isArray(this.VideoComments)) {
+ commentsObject = this.toCommentsActivityPubObject()
}
const url = []
url.push({
type: 'Link',
mimeType: 'video/' + file.extname.replace('.', ''),
- url: this.getVideoFileUrl(file, baseUrlHttp),
+ href: this.getVideoFileUrl(file, baseUrlHttp),
width: file.resolution,
size: file.size
})
url.push({
type: 'Link',
mimeType: 'application/x-bittorrent',
- url: this.getTorrentUrl(file, baseUrlHttp),
+ href: this.getTorrentUrl(file, baseUrlHttp),
width: file.resolution
})
url.push({
type: 'Link',
mimeType: 'application/x-bittorrent;x-scheme-handler/magnet',
- url: this.generateMagnetUri(file, baseUrlHttp, baseUrlWs),
+ href: this.generateMagnetUri(file, baseUrlHttp, baseUrlWs),
width: file.resolution
})
}
url.push({
type: 'Link',
mimeType: 'text/html',
- url: CONFIG.WEBSERVER.URL + '/videos/watch/' + this.uuid
+ href: CONFIG.WEBSERVER.URL + '/videos/watch/' + this.uuid
})
return {
type: 'Video' as 'Video',
id: this.url,
name: this.name,
- // https://www.w3.org/TR/activitystreams-vocabulary/#dfn-duration
- duration: 'PT' + this.duration + 'S',
+ duration: this.getActivityStreamDuration(),
uuid: this.uuid,
tag,
category,
licence,
language,
views: this.views,
- nsfw: this.nsfw,
+ sensitive: this.nsfw,
+ commentsEnabled: this.commentsEnabled,
published: this.createdAt.toISOString(),
updated: this.updatedAt.toISOString(),
mediaType: 'text/markdown',
content: this.getTruncatedDescription(),
+ support: this.support,
icon: {
type: 'Image',
url: this.getThumbnailUrl(baseUrlHttp),
url,
likes: likesObject,
dislikes: dislikesObject,
- shares: sharesObject
+ shares: sharesObject,
+ comments: commentsObject,
+ attributedTo: [
+ {
+ type: 'Group',
+ id: this.VideoChannel.Actor.url
+ },
+ {
+ type: 'Person',
+ id: this.VideoChannel.Account.Actor.url
+ }
+ ]
+ }
+ }
+
+ toAnnouncesActivityPubObject () {
+ const shares: string[] = []
+
+ for (const videoShare of this.VideoShares) {
+ shares.push(videoShare.url)
}
+
+ return activityPubCollection(getVideoSharesActivityPubUrl(this), shares)
+ }
+
+ toCommentsActivityPubObject () {
+ const comments: string[] = []
+
+ for (const videoComment of this.VideoComments) {
+ comments.push(videoComment.url)
+ }
+
+ return activityPubCollection(getVideoCommentsActivityPubUrl(this), comments)
+ }
+
+ toRatesActivityPubObjects () {
+ const likes: string[] = []
+ const dislikes: string[] = []
+
+ for (const rate of this.AccountVideoRates) {
+ if (rate.type === 'like') {
+ likes.push(rate.Account.Actor.url)
+ } else if (rate.type === 'dislike') {
+ dislikes.push(rate.Account.Actor.url)
+ }
+ }
+
+ const likesObject = activityPubCollection(getVideoLikesActivityPubUrl(this), likes)
+ const dislikesObject = activityPubCollection(getVideoDislikesActivityPubUrl(this), dislikes)
+
+ return { likesObject, dislikesObject }
}
getTruncatedDescription () {
outputPath: videoOutputPath
}
- try {
- // Could be very long!
- await transcode(transcodeOptions)
+ // Could be very long!
+ await transcode(transcodeOptions)
+ try {
await unlinkPromise(videoInputPath)
// Important to do this before getVideoFilename() to take in account the new file extension
}
}
- transcodeOriginalVideofile = async function (resolution: VideoResolution) {
+ transcodeOriginalVideofile = async function (resolution: VideoResolution, isPortraitMode: boolean) {
const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
const extname = '.mp4'
const transcodeOptions = {
inputPath: videoInputPath,
outputPath: videoOutputPath,
- resolution
+ resolution,
+ isPortraitMode
}
await transcode(transcodeOptions)
this.VideoFiles.push(newVideoFile)
}
- getOriginalFileHeight () {
+ getOriginalFileResolution () {
const originalFilePath = this.getVideoFilePath(this.getOriginalFile())
- return getVideoFileHeight(originalFilePath)
+ return getVideoFileResolution(originalFilePath)
}
getDescriptionPath () {
return `/api/${API_VERSION}/videos/${this.uuid}/description`
}
- getCategoryLabel () {
- let categoryLabel = VIDEO_CATEGORIES[this.category]
- if (!categoryLabel) categoryLabel = 'Misc'
-
- return categoryLabel
- }
-
- getLicenceLabel () {
- let licenceLabel = VIDEO_LICENCES[this.licence]
- if (!licenceLabel) licenceLabel = 'Unknown'
-
- return licenceLabel
- }
-
- getLanguageLabel () {
- let languageLabel = VIDEO_LANGUAGES[this.language]
- if (!languageLabel) languageLabel = 'Unknown'
-
- return languageLabel
- }
-
removeThumbnail () {
const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName())
return unlinkPromise(thumbnailPath)
return unlinkPromise(torrentPath)
}
+ getActivityStreamDuration () {
+ // https://www.w3.org/TR/activitystreams-vocabulary/#dfn-duration
+ return 'PT' + this.duration + 'S'
+ }
+
private getBaseUrls () {
let baseUrlHttp
let baseUrlWs
baseUrlHttp = CONFIG.WEBSERVER.URL
baseUrlWs = CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
} else {
- baseUrlHttp = REMOTE_SCHEME.HTTP + '://' + this.VideoChannel.Account.Server.host
- baseUrlWs = REMOTE_SCHEME.WS + '://' + this.VideoChannel.Account.Server.host
+ baseUrlHttp = REMOTE_SCHEME.HTTP + '://' + this.VideoChannel.Account.Actor.Server.host
+ baseUrlWs = REMOTE_SCHEME.WS + '://' + this.VideoChannel.Account.Actor.Server.host
}
return { baseUrlHttp, baseUrlWs }
projects / github / Chocobozzz / PeerTube.git / blobdiff