From a15871560f80e07386c1dabb8370cd2664ecfd1f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 31 Jan 2020 16:56:52 +0100 Subject: Move to eslint --- server/models/account/account-video-rate.ts | 12 +- server/models/account/account.ts | 8 +- server/models/account/user-notification.ts | 2 +- server/models/account/user.ts | 86 +++++++------- server/models/activitypub/actor-follow.ts | 53 ++++----- server/models/activitypub/actor.ts | 12 +- server/models/oauth/oauth-token.ts | 4 +- server/models/redundancy/video-redundancy.ts | 58 ++++----- server/models/server/plugin.ts | 8 +- server/models/utils.ts | 4 +- server/models/video/thumbnail.ts | 2 +- server/models/video/video-abuse.ts | 6 +- server/models/video/video-caption.ts | 7 +- server/models/video/video-channel.ts | 10 +- server/models/video/video-comment.ts | 20 ++-- server/models/video/video-format-utils.ts | 19 ++- server/models/video/video-playlist-element.ts | 8 +- server/models/video/video-playlist.ts | 34 +++--- server/models/video/video.ts | 165 +++++++++++++------------- 19 files changed, 260 insertions(+), 258 deletions(-) (limited to 'server/models') diff --git a/server/models/account/account-video-rate.ts b/server/models/account/account-video-rate.ts index c593595b2..8aeb486d1 100644 --- a/server/models/account/account-video-rate.ts +++ b/server/models/account/account-video-rate.ts @@ -99,7 +99,7 @@ export class AccountVideoRateModel extends Model { static loadByAccountAndVideoOrUrl (accountId: number, videoId: number, url: string, t?: Transaction): Bluebird { const options: FindOptions = { where: { - [ Op.or]: [ + [Op.or]: [ { accountId, videoId @@ -116,10 +116,10 @@ export class AccountVideoRateModel extends Model { } static listByAccountForApi (options: { - start: number, - count: number, - sort: string, - type?: string, + start: number + count: number + sort: string + type?: string accountId: number }) { const query: FindOptions = { @@ -135,7 +135,7 @@ export class AccountVideoRateModel extends Model { required: true, include: [ { - model: VideoChannelModel.scope({ method: [VideoChannelScopeNames.SUMMARY, { withAccount: true } as SummaryOptions ] }), + model: VideoChannelModel.scope({ method: [ VideoChannelScopeNames.SUMMARY, { withAccount: true } as SummaryOptions ] }), required: true } ] diff --git a/server/models/account/account.ts b/server/models/account/account.ts index 8a0ffeb63..0905a0fb2 100644 --- a/server/models/account/account.ts +++ b/server/models/account/account.ts @@ -53,7 +53,7 @@ export type SummaryOptions = { ] })) @Scopes(() => ({ - [ ScopeNames.SUMMARY ]: (options: SummaryOptions = {}) => { + [ScopeNames.SUMMARY]: (options: SummaryOptions = {}) => { const whereActor = options.whereActor || undefined const serverInclude: IncludeOptions = { @@ -254,15 +254,15 @@ export class AccountModel extends Model { const query = { where: { - [ Op.or ]: [ + [Op.or]: [ { userId: { - [ Op.ne ]: null + [Op.ne]: null } }, { applicationId: { - [ Op.ne ]: null + [Op.ne]: null } } ] diff --git a/server/models/account/user-notification.ts b/server/models/account/user-notification.ts index f649b8f95..5a725187a 100644 --- a/server/models/account/user-notification.ts +++ b/server/models/account/user-notification.ts @@ -379,7 +379,7 @@ export class UserNotificationModel extends Model { toFormattedJSON (this: UserNotificationModelForApi): UserNotification { const video = this.Video - ? Object.assign(this.formatVideo(this.Video),{ channel: this.formatActor(this.Video.VideoChannel) }) + ? Object.assign(this.formatVideo(this.Video), { channel: this.formatActor(this.Video.VideoChannel) }) : undefined const videoImport = this.VideoImport ? { diff --git a/server/models/account/user.ts b/server/models/account/user.ts index 4c2c5e278..fb4c15aef 100644 --- a/server/models/account/user.ts +++ b/server/models/account/user.ts @@ -1,4 +1,4 @@ -import { FindOptions, literal, Op, QueryTypes, where, fn, col } from 'sequelize' +import { FindOptions, literal, Op, QueryTypes, where, fn, col, WhereOptions } from 'sequelize' import { AfterDestroy, AfterUpdate, @@ -101,7 +101,7 @@ enum ScopeNames { required: true, where: { type: { - [ Op.ne ]: VideoPlaylistType.REGULAR + [Op.ne]: VideoPlaylistType.REGULAR } } } @@ -186,7 +186,10 @@ export class UserModel extends Model { @AllowNull(false) @Default(true) - @Is('UserAutoPlayNextVideoPlaylist', value => throwIfNotValid(value, isUserAutoPlayNextVideoPlaylistValid, 'auto play next video for playlists boolean')) + @Is( + 'UserAutoPlayNextVideoPlaylist', + value => throwIfNotValid(value, isUserAutoPlayNextVideoPlaylistValid, 'auto play next video for playlists boolean') + ) @Column autoPlayNextVideoPlaylist: boolean @@ -308,7 +311,8 @@ export class UserModel extends Model { } static listForApi (start: number, count: number, sort: string, search?: string) { - let where = undefined + let where: WhereOptions + if (search) { where = { [Op.or]: [ @@ -319,7 +323,7 @@ export class UserModel extends Model { }, { username: { - [ Op.iLike ]: '%' + search + '%' + [Op.iLike]: '%' + search + '%' } } ] @@ -332,14 +336,14 @@ export class UserModel extends Model { [ literal( '(' + - 'SELECT COALESCE(SUM("size"), 0) ' + - 'FROM (' + - 'SELECT MAX("videoFile"."size") AS "size" FROM "videoFile" ' + - 'INNER JOIN "video" ON "videoFile"."videoId" = "video"."id" ' + - 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' + - 'INNER JOIN "account" ON "videoChannel"."accountId" = "account"."id" ' + - 'WHERE "account"."userId" = "UserModel"."id" GROUP BY "video"."id"' + - ') t' + + 'SELECT COALESCE(SUM("size"), 0) ' + + 'FROM (' + + 'SELECT MAX("videoFile"."size") AS "size" FROM "videoFile" ' + + 'INNER JOIN "video" ON "videoFile"."videoId" = "video"."id" ' + + 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' + + 'INNER JOIN "account" ON "videoChannel"."accountId" = "account"."id" ' + + 'WHERE "account"."userId" = "UserModel"."id" GROUP BY "video"."id"' + + ') t' + ')' ), 'videoQuotaUsed' @@ -353,18 +357,18 @@ export class UserModel extends Model { } return UserModel.findAndCountAll(query) - .then(({ rows, count }) => { - return { - data: rows, - total: count - } - }) + .then(({ rows, count }) => { + return { + data: rows, + total: count + } + }) } static listWithRight (right: UserRight): Bluebird { const roles = Object.keys(USER_ROLE_LABELS) - .map(k => parseInt(k, 10) as UserRole) - .filter(role => hasUserRight(role, right)) + .map(k => parseInt(k, 10) as UserRole) + .filter(role => hasUserRight(role, right)) const query = { where: { @@ -390,7 +394,7 @@ export class UserModel extends Model { required: true, include: [ { - attributes: [ ], + attributes: [], model: ActorModel.unscoped(), required: true, where: { @@ -398,7 +402,7 @@ export class UserModel extends Model { }, include: [ { - attributes: [ ], + attributes: [], as: 'ActorFollowings', model: ActorFollowModel.unscoped(), required: true, @@ -433,7 +437,7 @@ export class UserModel extends Model { static loadByUsername (username: string): Bluebird { const query = { where: { - username: { [ Op.iLike ]: username } + username: { [Op.iLike]: username } } } @@ -443,7 +447,7 @@ export class UserModel extends Model { static loadForMeAPI (username: string): Bluebird { const query = { where: { - username: { [ Op.iLike ]: username } + username: { [Op.iLike]: username } } } @@ -465,7 +469,7 @@ export class UserModel extends Model { const query = { where: { - [ Op.or ]: [ + [Op.or]: [ where(fn('lower', col('username')), fn('lower', username)), { email } @@ -592,7 +596,7 @@ export class UserModel extends Model { const query = { where: { username: { - [ Op.like ]: `%${search}%` + [Op.like]: `%${search}%` } }, limit: 10 @@ -652,7 +656,7 @@ export class UserModel extends Model { videoLanguages: this.videoLanguages, role: this.role, - roleLabel: USER_ROLE_LABELS[ this.role ], + roleLabel: USER_ROLE_LABELS[this.role], videoQuota: this.videoQuota, videoQuotaDaily: this.videoQuotaDaily, @@ -686,13 +690,13 @@ export class UserModel extends Model { if (Array.isArray(this.Account.VideoChannels) === true) { json.videoChannels = this.Account.VideoChannels - .map(c => c.toFormattedJSON()) - .sort((v1, v2) => { - if (v1.createdAt < v2.createdAt) return -1 - if (v1.createdAt === v2.createdAt) return 0 + .map(c => c.toFormattedJSON()) + .sort((v1, v2) => { + if (v1.createdAt < v2.createdAt) return -1 + if (v1.createdAt === v2.createdAt) return 0 - return 1 - }) + return 1 + }) } return json @@ -702,7 +706,7 @@ export class UserModel extends Model { const formatted = this.toFormattedJSON() const specialPlaylists = this.Account.VideoPlaylists - .map(p => ({ id: p.id, name: p.name, type: p.type })) + .map(p => ({ id: p.id, name: p.name, type: p.type })) return Object.assign(formatted, { specialPlaylists }) } @@ -729,12 +733,12 @@ export class UserModel extends Model { return 'SELECT SUM("size") AS "total" ' + 'FROM (' + - 'SELECT MAX("videoFile"."size") AS "size" FROM "videoFile" ' + - 'INNER JOIN "video" ON "videoFile"."videoId" = "video"."id" ' + - 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' + - 'INNER JOIN "account" ON "videoChannel"."accountId" = "account"."id" ' + - 'WHERE "account"."userId" = $userId ' + andWhere + - 'GROUP BY "video"."id"' + + 'SELECT MAX("videoFile"."size") AS "size" FROM "videoFile" ' + + 'INNER JOIN "video" ON "videoFile"."videoId" = "video"."id" ' + + 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' + + 'INNER JOIN "account" ON "videoChannel"."accountId" = "account"."id" ' + + 'WHERE "account"."userId" = $userId ' + andWhere + + 'GROUP BY "video"."id"' + ') t' } diff --git a/server/models/activitypub/actor-follow.ts b/server/models/activitypub/actor-follow.ts index f21d2b8a2..27643704e 100644 --- a/server/models/activitypub/actor-follow.ts +++ b/server/models/activitypub/actor-follow.ts @@ -1,5 +1,5 @@ import * as Bluebird from 'bluebird' -import { values, difference } from 'lodash' +import { difference, values } from 'lodash' import { AfterCreate, AfterDestroy, @@ -23,7 +23,7 @@ import { logger } from '../../helpers/logger' import { getServerActor } from '../../helpers/utils' import { ACTOR_FOLLOW_SCORE, FOLLOW_STATES, SERVER_ACTOR_NAME } from '../../initializers/constants' import { ServerModel } from '../server/server' -import { createSafeIn, getSort, getFollowsSort } from '../utils' +import { createSafeIn, getFollowsSort, getSort } from '../utils' import { ActorModel, unusedActorAttributesForAPI } from './actor' import { VideoChannelModel } from '../video/video-channel' import { AccountModel } from '../account/account' @@ -36,7 +36,6 @@ import { MActorFollowSubscriptions } from '@server/typings/models' import { ActivityPubActorType } from '@shared/models' -import { afterCommitIfTransaction } from '@server/helpers/database-utils' @Table({ tableName: 'actorFollow', @@ -226,7 +225,7 @@ export class ActorFollowModel extends Model { return ActorFollowModel.findOne(query) .then(result => { - if (result && result.ActorFollowing.VideoChannel) { + if (result?.ActorFollowing.VideoChannel) { result.ActorFollowing.VideoChannel.Actor = result.ActorFollowing } @@ -239,24 +238,24 @@ export class ActorFollowModel extends Model { .map(t => { if (t.host) { return { - [ Op.and ]: [ + [Op.and]: [ { - '$preferredUsername$': t.name + $preferredUsername$: t.name }, { - '$host$': t.host + $host$: t.host } ] } } return { - [ Op.and ]: [ + [Op.and]: [ { - '$preferredUsername$': t.name + $preferredUsername$: t.name }, { - '$serverId$': null + $serverId$: null } ] } @@ -265,9 +264,9 @@ export class ActorFollowModel extends Model { const query = { attributes: [], where: { - [ Op.and ]: [ + [Op.and]: [ { - [ Op.or ]: whereTab + [Op.or]: whereTab }, { actorId @@ -295,12 +294,12 @@ export class ActorFollowModel extends Model { } static listFollowingForApi (options: { - id: number, - start: number, - count: number, - sort: string, - state?: FollowState, - actorType?: ActivityPubActorType, + id: number + start: number + count: number + sort: string + state?: FollowState + actorType?: ActivityPubActorType search?: string }) { const { id, start, count, sort, search, state, actorType } = options @@ -312,7 +311,7 @@ export class ActorFollowModel extends Model { if (search) { Object.assign(followingServerWhere, { host: { - [ Op.iLike ]: '%' + search + '%' + [Op.iLike]: '%' + search + '%' } }) } @@ -362,12 +361,12 @@ export class ActorFollowModel extends Model { } static listFollowersForApi (options: { - actorId: number, - start: number, - count: number, - sort: string, - state?: FollowState, - actorType?: ActivityPubActorType, + actorId: number + start: number + count: number + sort: string + state?: FollowState + actorType?: ActivityPubActorType search?: string }) { const { actorId, start, count, sort, search, state, actorType } = options @@ -379,7 +378,7 @@ export class ActorFollowModel extends Model { if (search) { Object.assign(followerServerWhere, { host: { - [ Op.iLike ]: '%' + search + '%' + [Op.iLike]: '%' + search + '%' } }) } @@ -631,7 +630,7 @@ export class ActorFollowModel extends Model { const tasks: Bluebird[] = [] - for (let selection of selections) { + for (const selection of selections) { let query = 'SELECT ' + selection + ' FROM "actor" ' + 'INNER JOIN "actorFollow" ON "actorFollow"."' + firstJoin + '" = "actor"."id" ' + 'INNER JOIN "actor" AS "Follows" ON "actorFollow"."' + secondJoin + '" = "Follows"."id" ' + diff --git a/server/models/activitypub/actor.ts b/server/models/activitypub/actor.ts index d651a281a..00e8dc954 100644 --- a/server/models/activitypub/actor.ts +++ b/server/models/activitypub/actor.ts @@ -16,7 +16,7 @@ import { Table, UpdatedAt } from 'sequelize-typescript' -import { ActivityPubActorType } from '../../../shared/models/activitypub' +import { ActivityIconObject, ActivityPubActorType } from '../../../shared/models/activitypub' import { Avatar } from '../../../shared/models/avatars/avatar.model' import { activityPubContextify } from '../../helpers/activitypub' import { @@ -335,7 +335,7 @@ export class ActorModel extends Model { const query = { where: { followersUrl: { - [ Op.in ]: followersUrls + [Op.in]: followersUrls } }, transaction @@ -362,7 +362,7 @@ export class ActorModel extends Model { .findOne(query) .then(actor => { if (preferredUsername === SERVER_ACTOR_NAME) { - ActorModel.localNameCache[ preferredUsername ] = actor + ActorModel.localNameCache[preferredUsername] = actor } return actor @@ -388,7 +388,7 @@ export class ActorModel extends Model { .findOne(query) .then(actor => { if (preferredUsername === SERVER_ACTOR_NAME) { - ActorModel.localUrlCache[ preferredUsername ] = actor + ActorModel.localUrlCache[preferredUsername] = actor } return actor @@ -500,9 +500,11 @@ export class ActorModel extends Model { } toActivityPubObject (this: MActorAP, name: string) { - let icon = undefined + let icon: ActivityIconObject + if (this.avatarId) { const extension = extname(this.Avatar.filename) + icon = { type: 'Image', mediaType: extension === '.png' ? 'image/png' : 'image/jpeg', diff --git a/server/models/oauth/oauth-token.ts b/server/models/oauth/oauth-token.ts index b680be237..d2101ce86 100644 --- a/server/models/oauth/oauth-token.ts +++ b/server/models/oauth/oauth-token.ts @@ -23,10 +23,10 @@ import { MOAuthTokenUser } from '@server/typings/models/oauth/oauth-token' export type OAuthTokenInfo = { refreshToken: string - refreshTokenExpiresAt: Date, + refreshTokenExpiresAt: Date client: { id: number - }, + } user: { id: number } diff --git a/server/models/redundancy/video-redundancy.ts b/server/models/redundancy/video-redundancy.ts index 4e66d72e3..1b63d3818 100644 --- a/server/models/redundancy/video-redundancy.ts +++ b/server/models/redundancy/video-redundancy.ts @@ -43,7 +43,7 @@ export enum ScopeNames { } @Scopes(() => ({ - [ ScopeNames.WITH_VIDEO ]: { + [ScopeNames.WITH_VIDEO]: { include: [ { model: VideoFileModel, @@ -167,7 +167,7 @@ export class VideoRedundancyModel extends Model { logger.info('Removing duplicated video streaming playlist %s.', videoUUID) videoStreamingPlaylist.Video.removeStreamingPlaylistFiles(videoStreamingPlaylist, true) - .catch(err => logger.error('Cannot delete video streaming playlist files of %s.', videoUUID, { err })) + .catch(err => logger.error('Cannot delete video streaming playlist files of %s.', videoUUID, { err })) } return undefined @@ -230,12 +230,12 @@ export class VideoRedundancyModel extends Model { }, include: [ { - attributes: [ ], + attributes: [], model: VideoFileModel, required: true, include: [ { - attributes: [ ], + attributes: [], model: VideoModel, required: true, where: { @@ -248,7 +248,7 @@ export class VideoRedundancyModel extends Model { } return VideoRedundancyModel.findOne(query) - .then(r => !!r) + .then(r => !!r) } static async getVideoSample (p: Bluebird) { @@ -310,7 +310,7 @@ export class VideoRedundancyModel extends Model { where: { privacy: VideoPrivacy.PUBLIC, views: { - [ Op.gte ]: minViews + [Op.gte]: minViews } }, include: [ @@ -333,7 +333,7 @@ export class VideoRedundancyModel extends Model { actorId: actor.id, strategy, createdAt: { - [ Op.lt ]: expiredDate + [Op.lt]: expiredDate } } } @@ -392,7 +392,7 @@ export class VideoRedundancyModel extends Model { where: { actorId: actor.id, expiresOn: { - [ Op.lt ]: new Date() + [Op.lt]: new Date() } } } @@ -409,8 +409,8 @@ export class VideoRedundancyModel extends Model { [Op.ne]: actor.id }, expiresOn: { - [ Op.lt ]: new Date(), - [ Op.ne ]: null + [Op.lt]: new Date(), + [Op.ne]: null } } } @@ -464,15 +464,15 @@ export class VideoRedundancyModel extends Model { } static listForApi (options: { - start: number, - count: number, - sort: string, - target: VideoRedundanciesTarget, + start: number + count: number + sort: string + target: VideoRedundanciesTarget strategy?: string }) { const { start, count, sort, target, strategy } = options - let redundancyWhere: WhereOptions = {} - let videosWhere: WhereOptions = {} + const redundancyWhere: WhereOptions = {} + const videosWhere: WhereOptions = {} let redundancySqlSuffix = '' if (target === 'my-videos') { @@ -490,10 +490,10 @@ export class VideoRedundancyModel extends Model { const videoFilterWhere = { [Op.and]: [ { - [ Op.or ]: [ + [Op.or]: [ { id: { - [ Op.in ]: literal( + [Op.in]: literal( '(' + 'SELECT "videoId" FROM "videoFile" ' + 'INNER JOIN "videoRedundancy" ON "videoRedundancy"."videoFileId" = "videoFile".id' + @@ -504,7 +504,7 @@ export class VideoRedundancyModel extends Model { }, { id: { - [ Op.in ]: literal( + [Op.in]: literal( '(' + 'select "videoId" FROM "videoStreamingPlaylist" ' + 'INNER JOIN "videoRedundancy" ON "videoRedundancy"."videoStreamingPlaylistId" = "videoStreamingPlaylist".id' + @@ -592,16 +592,16 @@ export class VideoRedundancyModel extends Model { } return VideoRedundancyModel.findOne(query) - .then((r: any) => ({ - totalUsed: parseAggregateResult(r.totalUsed), - totalVideos: r.totalVideos, - totalVideoFiles: r.totalVideoFiles - })) + .then((r: any) => ({ + totalUsed: parseAggregateResult(r.totalUsed), + totalVideos: r.totalVideos, + totalVideoFiles: r.totalVideoFiles + })) } static toFormattedJSONStatic (video: MVideoForRedundancyAPI): VideoRedundancy { - let filesRedundancies: FileRedundancyInformation[] = [] - let streamingPlaylistsRedundancies: StreamingPlaylistRedundancyInformation[] = [] + const filesRedundancies: FileRedundancyInformation[] = [] + const streamingPlaylistsRedundancies: StreamingPlaylistRedundancyInformation[] = [] for (const file of video.VideoFiles) { for (const redundancy of file.RedundancyVideos) { @@ -678,7 +678,7 @@ export class VideoRedundancyModel extends Model { expires: this.expiresOn ? this.expiresOn.toISOString() : null, url: { type: 'Link', - mediaType: MIMETYPES.VIDEO.EXT_MIMETYPE[ this.VideoFile.extname ] as any, + mediaType: MIMETYPES.VIDEO.EXT_MIMETYPE[this.VideoFile.extname] as any, href: this.fileUrl, height: this.VideoFile.resolution, size: this.VideoFile.size, @@ -693,7 +693,7 @@ export class VideoRedundancyModel extends Model { const notIn = literal( '(' + - `SELECT "videoFileId" FROM "videoRedundancy" WHERE "actorId" = ${actor.id} AND "videoFileId" IS NOT NULL` + + `SELECT "videoFileId" FROM "videoRedundancy" WHERE "actorId" = ${actor.id} AND "videoFileId" IS NOT NULL` + ')' ) @@ -703,7 +703,7 @@ export class VideoRedundancyModel extends Model { required: true, where: { id: { - [ Op.notIn ]: notIn + [Op.notIn]: notIn } } } diff --git a/server/models/server/plugin.ts b/server/models/server/plugin.ts index d094da1f5..95774a467 100644 --- a/server/models/server/plugin.ts +++ b/server/models/server/plugin.ts @@ -189,10 +189,10 @@ export class PluginModel extends Model { } static listForApi (options: { - pluginType?: PluginType, - uninstalled?: boolean, - start: number, - count: number, + pluginType?: PluginType + uninstalled?: boolean + start: number + count: number sort: string }) { const { uninstalled = false } = options diff --git a/server/models/utils.ts b/server/models/utils.ts index f89b80011..f7afb8d4b 100644 --- a/server/models/utils.ts +++ b/server/models/utils.ts @@ -67,7 +67,7 @@ function getVideoSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): Or function getBlacklistSort (model: any, value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] { const [ firstSort ] = getSort(value) - if (model) return [ [ literal(`"${model}.${firstSort[ 0 ]}" ${firstSort[ 1 ]}`) ], lastSort ] as any[] // FIXME: typings + if (model) return [ [ literal(`"${model}.${firstSort[0]}" ${firstSort[1]}`) ], lastSort ] as any[] // FIXME: typings return [ firstSort, lastSort ] } @@ -139,7 +139,7 @@ function buildServerIdsFollowedBy (actorId: any) { 'SELECT "actor"."serverId" FROM "actorFollow" ' + 'INNER JOIN "actor" ON actor.id = "actorFollow"."targetActorId" ' + 'WHERE "actorFollow"."actorId" = ' + actorIdNumber + - ')' + ')' } function buildWhereIdOrUUID (id: number | string) { diff --git a/server/models/video/thumbnail.ts b/server/models/video/thumbnail.ts index b69bc0872..e396784d2 100644 --- a/server/models/video/thumbnail.ts +++ b/server/models/video/thumbnail.ts @@ -92,7 +92,7 @@ export class ThumbnailModel extends Model { @UpdatedAt updatedAt: Date - private static types: { [ id in ThumbnailType ]: { label: string, directory: string, staticPath: string } } = { + private static readonly types: { [ id in ThumbnailType ]: { label: string, directory: string, staticPath: string } } = { [ThumbnailType.MINIATURE]: { label: 'miniature', directory: CONFIG.STORAGE.THUMBNAILS_DIR, diff --git a/server/models/video/video-abuse.ts b/server/models/video/video-abuse.ts index 3636db18d..da8c1577c 100644 --- a/server/models/video/video-abuse.ts +++ b/server/models/video/video-abuse.ts @@ -87,9 +87,9 @@ export class VideoAbuseModel extends Model { } static listForApi (parameters: { - start: number, - count: number, - sort: string, + start: number + count: number + sort: string serverAccountId: number user?: MUserAccountId }) { diff --git a/server/models/video/video-caption.ts b/server/models/video/video-caption.ts index 1307c27f1..59d3e1050 100644 --- a/server/models/video/video-caption.ts +++ b/server/models/video/video-caption.ts @@ -4,7 +4,8 @@ import { BeforeDestroy, BelongsTo, Column, - CreatedAt, DataType, + CreatedAt, + DataType, ForeignKey, Is, Model, @@ -16,13 +17,13 @@ import { buildWhereIdOrUUID, throwIfNotValid } from '../utils' import { VideoModel } from './video' import { isVideoCaptionLanguageValid } from '../../helpers/custom-validators/video-captions' import { VideoCaption } from '../../../shared/models/videos/caption/video-caption.model' -import { CONSTRAINTS_FIELDS, LAZY_STATIC_PATHS, STATIC_PATHS, VIDEO_LANGUAGES, WEBSERVER } from '../../initializers/constants' +import { CONSTRAINTS_FIELDS, LAZY_STATIC_PATHS, VIDEO_LANGUAGES, WEBSERVER } from '../../initializers/constants' import { join } from 'path' import { logger } from '../../helpers/logger' import { remove } from 'fs-extra' import { CONFIG } from '../../initializers/config' import * as Bluebird from 'bluebird' -import { MVideo, MVideoAccountLight, MVideoCaptionFormattable, MVideoCaptionVideo } from '@server/typings/models' +import { MVideoAccountLight, MVideoCaptionFormattable, MVideoCaptionVideo } from '@server/typings/models' import { buildRemoteVideoBaseUrl } from '@server/helpers/activitypub' export enum ScopeNames { diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts index 4e98e7ba3..835216671 100644 --- a/server/models/video/video-channel.ts +++ b/server/models/video/video-channel.ts @@ -30,7 +30,7 @@ import { buildServerIdsFollowedBy, buildTrigramSearchIndex, createSimilarityAttr import { VideoModel } from './video' import { CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers/constants' import { ServerModel } from '../server/server' -import { FindOptions, ModelIndexesOptions, Op } from 'sequelize' +import { FindOptions, Op } from 'sequelize' import { AvatarModel } from '../avatar/avatar' import { VideoPlaylistModel } from './video-playlist' import * as Bluebird from 'bluebird' @@ -121,7 +121,7 @@ export type SummaryOptions = { }, { serverId: { - [ Op.in ]: Sequelize.literal(inQueryInstanceFollow) + [Op.in]: Sequelize.literal(inQueryInstanceFollow) } } ] @@ -348,9 +348,9 @@ export class VideoChannelModel extends Model { } static listByAccount (options: { - accountId: number, - start: number, - count: number, + accountId: number + start: number + count: number sort: string }) { const query = { diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts index fb4d16b4d..b33c33d5e 100644 --- a/server/models/video/video-comment.ts +++ b/server/models/video/video-comment.ts @@ -257,10 +257,10 @@ export class VideoCommentModel extends Model { } static async listThreadsForApi (parameters: { - videoId: number, - start: number, - count: number, - sort: string, + videoId: number + start: number + count: number + sort: string user?: MUserAccountId }) { const { videoId, start, count, sort, user } = parameters @@ -300,8 +300,8 @@ export class VideoCommentModel extends Model { } static async listThreadCommentsForApi (parameters: { - videoId: number, - threadId: number, + videoId: number + threadId: number user?: MUserAccountId }) { const { videoId, threadId, user } = parameters @@ -314,7 +314,7 @@ export class VideoCommentModel extends Model { order: [ [ 'createdAt', 'ASC' ], [ 'updatedAt', 'ASC' ] ] as Order, where: { videoId, - [ Op.or ]: [ + [Op.or]: [ { id: threadId }, { originCommentId: threadId } ], @@ -346,7 +346,7 @@ export class VideoCommentModel extends Model { order: [ [ 'createdAt', order ] ] as Order, where: { id: { - [ Op.in ]: Sequelize.literal('(' + + [Op.in]: Sequelize.literal('(' + 'WITH RECURSIVE children (id, "inReplyToCommentId") AS ( ' + `SELECT id, "inReplyToCommentId" FROM "videoComment" WHERE id = ${comment.id} ` + 'UNION ' + @@ -355,7 +355,7 @@ export class VideoCommentModel extends Model { ') ' + 'SELECT id FROM children' + ')'), - [ Op.ne ]: comment.id + [Op.ne]: comment.id } }, transaction: t @@ -461,7 +461,7 @@ export class VideoCommentModel extends Model { } isDeleted () { - return null !== this.deletedAt + return this.deletedAt !== null } extractMentions () { diff --git a/server/models/video/video-format-utils.ts b/server/models/video/video-format-utils.ts index bb50edcaa..55b0ed062 100644 --- a/server/models/video/video-format-utils.ts +++ b/server/models/video/video-format-utils.ts @@ -27,12 +27,13 @@ import { generateMagnetUri } from '@server/helpers/webtorrent' export type VideoFormattingJSONOptions = { completeDescription?: boolean additionalAttributes: { - state?: boolean, - waitTranscoding?: boolean, - scheduledUpdate?: boolean, + state?: boolean + waitTranscoding?: boolean + scheduledUpdate?: boolean blacklistInfo?: boolean } } + function videoModelToFormattedJSON (video: MVideoFormattable, options?: VideoFormattingJSONOptions): Video { const userHistory = isArray(video.UserVideoHistories) ? video.UserVideoHistories[0] : undefined @@ -181,12 +182,10 @@ function videoFilesModelToFormattedJSON ( ): VideoFile[] { return videoFiles .map(videoFile => { - let resolutionLabel = videoFile.resolution + 'p' - return { resolution: { id: videoFile.resolution, - label: resolutionLabel + label: videoFile.resolution + 'p' }, magnetUri: generateMagnetUri(model, videoFile, baseUrlHttp, baseUrlWs), size: videoFile.size, @@ -214,7 +213,7 @@ function addVideoFilesInAPAcc ( for (const file of files) { acc.push({ type: 'Link', - mediaType: MIMETYPES.VIDEO.EXT_MIMETYPE[ file.extname ] as any, + mediaType: MIMETYPES.VIDEO.EXT_MIMETYPE[file.extname] as any, href: model.getVideoFileUrl(file, baseUrlHttp), height: file.resolution, size: file.size, @@ -274,10 +273,8 @@ function videoModelToActivityPubObject (video: MVideoAP): VideoTorrentObject { addVideoFilesInAPAcc(url, video, baseUrlHttp, baseUrlWs, video.VideoFiles || []) for (const playlist of (video.VideoStreamingPlaylists || [])) { - let tag: ActivityTagObject[] - - tag = playlist.p2pMediaLoaderInfohashes - .map(i => ({ type: 'Infohash' as 'Infohash', name: i })) + const tag = playlist.p2pMediaLoaderInfohashes + .map(i => ({ type: 'Infohash' as 'Infohash', name: i })) as ActivityTagObject[] tag.push({ type: 'Link', name: 'sha256', diff --git a/server/models/video/video-playlist-element.ts b/server/models/video/video-playlist-element.ts index f2d71357f..4ba16f5fd 100644 --- a/server/models/video/video-playlist-element.ts +++ b/server/models/video/video-playlist-element.ts @@ -120,10 +120,10 @@ export class VideoPlaylistElementModel extends Model } static listForApi (options: { - start: number, - count: number, - videoPlaylistId: number, - serverAccount: AccountModel, + start: number + count: number + videoPlaylistId: number + serverAccount: AccountModel user?: MUserAccountId }) { const accountIds = [ options.serverAccount.id ] diff --git a/server/models/video/video-playlist.ts b/server/models/video/video-playlist.ts index ba1fc23ea..4ca17ebec 100644 --- a/server/models/video/video-playlist.ts +++ b/server/models/video/video-playlist.ts @@ -68,12 +68,12 @@ type AvailableForListOptions = { type?: VideoPlaylistType accountId?: number videoChannelId?: number - listMyPlaylists?: boolean, + listMyPlaylists?: boolean search?: string } @Scopes(() => ({ - [ ScopeNames.WITH_THUMBNAIL ]: { + [ScopeNames.WITH_THUMBNAIL]: { include: [ { model: ThumbnailModel, @@ -81,7 +81,7 @@ type AvailableForListOptions = { } ] }, - [ ScopeNames.WITH_VIDEOS_LENGTH ]: { + [ScopeNames.WITH_VIDEOS_LENGTH]: { attributes: { include: [ [ @@ -91,7 +91,7 @@ type AvailableForListOptions = { ] } } as FindOptions, - [ ScopeNames.WITH_ACCOUNT ]: { + [ScopeNames.WITH_ACCOUNT]: { include: [ { model: AccountModel, @@ -99,7 +99,7 @@ type AvailableForListOptions = { } ] }, - [ ScopeNames.WITH_ACCOUNT_AND_CHANNEL_SUMMARY ]: { + [ScopeNames.WITH_ACCOUNT_AND_CHANNEL_SUMMARY]: { include: [ { model: AccountModel.scope(AccountScopeNames.SUMMARY), @@ -111,7 +111,7 @@ type AvailableForListOptions = { } ] }, - [ ScopeNames.WITH_ACCOUNT_AND_CHANNEL ]: { + [ScopeNames.WITH_ACCOUNT_AND_CHANNEL]: { include: [ { model: AccountModel, @@ -123,7 +123,7 @@ type AvailableForListOptions = { } ] }, - [ ScopeNames.AVAILABLE_FOR_LIST ]: (options: AvailableForListOptions) => { + [ScopeNames.AVAILABLE_FOR_LIST]: (options: AvailableForListOptions) => { let whereActor: WhereOptions = {} @@ -138,13 +138,13 @@ type AvailableForListOptions = { const inQueryInstanceFollow = buildServerIdsFollowedBy(options.followerActorId) whereActor = { - [ Op.or ]: [ + [Op.or]: [ { serverId: null }, { serverId: { - [ Op.in ]: literal(inQueryInstanceFollow) + [Op.in]: literal(inQueryInstanceFollow) } } ] @@ -172,7 +172,7 @@ type AvailableForListOptions = { if (options.search) { whereAnd.push({ name: { - [ Op.iLike ]: '%' + options.search + '%' + [Op.iLike]: '%' + options.search + '%' } }) } @@ -299,13 +299,13 @@ export class VideoPlaylistModel extends Model { static listForApi (options: { followerActorId: number - start: number, - count: number, - sort: string, - type?: VideoPlaylistType, - accountId?: number, - videoChannelId?: number, - listMyPlaylists?: boolean, + start: number + count: number + sort: string + type?: VideoPlaylistType + accountId?: number + videoChannelId?: number + listMyPlaylists?: boolean search?: string }) { const query = { diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 1a924e6c9..1ec8d717e 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -187,7 +187,7 @@ export type AvailableForListIDsOptions = { } @Scopes(() => ({ - [ ScopeNames.FOR_API ]: (options: ForAPIOptions) => { + [ScopeNames.FOR_API]: (options: ForAPIOptions) => { const query: FindOptions = { include: [ { @@ -212,7 +212,7 @@ export type AvailableForListIDsOptions = { if (options.ids) { query.where = { id: { - [ Op.in ]: options.ids + [Op.in]: options.ids } } } @@ -236,7 +236,7 @@ export type AvailableForListIDsOptions = { return query }, - [ ScopeNames.AVAILABLE_FOR_LIST_IDS ]: (options: AvailableForListIDsOptions) => { + [ScopeNames.AVAILABLE_FOR_LIST_IDS]: (options: AvailableForListIDsOptions) => { const whereAnd = options.baseWhere ? [].concat(options.baseWhere) : [] const query: FindOptions = { @@ -247,11 +247,11 @@ export type AvailableForListIDsOptions = { const attributesType = options.attributesType || 'id' if (attributesType === 'id') query.attributes = [ 'id' ] - else if (attributesType === 'none') query.attributes = [ ] + else if (attributesType === 'none') query.attributes = [] whereAnd.push({ id: { - [ Op.notIn ]: Sequelize.literal( + [Op.notIn]: Sequelize.literal( '(SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")' ) } @@ -260,7 +260,7 @@ export type AvailableForListIDsOptions = { if (options.serverAccountId) { whereAnd.push({ channelId: { - [ 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) + @@ -273,15 +273,14 @@ export type AvailableForListIDsOptions = { // Only list public/published videos if (!options.filter || options.filter !== 'all-local') { - const publishWhere = { // Always list published videos, or videos that are being transcoded but on which we don't want to wait for transcoding - [ Op.or ]: [ + [Op.or]: [ { state: VideoState.PUBLISHED }, { - [ Op.and ]: { + [Op.and]: { state: VideoState.TO_TRANSCODE, waitTranscoding: false } @@ -368,7 +367,7 @@ export type AvailableForListIDsOptions = { [Op.or]: [ { id: { - [ Op.in ]: Sequelize.literal( + [Op.in]: Sequelize.literal( '(' + 'SELECT "videoShare"."videoId" AS "id" FROM "videoShare" ' + 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' + @@ -379,7 +378,7 @@ export type AvailableForListIDsOptions = { }, { id: { - [ Op.in ]: Sequelize.literal( + [Op.in]: Sequelize.literal( '(' + 'SELECT "video"."id" AS "id" FROM "video" ' + 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' + @@ -399,7 +398,7 @@ export type AvailableForListIDsOptions = { if (options.withFiles === true) { whereAnd.push({ id: { - [ Op.in ]: Sequelize.literal( + [Op.in]: Sequelize.literal( '(SELECT "videoId" FROM "videoFile")' ) } @@ -413,7 +412,7 @@ export type AvailableForListIDsOptions = { whereAnd.push({ id: { - [ Op.in ]: Sequelize.literal( + [Op.in]: Sequelize.literal( '(' + 'SELECT "videoId" FROM "videoTag" ' + 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' + @@ -429,7 +428,7 @@ export type AvailableForListIDsOptions = { whereAnd.push({ id: { - [ Op.in ]: Sequelize.literal( + [Op.in]: Sequelize.literal( '(' + 'SELECT "videoId" FROM "videoTag" ' + 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' + @@ -449,7 +448,7 @@ export type AvailableForListIDsOptions = { if (options.categoryOneOf) { whereAnd.push({ category: { - [ Op.or ]: options.categoryOneOf + [Op.or]: options.categoryOneOf } }) } @@ -457,7 +456,7 @@ export type AvailableForListIDsOptions = { if (options.licenceOneOf) { whereAnd.push({ licence: { - [ Op.or ]: options.licenceOneOf + [Op.or]: options.licenceOneOf } }) } @@ -472,12 +471,12 @@ export type AvailableForListIDsOptions = { [Op.or]: [ { language: { - [ Op.or ]: videoLanguages + [Op.or]: videoLanguages } }, { id: { - [ Op.in ]: Sequelize.literal( + [Op.in]: Sequelize.literal( '(' + 'SELECT "videoId" FROM "videoCaption" ' + 'WHERE "language" IN (' + createSafeIn(VideoModel, options.languageOneOf) + ') ' + @@ -511,12 +510,12 @@ export type AvailableForListIDsOptions = { } query.where = { - [ Op.and ]: whereAnd + [Op.and]: whereAnd } return query }, - [ ScopeNames.WITH_THUMBNAILS ]: { + [ScopeNames.WITH_THUMBNAILS]: { include: [ { model: ThumbnailModel, @@ -524,7 +523,7 @@ export type AvailableForListIDsOptions = { } ] }, - [ ScopeNames.WITH_USER_ID ]: { + [ScopeNames.WITH_USER_ID]: { include: [ { attributes: [ 'accountId' ], @@ -540,7 +539,7 @@ export type AvailableForListIDsOptions = { } ] }, - [ ScopeNames.WITH_ACCOUNT_DETAILS ]: { + [ScopeNames.WITH_ACCOUNT_DETAILS]: { include: [ { model: VideoChannelModel.unscoped(), @@ -592,10 +591,10 @@ export type AvailableForListIDsOptions = { } ] }, - [ ScopeNames.WITH_TAGS ]: { + [ScopeNames.WITH_TAGS]: { include: [ TagModel ] }, - [ ScopeNames.WITH_BLACKLISTED ]: { + [ScopeNames.WITH_BLACKLISTED]: { include: [ { attributes: [ 'id', 'reason', 'unfederated' ], @@ -604,7 +603,7 @@ export type AvailableForListIDsOptions = { } ] }, - [ ScopeNames.WITH_WEBTORRENT_FILES ]: (withRedundancies = false) => { + [ScopeNames.WITH_WEBTORRENT_FILES]: (withRedundancies = false) => { let subInclude: any[] = [] if (withRedundancies === true) { @@ -628,7 +627,7 @@ export type AvailableForListIDsOptions = { ] } }, - [ ScopeNames.WITH_STREAMING_PLAYLISTS ]: (withRedundancies = false) => { + [ScopeNames.WITH_STREAMING_PLAYLISTS]: (withRedundancies = false) => { const subInclude: IncludeOptions[] = [ { model: VideoFileModel.unscoped(), @@ -655,7 +654,7 @@ export type AvailableForListIDsOptions = { ] } }, - [ ScopeNames.WITH_SCHEDULED_UPDATE ]: { + [ScopeNames.WITH_SCHEDULED_UPDATE]: { include: [ { model: ScheduleVideoUpdateModel.unscoped(), @@ -663,7 +662,7 @@ export type AvailableForListIDsOptions = { } ] }, - [ ScopeNames.WITH_USER_HISTORY ]: (userId: number) => { + [ScopeNames.WITH_USER_HISTORY]: (userId: number) => { return { include: [ { @@ -1016,7 +1015,7 @@ export class VideoModel extends Model { }, onDelete: 'cascade', hooks: true, - [ 'separate' as any ]: true + ['separate' as any]: true }) VideoCaptions: VideoCaptionModel[] @@ -1112,9 +1111,9 @@ export class VideoModel extends Model { order: getVideoSort('createdAt', [ 'Tags', 'name', 'ASC' ] as any), // FIXME: sequelize typings where: { id: { - [ Op.in ]: Sequelize.literal('(' + rawQuery + ')') + [Op.in]: Sequelize.literal('(' + rawQuery + ')') }, - [ Op.or ]: [ + [Op.or]: [ { privacy: VideoPrivacy.PUBLIC }, { privacy: VideoPrivacy.UNLISTED } ] @@ -1131,10 +1130,10 @@ export class VideoModel extends Model { required: false, // We only want videos shared by this actor where: { - [ Op.and ]: [ + [Op.and]: [ { id: { - [ Op.not ]: null + [Op.not]: null } }, { @@ -1184,8 +1183,8 @@ export class VideoModel extends Model { // totals: totalVideos + totalVideoShares let totalVideos = 0 let totalVideoShares = 0 - if (totals[ 0 ]) totalVideos = parseInt(totals[ 0 ].total, 10) - if (totals[ 1 ]) totalVideoShares = parseInt(totals[ 1 ].total, 10) + if (totals[0]) totalVideos = parseInt(totals[0].total, 10) + if (totals[1]) totalVideoShares = parseInt(totals[1].total, 10) const total = totalVideos + totalVideoShares return { @@ -1228,7 +1227,7 @@ export class VideoModel extends Model { baseQuery = Object.assign(baseQuery, { where: { name: { - [ Op.iLike ]: '%' + search + '%' + [Op.iLike]: '%' + search + '%' } } }) @@ -1258,25 +1257,25 @@ export class VideoModel extends Model { } static async listForApi (options: { - start: number, - count: number, - sort: string, - nsfw: boolean, - includeLocalVideos: boolean, - withFiles: boolean, - categoryOneOf?: number[], - licenceOneOf?: number[], - languageOneOf?: string[], - tagsOneOf?: string[], - tagsAllOf?: string[], - filter?: VideoFilter, - accountId?: number, - videoChannelId?: number, + start: number + count: number + sort: string + nsfw: boolean + includeLocalVideos: boolean + withFiles: boolean + categoryOneOf?: number[] + licenceOneOf?: number[] + languageOneOf?: string[] + tagsOneOf?: string[] + tagsAllOf?: string[] + filter?: VideoFilter + accountId?: number + videoChannelId?: number followerActorId?: number - videoPlaylistId?: number, - trendingDays?: number, - user?: MUserAccountId, - historyOfUser?: MUserId, + videoPlaylistId?: number + trendingDays?: number + user?: MUserAccountId + historyOfUser?: MUserId countVideos?: boolean }) { if (options.filter && options.filter === 'all-local' && !options.user.hasRight(UserRight.SEE_ALL_VIDEOS)) { @@ -1342,7 +1341,7 @@ export class VideoModel extends Model { tagsAllOf?: string[] durationMin?: number // seconds durationMax?: number // seconds - user?: MUserAccountId, + user?: MUserAccountId filter?: VideoFilter }) { const whereAnd = [] @@ -1350,8 +1349,8 @@ export class VideoModel extends Model { if (options.startDate || options.endDate) { const publishedAtRange = {} - if (options.startDate) publishedAtRange[ Op.gte ] = options.startDate - if (options.endDate) publishedAtRange[ Op.lte ] = options.endDate + if (options.startDate) publishedAtRange[Op.gte] = options.startDate + if (options.endDate) publishedAtRange[Op.lte] = options.endDate whereAnd.push({ publishedAt: publishedAtRange }) } @@ -1359,8 +1358,8 @@ export class VideoModel extends Model { if (options.originallyPublishedStartDate || options.originallyPublishedEndDate) { const originallyPublishedAtRange = {} - if (options.originallyPublishedStartDate) originallyPublishedAtRange[ Op.gte ] = options.originallyPublishedStartDate - if (options.originallyPublishedEndDate) originallyPublishedAtRange[ Op.lte ] = options.originallyPublishedEndDate + if (options.originallyPublishedStartDate) originallyPublishedAtRange[Op.gte] = options.originallyPublishedStartDate + if (options.originallyPublishedEndDate) originallyPublishedAtRange[Op.lte] = options.originallyPublishedEndDate whereAnd.push({ originallyPublishedAt: originallyPublishedAtRange }) } @@ -1368,8 +1367,8 @@ export class VideoModel extends Model { if (options.durationMin || options.durationMax) { const durationRange = {} - if (options.durationMin) durationRange[ Op.gte ] = options.durationMin - if (options.durationMax) durationRange[ Op.lte ] = options.durationMax + if (options.durationMin) durationRange[Op.gte] = options.durationMin + if (options.durationMax) durationRange[Op.lte] = options.durationMax whereAnd.push({ duration: durationRange }) } @@ -1380,7 +1379,7 @@ export class VideoModel extends Model { if (options.search) { const trigramSearch = { id: { - [ Op.in ]: Sequelize.literal( + [Op.in]: Sequelize.literal( '(' + 'SELECT "video"."id" FROM "video" ' + 'WHERE ' + @@ -1578,8 +1577,8 @@ export class VideoModel extends Model { } static loadForGetAPI (parameters: { - id: number | string, - t?: Transaction, + id: number | string + t?: Transaction userId?: number }): Bluebird { const { id, t, userId } = parameters @@ -1645,9 +1644,9 @@ export class VideoModel extends Model { static checkVideoHasInstanceFollow (videoId: number, followerActorId: number) { // Instances only share videos const query = 'SELECT 1 FROM "videoShare" ' + - 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' + - 'WHERE "actorFollow"."actorId" = $followerActorId AND "videoShare"."videoId" = $videoId ' + - 'LIMIT 1' + 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' + + 'WHERE "actorFollow"."actorId" = $followerActorId AND "videoShare"."videoId" = $videoId ' + + 'LIMIT 1' const options = { type: QueryTypes.SELECT as QueryTypes.SELECT, @@ -1679,7 +1678,7 @@ export class VideoModel extends Model { } return VideoModel.findAll(query) - .then(videos => videos.map(v => v.id)) + .then(videos => videos.map(v => v.id)) } // threshold corresponds to how many video the field should have to be returned @@ -1699,14 +1698,14 @@ export class VideoModel extends Model { limit: count, group: field, having: Sequelize.where( - Sequelize.fn('COUNT', Sequelize.col(field)), { [ Op.gte ]: threshold } + 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 ] }) .findAll(query) - .then(rows => rows.map(r => r[ field ])) + .then(rows => rows.map(r => r[field])) } static buildTrendingQuery (trendingDays: number) { @@ -1717,7 +1716,7 @@ export class VideoModel extends Model { required: false, where: { startDate: { - [ Op.gte ]: new Date(new Date().getTime() - (24 * 3600 * 1000) * trendingDays) + [Op.gte]: new Date(new Date().getTime() - (24 * 3600 * 1000) * trendingDays) } } } @@ -1800,23 +1799,23 @@ export class VideoModel extends Model { } static getCategoryLabel (id: number) { - return VIDEO_CATEGORIES[ id ] || 'Misc' + return VIDEO_CATEGORIES[id] || 'Misc' } static getLicenceLabel (id: number) { - return VIDEO_LICENCES[ id ] || 'Unknown' + return VIDEO_LICENCES[id] || 'Unknown' } static getLanguageLabel (id: string) { - return VIDEO_LANGUAGES[ id ] || 'Unknown' + return VIDEO_LANGUAGES[id] || 'Unknown' } static getPrivacyLabel (id: number) { - return VIDEO_PRIVACIES[ id ] || 'Unknown' + return VIDEO_PRIVACIES[id] || 'Unknown' } static getStateLabel (id: number) { - return VIDEO_STATES[ id ] || 'Unknown' + return VIDEO_STATES[id] || 'Unknown' } isBlacklisted () { @@ -1828,7 +1827,7 @@ export class VideoModel extends Model { this.VideoChannel.Account.isBlocked() } - getQualityFileBy (this: T, fun: (files: MVideoFile[], it: (file: MVideoFile) => number) => MVideoFile) { + getQualityFileBy (this: T, fun: (files: MVideoFile[], it: (file: MVideoFile) => number) => MVideoFile) { if (Array.isArray(this.VideoFiles) && this.VideoFiles.length !== 0) { const file = fun(this.VideoFiles, file => file.resolution) @@ -1846,15 +1845,15 @@ export class VideoModel extends Model { return undefined } - getMaxQualityFile (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo { + getMaxQualityFile (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo { return this.getQualityFileBy(maxBy) } - getMinQualityFile (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo { + getMinQualityFile (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo { return this.getQualityFileBy(minBy) } - getWebTorrentFile (this: T, resolution: number): MVideoFileVideo { + getWebTorrentFile (this: T, resolution: number): MVideoFileVideo { if (Array.isArray(this.VideoFiles) === false) return undefined const file = this.VideoFiles.find(f => f.resolution === resolution) @@ -1977,8 +1976,8 @@ export class VideoModel extends Model { } this.VideoStreamingPlaylists = this.VideoStreamingPlaylists - .filter(s => s.type !== VideoStreamingPlaylistType.HLS) - .concat(toAdd) + .filter(s => s.type !== VideoStreamingPlaylistType.HLS) + .concat(toAdd) } removeFile (videoFile: MVideoFile, isRedundancy = false) { @@ -1999,7 +1998,7 @@ export class VideoModel extends Model { await remove(directoryPath) if (isRedundancy !== true) { - let streamingPlaylistWithFiles = streamingPlaylist as MStreamingPlaylistFilesVideo + const streamingPlaylistWithFiles = streamingPlaylist as MStreamingPlaylistFilesVideo streamingPlaylistWithFiles.Video = this if (!Array.isArray(streamingPlaylistWithFiles.VideoFiles)) { -- cgit v1.2.3