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/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 +++++++++++++------------- 9 files changed, 134 insertions(+), 137 deletions(-) (limited to 'server/models/video') 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