import {
AllowNull,
- BeforeDestroy,
BelongsTo,
Column,
CreatedAt,
Default,
ForeignKey,
HasMany,
+ HasOne,
Is,
IsUUID,
Model,
Table,
UpdatedAt
} from 'sequelize-typescript'
-import * as Sequelize from 'sequelize'
import { VideoPlaylistPrivacy } from '../../../shared/models/videos/playlist/video-playlist-privacy.model'
-import { buildServerIdsFollowedBy, buildWhereIdOrUUID, getSort, throwIfNotValid } from '../utils'
+import { buildServerIdsFollowedBy, buildWhereIdOrUUID, getSort, isOutdated, throwIfNotValid } from '../utils'
import {
isVideoPlaylistDescriptionValid,
isVideoPlaylistNameValid,
} from '../../helpers/custom-validators/video-playlists'
import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
import {
- CONFIG,
+ ACTIVITY_PUB,
CONSTRAINTS_FIELDS,
STATIC_PATHS,
THUMBNAILS_SIZE,
VIDEO_PLAYLIST_PRIVACIES,
- VIDEO_PLAYLIST_TYPES
-} from '../../initializers'
+ VIDEO_PLAYLIST_TYPES,
+ WEBSERVER
+} from '../../initializers/constants'
import { VideoPlaylist } from '../../../shared/models/videos/playlist/video-playlist.model'
-import { AccountModel, ScopeNames as AccountScopeNames } from '../account/account'
+import { AccountModel, ScopeNames as AccountScopeNames, SummaryOptions } from '../account/account'
import { ScopeNames as VideoChannelScopeNames, VideoChannelModel } from './video-channel'
import { join } from 'path'
import { VideoPlaylistElementModel } from './video-playlist-element'
import { PlaylistObject } from '../../../shared/models/activitypub/objects/playlist-object'
import { activityPubCollectionPagination } from '../../helpers/activitypub'
-import { remove } from 'fs-extra'
-import { logger } from '../../helpers/logger'
import { VideoPlaylistType } from '../../../shared/models/videos/playlist/video-playlist-type.model'
+import { ThumbnailModel } from './thumbnail'
+import { ActivityIconObject } from '../../../shared/models/activitypub/objects'
+import { FindOptions, literal, Op, ScopeOptions, Transaction, WhereOptions } from 'sequelize'
+import * as Bluebird from 'bluebird'
+import {
+ MVideoPlaylistAccountThumbnail,
+ MVideoPlaylistAP,
+ MVideoPlaylistFormattable,
+ MVideoPlaylistFull,
+ MVideoPlaylistFullSummary,
+ MVideoPlaylistIdWithElements
+} from '../../typings/models/video/video-playlist'
+import { MThumbnail } from '../../typings/models/video/thumbnail'
enum ScopeNames {
AVAILABLE_FOR_LIST = 'AVAILABLE_FOR_LIST',
WITH_VIDEOS_LENGTH = 'WITH_VIDEOS_LENGTH',
WITH_ACCOUNT_AND_CHANNEL_SUMMARY = 'WITH_ACCOUNT_AND_CHANNEL_SUMMARY',
WITH_ACCOUNT = 'WITH_ACCOUNT',
+ WITH_THUMBNAIL = 'WITH_THUMBNAIL',
WITH_ACCOUNT_AND_CHANNEL = 'WITH_ACCOUNT_AND_CHANNEL'
}
type?: VideoPlaylistType
accountId?: number
videoChannelId?: number
- privateAndUnlisted?: boolean
+ listMyPlaylists?: boolean
+ search?: string
}
-@Scopes({
- [ ScopeNames.WITH_VIDEOS_LENGTH ]: {
+@Scopes(() => ({
+ [ScopeNames.WITH_THUMBNAIL]: {
+ include: [
+ {
+ model: ThumbnailModel,
+ required: false
+ }
+ ]
+ },
+ [ScopeNames.WITH_VIDEOS_LENGTH]: {
attributes: {
include: [
[
- Sequelize.literal('(SELECT COUNT("id") FROM "videoPlaylistElement" WHERE "videoPlaylistId" = "VideoPlaylistModel"."id")'),
+ literal('(SELECT COUNT("id") FROM "videoPlaylistElement" WHERE "videoPlaylistId" = "VideoPlaylistModel"."id")'),
'videosLength'
]
]
}
- },
- [ ScopeNames.WITH_ACCOUNT ]: {
+ } as FindOptions,
+ [ScopeNames.WITH_ACCOUNT]: {
include: [
{
- model: () => AccountModel,
+ model: AccountModel,
required: true
}
]
},
- [ ScopeNames.WITH_ACCOUNT_AND_CHANNEL_SUMMARY ]: {
+ [ScopeNames.WITH_ACCOUNT_AND_CHANNEL_SUMMARY]: {
include: [
{
- model: () => AccountModel.scope(AccountScopeNames.SUMMARY),
+ model: AccountModel.scope(AccountScopeNames.SUMMARY),
required: true
},
{
- model: () => VideoChannelModel.scope(VideoChannelScopeNames.SUMMARY),
+ model: VideoChannelModel.scope(VideoChannelScopeNames.SUMMARY),
required: false
}
]
},
- [ ScopeNames.WITH_ACCOUNT_AND_CHANNEL ]: {
+ [ScopeNames.WITH_ACCOUNT_AND_CHANNEL]: {
include: [
{
- model: () => AccountModel,
+ model: AccountModel,
required: true
},
{
- model: () => VideoChannelModel,
+ model: VideoChannelModel,
required: false
}
]
},
- [ ScopeNames.AVAILABLE_FOR_LIST ]: (options: AvailableForListOptions) => {
- // Only list local playlists OR playlists that are on an instance followed by actorId
- const inQueryInstanceFollow = buildServerIdsFollowedBy(options.followerActorId)
- const actorWhere = {
- [ Sequelize.Op.or ]: [
- {
- serverId: null
- },
- {
- serverId: {
- [ Sequelize.Op.in ]: Sequelize.literal(inQueryInstanceFollow)
- }
- }
- ]
- }
+ [ScopeNames.AVAILABLE_FOR_LIST]: (options: AvailableForListOptions) => {
+
+ let whereActor: WhereOptions = {}
- const whereAnd: any[] = []
+ const whereAnd: WhereOptions[] = []
- if (options.privateAndUnlisted !== true) {
+ if (options.listMyPlaylists !== true) {
whereAnd.push({
privacy: VideoPlaylistPrivacy.PUBLIC
})
+
+ // Only list local playlists OR playlists that are on an instance followed by actorId
+ const inQueryInstanceFollow = buildServerIdsFollowedBy(options.followerActorId)
+
+ whereActor = {
+ [Op.or]: [
+ {
+ serverId: null
+ },
+ {
+ serverId: {
+ [Op.in]: literal(inQueryInstanceFollow)
+ }
+ }
+ ]
+ }
}
if (options.accountId) {
})
}
+ if (options.search) {
+ whereAnd.push({
+ name: {
+ [Op.iLike]: '%' + options.search + '%'
+ }
+ })
+ }
+
const where = {
- [Sequelize.Op.and]: whereAnd
+ [Op.and]: whereAnd
}
const accountScope = {
- method: [ AccountScopeNames.SUMMARY, actorWhere ]
+ method: [ AccountScopeNames.SUMMARY, { whereActor } as SummaryOptions ]
}
return {
required: false
}
]
- }
+ } as FindOptions
}
-})
+}))
@Table({
tableName: 'videoPlaylist',
name: string
@AllowNull(true)
- @Is('VideoPlaylistDescription', value => throwIfNotValid(value, isVideoPlaylistDescriptionValid, 'description'))
+ @Is('VideoPlaylistDescription', value => throwIfNotValid(value, isVideoPlaylistDescriptionValid, 'description', true))
@Column
description: string
})
VideoPlaylistElements: VideoPlaylistElementModel[]
- @BeforeDestroy
- static async removeFiles (instance: VideoPlaylistModel) {
- logger.info('Removing files of video playlist %s.', instance.url)
-
- return instance.removeThumbnail()
- }
+ @HasOne(() => ThumbnailModel, {
+ foreignKey: {
+ name: 'videoPlaylistId',
+ allowNull: true
+ },
+ onDelete: 'CASCADE',
+ hooks: true
+ })
+ Thumbnail: ThumbnailModel
static listForApi (options: {
followerActorId: number
- start: number,
- count: number,
- sort: string,
- type?: VideoPlaylistType,
- accountId?: number,
- videoChannelId?: number,
- privateAndUnlisted?: boolean
+ start: number
+ count: number
+ sort: string
+ type?: VideoPlaylistType
+ accountId?: number
+ videoChannelId?: number
+ listMyPlaylists?: boolean
+ search?: string
}) {
const query = {
offset: options.start,
order: getSort(options.sort)
}
- const scopes = [
+ const scopes: (string | ScopeOptions)[] = [
{
method: [
ScopeNames.AVAILABLE_FOR_LIST,
followerActorId: options.followerActorId,
accountId: options.accountId,
videoChannelId: options.videoChannelId,
- privateAndUnlisted: options.privateAndUnlisted
+ listMyPlaylists: options.listMyPlaylists,
+ search: options.search
} as AvailableForListOptions
]
- } as any, // FIXME: typings
- ScopeNames.WITH_VIDEOS_LENGTH
+ },
+ ScopeNames.WITH_VIDEOS_LENGTH,
+ ScopeNames.WITH_THUMBNAIL
]
return VideoPlaylistModel
})
}
- static listUrlsOfForAP (accountId: number, start: number, count: number) {
+ static listPublicUrlsOfForAP (accountId: number, start: number, count: number) {
const query = {
attributes: [ 'url' ],
offset: start,
limit: count,
where: {
- ownerAccountId: accountId
+ ownerAccountId: accountId,
+ privacy: VideoPlaylistPrivacy.PUBLIC
}
}
})
}
+ static listPlaylistIdsOf (accountId: number, videoIds: number[]): Bluebird<MVideoPlaylistIdWithElements[]> {
+ const query = {
+ attributes: [ 'id' ],
+ where: {
+ ownerAccountId: accountId
+ },
+ include: [
+ {
+ attributes: [ 'id', 'videoId', 'startTimestamp', 'stopTimestamp' ],
+ model: VideoPlaylistElementModel.unscoped(),
+ where: {
+ videoId: {
+ [Op.in]: videoIds
+ }
+ },
+ required: true
+ }
+ ]
+ }
+
+ return VideoPlaylistModel.findAll(query)
+ }
+
static doesPlaylistExist (url: string) {
const query = {
attributes: [],
.then(e => !!e)
}
- static loadWithAccountAndChannelSummary (id: number | string, transaction: Sequelize.Transaction) {
+ static loadWithAccountAndChannelSummary (id: number | string, transaction: Transaction): Bluebird<MVideoPlaylistFullSummary> {
const where = buildWhereIdOrUUID(id)
const query = {
}
return VideoPlaylistModel
- .scope([ ScopeNames.WITH_ACCOUNT_AND_CHANNEL_SUMMARY, ScopeNames.WITH_VIDEOS_LENGTH ])
+ .scope([ ScopeNames.WITH_ACCOUNT_AND_CHANNEL_SUMMARY, ScopeNames.WITH_VIDEOS_LENGTH, ScopeNames.WITH_THUMBNAIL ])
.findOne(query)
}
- static loadWithAccountAndChannel (id: number | string, transaction: Sequelize.Transaction) {
+ static loadWithAccountAndChannel (id: number | string, transaction: Transaction): Bluebird<MVideoPlaylistFull> {
const where = buildWhereIdOrUUID(id)
const query = {
}
return VideoPlaylistModel
- .scope([ ScopeNames.WITH_ACCOUNT_AND_CHANNEL, ScopeNames.WITH_VIDEOS_LENGTH ])
+ .scope([ ScopeNames.WITH_ACCOUNT_AND_CHANNEL, ScopeNames.WITH_VIDEOS_LENGTH, ScopeNames.WITH_THUMBNAIL ])
.findOne(query)
}
- static loadByUrlAndPopulateAccount (url: string) {
+ static loadByUrlAndPopulateAccount (url: string): Bluebird<MVideoPlaylistAccountThumbnail> {
const query = {
where: {
url
}
}
- return VideoPlaylistModel.scope(ScopeNames.WITH_ACCOUNT).findOne(query)
+ return VideoPlaylistModel.scope([ ScopeNames.WITH_ACCOUNT, ScopeNames.WITH_THUMBNAIL ]).findOne(query)
}
static getPrivacyLabel (privacy: VideoPlaylistPrivacy) {
return VIDEO_PLAYLIST_TYPES[type] || 'Unknown'
}
- static resetPlaylistsOfChannel (videoChannelId: number, transaction: Sequelize.Transaction) {
+ static resetPlaylistsOfChannel (videoChannelId: number, transaction: Transaction) {
const query = {
where: {
videoChannelId
return VideoPlaylistModel.update({ privacy: VideoPlaylistPrivacy.PRIVATE, videoChannelId: null }, query)
}
- getThumbnailName () {
+ async setAndSaveThumbnail (thumbnail: MThumbnail, t: Transaction) {
+ thumbnail.videoPlaylistId = this.id
+
+ this.Thumbnail = await thumbnail.save({ transaction: t })
+ }
+
+ hasThumbnail () {
+ return !!this.Thumbnail
+ }
+
+ hasGeneratedThumbnail () {
+ return this.hasThumbnail() && this.Thumbnail.automaticallyGenerated === true
+ }
+
+ generateThumbnailName () {
const extension = '.jpg'
return 'playlist-' + this.uuid + extension
}
getThumbnailUrl () {
- return CONFIG.WEBSERVER.URL + STATIC_PATHS.THUMBNAILS + this.getThumbnailName()
+ if (!this.hasThumbnail()) return null
+
+ return WEBSERVER.URL + STATIC_PATHS.THUMBNAILS + this.Thumbnail.filename
}
getThumbnailStaticPath () {
- return join(STATIC_PATHS.THUMBNAILS, this.getThumbnailName())
+ if (!this.hasThumbnail()) return null
+
+ return join(STATIC_PATHS.THUMBNAILS, this.Thumbnail.filename)
}
- removeThumbnail () {
- const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName())
- return remove(thumbnailPath)
- .catch(err => logger.warn('Cannot delete thumbnail %s.', thumbnailPath, { err }))
+ setAsRefreshed () {
+ this.changed('updatedAt', true)
+
+ return this.save()
}
isOwned () {
return this.OwnerAccount.isOwned()
}
- toFormattedJSON (): VideoPlaylist {
+ isOutdated () {
+ if (this.isOwned()) return false
+
+ return isOutdated(this, ACTIVITY_PUB.VIDEO_PLAYLIST_REFRESH_INTERVAL)
+ }
+
+ toFormattedJSON (this: MVideoPlaylistFormattable): VideoPlaylist {
return {
id: this.id,
uuid: this.uuid,
label: VideoPlaylistModel.getTypeLabel(this.type)
},
- videosLength: this.get('videosLength'),
+ videosLength: this.get('videosLength') as number,
createdAt: this.createdAt,
updatedAt: this.updatedAt,
}
}
- toActivityPubObject (
page: number, t: Sequelize.Transaction): Promise<PlaylistObject> {
+ toActivityPubObject (
this: MVideoPlaylistAP, page: number, t: Transaction): Promise<PlaylistObject> {
const handler = (start: number, count: number) => {
return VideoPlaylistElementModel.listUrlsOfForAP(this.id, start, count, t)
}
+ let icon: ActivityIconObject
+ if (this.hasThumbnail()) {
+ icon = {
+ type: 'Image' as 'Image',
+ url: this.getThumbnailUrl(),
+ mediaType: 'image/jpeg' as 'image/jpeg',
+ width: THUMBNAILS_SIZE.width,
+ height: THUMBNAILS_SIZE.height
+ }
+ }
+
return activityPubCollectionPagination(this.url, handler, page)
.then(o => {
return Object.assign(o, {
published: this.createdAt.toISOString(),
updated: this.updatedAt.toISOString(),
attributedTo: this.VideoChannel ? [ this.VideoChannel.Actor.url ] : [],
- icon: {
- type: 'Image' as 'Image',
- url: this.getThumbnailUrl(),
- mediaType: 'image/jpeg' as 'image/jpeg',
- width: THUMBNAILS_SIZE.width,
- height: THUMBNAILS_SIZE.height
- }
+ icon
})
})
}
projects / github / Chocobozzz / PeerTube.git / blobdiff