import * as magnetUtil from 'magnet-uri'
import * as parseTorrent from 'parse-torrent'
import { join } from 'path'
-import * as Sequelize from 'sequelize'
+import {
+ CountOptions,
+ FindOptions,
+ IncludeOptions,
+ ModelIndexesOptions,
+ Op,
+ QueryTypes,
+ ScopeOptions,
+ Sequelize,
+ Transaction,
+ WhereOptions
+} from 'sequelize'
import {
AllowNull,
BeforeDestroy,
ForeignKey,
HasMany,
HasOne,
- IFindOptions,
- IIncludeOptions,
Is,
IsInt,
IsUUID,
isVideoStateValid,
isVideoSupportValid
} from '../../helpers/custom-validators/videos'
-import { generateImageFromVideoFile, getVideoFileResolution } from '../../helpers/ffmpeg-utils'
+import { getVideoFileResolution } from '../../helpers/ffmpeg-utils'
import { logger } from '../../helpers/logger'
import { getServerActor } from '../../helpers/utils'
import {
CONSTRAINTS_FIELDS,
HLS_REDUNDANCY_DIRECTORY,
HLS_STREAMING_PLAYLIST_DIRECTORY,
- PREVIEWS_SIZE,
REMOTE_SCHEME,
STATIC_DOWNLOAD_PATHS,
STATIC_PATHS,
- THUMBNAILS_SIZE,
VIDEO_CATEGORIES,
VIDEO_LANGUAGES,
VIDEO_LICENCES,
import { ThumbnailType } from '../../../shared/models/videos/thumbnail.type'
// FIXME: Define indexes here because there is an issue with TS and Sequelize.literal when called directly in the annotation
-const indexes: Sequelize.DefineIndexesOptions[] = [
+const indexes: (ModelIndexesOptions & { where?: WhereOptions })[] = [
buildTrigramSearchIndex('video_name_trigram', 'name'),
{ fields: [ 'createdAt' ] },
fields: [ 'originallyPublishedAt' ],
where: {
originallyPublishedAt: {
- [Sequelize.Op.ne]: null
+ [Op.ne]: null
}
}
},
fields: [ 'category' ], // We don't care videos with an unknown category
where: {
category: {
- [Sequelize.Op.ne]: null
+ [Op.ne]: null
}
}
},
fields: [ 'licence' ], // We don't care videos with an unknown licence
where: {
licence: {
- [Sequelize.Op.ne]: null
+ [Op.ne]: null
}
}
},
fields: [ 'language' ], // We don't care videos with an unknown language
where: {
language: {
- [Sequelize.Op.ne]: null
+ [Op.ne]: null
}
}
},
followerActorId: number
includeLocalVideos: boolean
+ withoutId?: boolean
+
filter?: VideoFilter
categoryOneOf?: number[]
nsfw?: boolean
historyOfUser?: UserModel
}
-@Scopes({
+@Scopes(() => ({
[ ScopeNames.FOR_API ]: (options: ForAPIOptions) => {
- const query: IFindOptions<VideoModel> = {
+ const query: FindOptions = {
where: {
id: {
- [ Sequelize.Op.any ]: options.ids
+ [ Op.in ]: options.ids // FIXME: sequelize ANY seems broken
}
},
include: [
{
model: VideoChannelModel.scope({ method: [ VideoChannelScopeNames.SUMMARY, true ] }),
required: true
+ },
+ {
+ attributes: [ 'type', 'filename' ],
+ model: ThumbnailModel,
+ required: false
}
]
}
return query
},
[ ScopeNames.AVAILABLE_FOR_LIST_IDS ]: (options: AvailableForListIDsOptions) => {
- const query: IFindOptions<VideoModel> = {
+ const attributes = options.withoutId === true ? [] : [ 'id' ]
+
+ const query: FindOptions = {
raw: true,
- attributes: [ 'id' ],
+ attributes,
where: {
id: {
- [ Sequelize.Op.and ]: [
+ [ Op.and ]: [
{
- [ Sequelize.Op.notIn ]: Sequelize.literal(
+ [ Op.notIn ]: Sequelize.literal(
'(SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")'
)
}
]
},
channelId: {
- [ Sequelize.Op.notIn ]: Sequelize.literal(
+ [ Op.notIn ]: Sequelize.literal(
'(' +
'SELECT id FROM "videoChannel" WHERE "accountId" IN (' +
buildBlockedAccountSQL(options.serverAccountId, options.user ? options.user.Account.id : undefined) +
// Always list public videos
privacy: VideoPrivacy.PUBLIC,
// Always list published videos, or videos that are being transcoded but on which we don't want to wait for transcoding
- [ Sequelize.Op.or ]: [
+ [ Op.or ]: [
{
state: VideoState.PUBLISHED
},
{
- [ Sequelize.Op.and ]: {
+ [ Op.and ]: {
state: VideoState.TO_TRANSCODE,
waitTranscoding: false
}
}
if (options.filter || options.accountId || options.videoChannelId) {
- const videoChannelInclude: IIncludeOptions = {
+ const videoChannelInclude: IncludeOptions = {
attributes: [],
model: VideoChannelModel.unscoped(),
required: true
}
if (options.filter || options.accountId) {
- const accountInclude: IIncludeOptions = {
+ const accountInclude: IncludeOptions = {
attributes: [],
model: AccountModel.unscoped(),
required: true
// Force actorId to be a number to avoid SQL injections
const actorIdNumber = parseInt(options.followerActorId.toString(), 10)
- query.where[ 'id' ][ Sequelize.Op.and ].push({
- [ Sequelize.Op.in ]: Sequelize.literal(
+ query.where[ 'id' ][ Op.and ].push({
+ [ Op.in ]: Sequelize.literal(
'(' +
'SELECT "videoShare"."videoId" AS "id" FROM "videoShare" ' +
'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' +
}
if (options.withFiles === true) {
- query.where[ 'id' ][ Sequelize.Op.and ].push({
- [ Sequelize.Op.in ]: Sequelize.literal(
+ query.where[ 'id' ][ Op.and ].push({
+ [ Op.in ]: Sequelize.literal(
'(SELECT "videoId" FROM "videoFile")'
)
})
}
if (options.tagsOneOf) {
- query.where[ 'id' ][ Sequelize.Op.and ].push({
- [ Sequelize.Op.in ]: Sequelize.literal(
+ query.where[ 'id' ][ Op.and ].push({
+ [ Op.in ]: Sequelize.literal(
'(' +
'SELECT "videoId" FROM "videoTag" ' +
'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
}
if (options.tagsAllOf) {
- query.where[ 'id' ][ Sequelize.Op.and ].push({
- [ Sequelize.Op.in ]: Sequelize.literal(
+ query.where[ 'id' ][ Op.and ].push({
+ [ Op.in ]: Sequelize.literal(
'(' +
'SELECT "videoId" FROM "videoTag" ' +
'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
if (options.categoryOneOf) {
query.where[ 'category' ] = {
- [ Sequelize.Op.or ]: options.categoryOneOf
+ [ Op.or ]: options.categoryOneOf
}
}
if (options.licenceOneOf) {
query.where[ 'licence' ] = {
- [ Sequelize.Op.or ]: options.licenceOneOf
+ [ Op.or ]: options.licenceOneOf
}
}
if (options.languageOneOf) {
query.where[ 'language' ] = {
- [ Sequelize.Op.or ]: options.languageOneOf
+ [ Op.or ]: options.languageOneOf
}
}
[ ScopeNames.WITH_THUMBNAILS ]: {
include: [
{
- model: () => ThumbnailModel,
+ model: ThumbnailModel,
required: false
}
]
include: [
{
attributes: [ 'accountId' ],
- model: () => VideoChannelModel.unscoped(),
+ model: VideoChannelModel.unscoped(),
required: true,
include: [
{
attributes: [ 'userId' ],
- model: () => AccountModel.unscoped(),
+ model: AccountModel.unscoped(),
required: true
}
]
[ ScopeNames.WITH_ACCOUNT_DETAILS ]: {
include: [
{
- model: () => VideoChannelModel.unscoped(),
+ model: VideoChannelModel.unscoped(),
required: true,
include: [
{
attributes: {
exclude: [ 'privateKey', 'publicKey' ]
},
- model: () => ActorModel.unscoped(),
+ model: ActorModel.unscoped(),
required: true,
include: [
{
attributes: [ 'host' ],
- model: () => ServerModel.unscoped(),
+ model: ServerModel.unscoped(),
required: false
},
{
- model: () => AvatarModel.unscoped(),
+ model: AvatarModel.unscoped(),
required: false
}
]
},
{
- model: () => AccountModel.unscoped(),
+ model: AccountModel.unscoped(),
required: true,
include: [
{
- model: () => ActorModel.unscoped(),
+ model: ActorModel.unscoped(),
attributes: {
exclude: [ 'privateKey', 'publicKey' ]
},
include: [
{
attributes: [ 'host' ],
- model: () => ServerModel.unscoped(),
+ model: ServerModel.unscoped(),
required: false
},
{
- model: () => AvatarModel.unscoped(),
+ model: AvatarModel.unscoped(),
required: false
}
]
]
},
[ ScopeNames.WITH_TAGS ]: {
- include: [ () => TagModel ]
+ include: [ TagModel ]
},
[ ScopeNames.WITH_BLACKLISTED ]: {
include: [
{
attributes: [ 'id', 'reason' ],
- model: () => VideoBlacklistModel,
+ model: VideoBlacklistModel,
required: false
}
]
include: [
{
model: VideoFileModel.unscoped(),
- // FIXME: typings
- [ 'separate' as any ]: true, // We may have multiple files, having multiple redundancies so let's separate this join
+ separate: true, // We may have multiple files, having multiple redundancies so let's separate this join
required: false,
include: subInclude
}
include: [
{
model: VideoStreamingPlaylistModel.unscoped(),
- // FIXME: typings
- [ 'separate' as any ]: true, // We may have multiple streaming playlists, having multiple redundancies so let's separate this join
+ separate: true, // We may have multiple streaming playlists, having multiple redundancies so let's separate this join
required: false,
include: subInclude
}
[ ScopeNames.WITH_SCHEDULED_UPDATE ]: {
include: [
{
- model: () => ScheduleVideoUpdateModel.unscoped(),
+ model: ScheduleVideoUpdateModel.unscoped(),
required: false
}
]
]
}
}
-})
+}))
@Table({
tableName: 'video',
indexes
@AllowNull(true)
@Default(null)
- @Is('VideoCategory', value => throwIfNotValid(value, isVideoCategoryValid, 'category'))
+ @Is('VideoCategory', value => throwIfNotValid(value, isVideoCategoryValid, 'category', true))
@Column
category: number
@AllowNull(true)
@Default(null)
- @Is('VideoLicence', value => throwIfNotValid(value, isVideoLicenceValid, 'licence'))
+ @Is('VideoLicence', value => throwIfNotValid(value, isVideoLicenceValid, 'licence', true))
@Column
licence: number
@AllowNull(true)
@Default(null)
- @Is('VideoLanguage', value => throwIfNotValid(value, isVideoLanguageValid, 'language'))
+ @Is('VideoLanguage', value => throwIfNotValid(value, isVideoLanguageValid, 'language', true))
@Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.LANGUAGE.max))
language: string
@AllowNull(true)
@Default(null)
- @Is('VideoDescription', value => throwIfNotValid(value, isVideoDescriptionValid, 'description'))
+ @Is('VideoDescription', value => throwIfNotValid(value, isVideoDescriptionValid, 'description', true))
@Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.DESCRIPTION.max))
description: string
@AllowNull(true)
@Default(null)
- @Is('VideoSupport', value => throwIfNotValid(value, isVideoSupportValid, 'support'))
+ @Is('VideoSupport', value => throwIfNotValid(value, isVideoSupportValid, 'support', true))
@Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.SUPPORT.max))
support: string
updatedAt: Date
@AllowNull(false)
- @Default(Sequelize.NOW)
+ @Default(DataType.NOW)
@Column
publishedAt: Date
distinct: true,
offset: start,
limit: count,
- order: getVideoSort('createdAt', [ 'Tags', 'name', 'ASC' ]),
+ order: getVideoSort('createdAt', [ 'Tags', 'name', 'ASC' ] as any), // FIXME: sequelize typings
where: {
id: {
- [ Sequelize.Op.in ]: Sequelize.literal('(' + rawQuery + ')')
+ [ Op.in ]: Sequelize.literal('(' + rawQuery + ')')
},
- [ Sequelize.Op.or ]: [
+ [ Op.or ]: [
{ privacy: VideoPrivacy.PUBLIC },
{ privacy: VideoPrivacy.UNLISTED }
]
required: false,
// We only want videos shared by this actor
where: {
- [ Sequelize.Op.and ]: [
+ [ Op.and ]: [
{
id: {
- [ Sequelize.Op.not ]: null
+ [ Op.not ]: null
}
},
{
}
return Bluebird.all([
- // FIXME: typing issue
- VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findAll(query as any),
- VideoModel.sequelize.query(rawCountQuery, { type: Sequelize.QueryTypes.SELECT })
+ VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findAll(query),
+ VideoModel.sequelize.query<{ total: string }>(rawCountQuery, { type: QueryTypes.SELECT })
]).then(([ rows, totals ]) => {
// totals: totalVideos + totalVideoShares
let totalVideos = 0
}
static listUserVideosForApi (accountId: number, start: number, count: number, sort: string, withFiles = false) {
- const query: IFindOptions<VideoModel> = {
- offset: start,
- limit: count,
- order: getVideoSort(sort),
- include: [
- {
- model: VideoChannelModel,
- required: true,
- include: [
- {
- model: AccountModel,
- where: {
- id: accountId
- },
- required: true
- }
- ]
- },
- {
- model: ScheduleVideoUpdateModel,
- required: false
- },
- {
- model: VideoBlacklistModel,
- required: false
- }
- ]
+ function buildBaseQuery (): FindOptions {
+ return {
+ offset: start,
+ limit: count,
+ order: getVideoSort(sort),
+ include: [
+ {
+ model: VideoChannelModel,
+ required: true,
+ include: [
+ {
+ model: AccountModel,
+ where: {
+ id: accountId
+ },
+ required: true
+ }
+ ]
+ }
+ ]
+ }
}
+ const countQuery = buildBaseQuery()
+ const findQuery = buildBaseQuery()
+
+ const findScopes = [
+ ScopeNames.WITH_SCHEDULED_UPDATE,
+ ScopeNames.WITH_BLACKLISTED,
+ ScopeNames.WITH_THUMBNAILS
+ ]
+
if (withFiles === true) {
- query.include.push({
+ findQuery.include.push({
model: VideoFileModel.unscoped(),
required: true
})
}
- return VideoModel.scope(ScopeNames.WITH_THUMBNAILS)
- .findAndCountAll(query)
- .then(({ rows, count }) => {
- return {
- data: rows,
- total: count
- }
- })
+ return Promise.all([
+ VideoModel.count(countQuery),
+ VideoModel.scope(findScopes).findAll(findQuery)
+ ]).then(([ count, rows ]) => {
+ return {
+ data: rows,
+ total: count
+ }
+ })
}
static async listForApi (options: {
throw new Error('Try to filter all-local but no user has not the see all videos right')
}
- const query: IFindOptions<VideoModel> = {
+ const query: FindOptions = {
offset: options.start,
limit: options.count,
order: getVideoSort(options.sort)
if (options.startDate || options.endDate) {
const publishedAtRange = {}
- if (options.startDate) publishedAtRange[ Sequelize.Op.gte ] = options.startDate
- if (options.endDate) publishedAtRange[ Sequelize.Op.lte ] = options.endDate
+ if (options.startDate) publishedAtRange[ Op.gte ] = options.startDate
+ if (options.endDate) publishedAtRange[ Op.lte ] = options.endDate
whereAnd.push({ publishedAt: publishedAtRange })
}
if (options.originallyPublishedStartDate || options.originallyPublishedEndDate) {
const originallyPublishedAtRange = {}
- if (options.originallyPublishedStartDate) originallyPublishedAtRange[ Sequelize.Op.gte ] = options.originallyPublishedStartDate
- if (options.originallyPublishedEndDate) originallyPublishedAtRange[ Sequelize.Op.lte ] = options.originallyPublishedEndDate
+ if (options.originallyPublishedStartDate) originallyPublishedAtRange[ Op.gte ] = options.originallyPublishedStartDate
+ if (options.originallyPublishedEndDate) originallyPublishedAtRange[ Op.lte ] = options.originallyPublishedEndDate
whereAnd.push({ originallyPublishedAt: originallyPublishedAtRange })
}
if (options.durationMin || options.durationMax) {
const durationRange = {}
- if (options.durationMin) durationRange[ Sequelize.Op.gte ] = options.durationMin
- if (options.durationMax) durationRange[ Sequelize.Op.lte ] = options.durationMax
+ if (options.durationMin) durationRange[ Op.gte ] = options.durationMin
+ if (options.durationMax) durationRange[ Op.lte ] = options.durationMax
whereAnd.push({ duration: durationRange })
}
whereAnd.push(
{
id: {
- [ Sequelize.Op.in ]: Sequelize.literal(
+ [ Op.in ]: Sequelize.literal(
'(' +
'SELECT "video"."id" FROM "video" ' +
'WHERE ' +
)
}
- const query: IFindOptions<VideoModel> = {
+ const query: FindOptions = {
attributes: {
include: attributesInclude
},
limit: options.count,
order: getVideoSort(options.sort),
where: {
- [ Sequelize.Op.and ]: whereAnd
+ [ Op.and ]: whereAnd
}
}
return VideoModel.getAvailableForApi(query, queryOptions)
}
- static load (id: number | string, t?: Sequelize.Transaction) {
+ static load (id: number | string, t?: Transaction) {
const where = buildWhereIdOrUUID(id)
const options = {
where,
return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options)
}
- static loadWithRights (id: number | string, t?: Sequelize.Transaction) {
+ static loadWithRights (id: number | string, t?: Transaction) {
const where = buildWhereIdOrUUID(id)
const options = {
where,
]).findOne(options)
}
- static loadOnlyId (id: number | string, t?: Sequelize.Transaction) {
+ static loadOnlyId (id: number | string, t?: Transaction) {
const where = buildWhereIdOrUUID(id)
const options = {
return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options)
}
- static loadWithFiles (id: number, t?: Sequelize.Transaction, logging?: boolean) {
+ static loadWithFiles (id: number, t?: Transaction, logging?: boolean) {
return VideoModel.scope([
ScopeNames.WITH_FILES,
ScopeNames.WITH_STREAMING_PLAYLISTS,
return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options)
}
- static loadByUrl (url: string, transaction?: Sequelize.Transaction) {
- const query: IFindOptions<VideoModel> = {
+ static loadByUrl (url: string, transaction?: Transaction) {
+ const query: FindOptions = {
where: {
url
},
return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(query)
}
- static loadByUrlAndPopulateAccount (url: string, transaction?: Sequelize.Transaction) {
- const query: IFindOptions<VideoModel> = {
+ static loadByUrlAndPopulateAccount (url: string, transaction?: Transaction) {
+ const query: FindOptions = {
where: {
url
},
]).findOne(query)
}
- static loadAndPopulateAccountAndServerAndTags (id: number | string, t?: Sequelize.Transaction, userId?: number) {
+ static loadAndPopulateAccountAndServerAndTags (id: number | string, t?: Transaction, userId?: number) {
const where = buildWhereIdOrUUID(id)
const options = {
- order: [ [ 'Tags', 'name', 'ASC' ] ],
+ order: [ [ 'Tags', 'name', 'ASC' ] ] as any,
where,
transaction: t
}
- const scopes = [
+ const scopes: (string | ScopeOptions)[] = [
ScopeNames.WITH_TAGS,
ScopeNames.WITH_BLACKLISTED,
ScopeNames.WITH_ACCOUNT_DETAILS,
]
if (userId) {
- scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] } as any) // FIXME: typings
+ scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] })
}
return VideoModel
.findOne(options)
}
- static loadForGetAPI (id: number | string, t?: Sequelize.Transaction, userId?: number) {
+ static loadForGetAPI (id: number | string, t?: Transaction, userId?: number) {
const where = buildWhereIdOrUUID(id)
const options = {
- order: [ [ 'Tags', 'name', 'ASC' ] ],
+ order: [ [ 'Tags', 'name', 'ASC' ] ] as any, // FIXME: sequelize typings
where,
transaction: t
}
- const scopes = [
+ const scopes: (string | ScopeOptions)[] = [
ScopeNames.WITH_TAGS,
ScopeNames.WITH_BLACKLISTED,
ScopeNames.WITH_ACCOUNT_DETAILS,
ScopeNames.WITH_SCHEDULED_UPDATE,
ScopeNames.WITH_THUMBNAILS,
- { method: [ ScopeNames.WITH_FILES, true ] } as any, // FIXME: typings
- { method: [ ScopeNames.WITH_STREAMING_PLAYLISTS, true ] } as any // FIXME: typings
+ { method: [ ScopeNames.WITH_FILES, true ] },
+ { method: [ ScopeNames.WITH_STREAMING_PLAYLISTS, true ] }
]
if (userId) {
- scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] } as any) // FIXME: typings
+ scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] })
}
return VideoModel
'LIMIT 1'
const options = {
- type: Sequelize.QueryTypes.SELECT,
+ type: QueryTypes.SELECT,
bind: { followerActorId, videoId },
raw: true
}
const scopeOptions: AvailableForListIDsOptions = {
serverAccountId: serverActor.Account.id,
followerActorId,
- includeLocalVideos: true
+ includeLocalVideos: true,
+ withoutId: true // Don't break aggregation
}
- const query: IFindOptions<VideoModel> = {
+ const query: FindOptions = {
attributes: [ field ],
limit: count,
group: field,
- having: Sequelize.where(Sequelize.fn('COUNT', Sequelize.col(field)), {
- [ Sequelize.Op.gte ]: threshold
- }) as any, // FIXME: typings
- order: [ this.sequelize.random() ]
+ having: Sequelize.where(
+ Sequelize.fn('COUNT', Sequelize.col(field)), { [ Op.gte ]: threshold }
+ ),
+ order: [ (this.sequelize as any).random() ]
}
return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST_IDS, scopeOptions ] })
required: false,
where: {
startDate: {
- [ Sequelize.Op.gte ]: new Date(new Date().getTime() - (24 * 3600 * 1000) * trendingDays)
+ [ Op.gte ]: new Date(new Date().getTime() - (24 * 3600 * 1000) * trendingDays)
}
}
}
}
private static async getAvailableForApi (
- query: IFindOptions<VideoModel>,
+ query: FindOptions,
options: AvailableForListIDsOptions,
countVideos = true
) {
- const idsScope = {
+ const idsScope: ScopeOptions = {
method: [
ScopeNames.AVAILABLE_FOR_LIST_IDS, options
]
// Remove trending sort on count, because it uses a group by
const countOptions = Object.assign({}, options, { trendingDays: undefined })
- const countQuery = Object.assign({}, query, { attributes: undefined, group: undefined })
- const countScope = {
+ const countQuery: CountOptions = Object.assign({}, query, { attributes: undefined, group: undefined })
+ const countScope: ScopeOptions = {
method: [
ScopeNames.AVAILABLE_FOR_LIST_IDS, countOptions
]
if (ids.length === 0) return { data: [], total: count }
- const secondQuery: IFindOptions<VideoModel> = {
+ const secondQuery: FindOptions = {
offset: 0,
limit: query.limit,
attributes: query.attributes,
]
}
- // FIXME: typing
- const apiScope: any[] = [ ScopeNames.WITH_THUMBNAILS ]
+ const apiScope: (string | ScopeOptions)[] = []
if (options.user) {
apiScope.push({ method: [ ScopeNames.WITH_USER_HISTORY, options.user.id ] })
-
- // Even if the relation is n:m, we know that a user only have 0..1 video history
- // So we won't have multiple rows for the same video
- // A subquery adds some bugs in our query so disable it
- secondQuery.subQuery = false
}
apiScope.push({
return maxBy(this.VideoFiles, file => file.resolution)
}
- addThumbnail (thumbnail: ThumbnailModel) {
+ async addAndSaveThumbnail (thumbnail: ThumbnailModel, transaction: Transaction) {
+ thumbnail.videoId = this.id
+
+ const savedThumbnail = await thumbnail.save({ transaction })
+
if (Array.isArray(this.Thumbnails) === false) this.Thumbnails = []
// Already have this thumbnail, skip
- if (this.Thumbnails.find(t => t.id === thumbnail.id)) return
+ if (this.Thumbnails.find(t => t.id === savedThumbnail.id)) return
- this.Thumbnails.push(thumbnail)
+ this.Thumbnails.push(savedThumbnail)
}
getVideoFilename (videoFile: VideoFileModel) {
return this.uuid + '.jpg'
}
- getThumbnail () {
+ getMiniature () {
if (Array.isArray(this.Thumbnails) === false) return undefined
- return this.Thumbnails.find(t => t.type === ThumbnailType.THUMBNAIL)
+ return this.Thumbnails.find(t => t.type === ThumbnailType.MINIATURE)
}
generatePreviewName () {
return '/videos/embed/' + this.uuid
}
- getThumbnailStaticPath () {
- const thumbnail = this.getThumbnail()
+ getMiniatureStaticPath () {
+ const thumbnail = this.getMiniature()
if (!thumbnail) return null
return join(STATIC_PATHS.THUMBNAILS, thumbnail.filename)
projects / github / Chocobozzz / PeerTube.git / blobdiff