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/initializers/checker-after-init.ts | 4 +- server/initializers/checker-before-init.ts | 4 +- server/initializers/config.ts | 4 +- server/initializers/constants.ts | 100 ++++++++++----------- server/initializers/database.ts | 2 - server/initializers/migrations/0005-email-pod.ts | 4 +- server/initializers/migrations/0010-email-user.ts | 4 +- server/initializers/migrations/0015-video-views.ts | 4 +- server/initializers/migrations/0020-video-likes.ts | 4 +- .../initializers/migrations/0025-video-dislikes.ts | 4 +- .../initializers/migrations/0030-video-category.ts | 4 +- .../initializers/migrations/0035-video-licence.ts | 4 +- server/initializers/migrations/0040-video-nsfw.ts | 4 +- .../migrations/0045-user-display-nsfw.ts | 4 +- .../initializers/migrations/0050-video-language.ts | 4 +- server/initializers/migrations/0055-video-uuid.ts | 4 +- server/initializers/migrations/0060-video-file.ts | 6 +- .../migrations/0065-video-file-size.ts | 6 +- .../migrations/0070-user-video-quota.ts | 6 +- .../migrations/0075-video-resolutions.ts | 6 +- .../initializers/migrations/0080-video-channels.ts | 6 +- server/initializers/migrations/0085-user-role.ts | 6 +- .../migrations/0090-videos-description.ts | 6 +- .../initializers/migrations/0095-videos-privacy.ts | 6 +- server/initializers/migrations/0100-activitypub.ts | 6 +- server/initializers/migrations/0105-server-mail.ts | 6 +- server/initializers/migrations/0110-server-key.ts | 6 +- .../initializers/migrations/0115-account-avatar.ts | 6 +- server/initializers/migrations/0120-video-null.ts | 6 +- .../migrations/0125-table-lowercase.ts | 4 +- .../migrations/0130-user-autoplay-video.ts | 4 +- .../migrations/0135-video-channel-actor.ts | 42 ++++----- server/initializers/migrations/0140-actor-url.ts | 4 +- .../initializers/migrations/0145-delete-author.ts | 4 +- .../initializers/migrations/0150-avatar-cascade.ts | 4 +- .../migrations/0155-video-comments-enabled.ts | 4 +- .../initializers/migrations/0160-account-route.ts | 4 +- server/initializers/migrations/0165-video-route.ts | 4 +- .../migrations/0170-actor-follow-score.ts | 4 +- .../migrations/0175-actor-follow-counts.ts | 4 +- .../migrations/0180-job-table-delete.ts | 4 +- .../migrations/0185-video-share-url.ts | 4 +- .../migrations/0190-video-comment-unique-url.ts | 4 +- server/initializers/migrations/0195-support.ts | 4 +- .../migrations/0200-video-published-at.ts | 4 +- .../migrations/0205-user-nsfw-policy.ts | 4 +- .../initializers/migrations/0210-video-language.ts | 4 +- .../migrations/0215-video-support-length.ts | 4 +- .../migrations/0255-video-blacklist-reason.ts | 1 - .../migrations/0285-description-support.ts | 6 +- .../migrations/0290-account-video-rate-url.ts | 6 +- .../migrations/0295-video-file-extname.ts | 6 +- .../migrations/0300-user-videos-history-enabled.ts | 6 +- .../migrations/0305-fix-unfederated-videos.ts | 6 +- .../migrations/0310-drop-unused-video-indexes.ts | 6 +- .../migrations/0315-user-notifications.ts | 4 +- .../migrations/0320-blacklist-unfederate.ts | 4 +- .../migrations/0325-video-abuse-fields.ts | 4 +- .../migrations/0330-video-streaming-playlist.ts | 4 +- .../migrations/0335-video-downloading-enabled.ts | 4 +- .../migrations/0340-add-originally-published-at.ts | 4 +- .../migrations/0345-video-playlists.ts | 4 +- .../migrations/0350-video-blacklist-type.ts | 6 +- .../migrations/0355-p2p-peer-version.ts | 6 +- .../0360-notification-instance-follower.ts | 6 +- .../migrations/0365-user-admin-flags.ts | 6 +- server/initializers/migrations/0370-thumbnail.ts | 6 +- .../migrations/0375-account-description.ts | 6 +- .../migrations/0380-cleanup-timestamps.ts | 6 +- .../migrations/0385-remove-actor-uuid.ts | 6 +- .../migrations/0390-user-pending-email.ts | 6 +- .../migrations/0395-user-video-languages.ts | 6 +- server/initializers/migrations/0400-user-theme.ts | 6 +- server/initializers/migrations/0405-plugin.ts | 6 +- .../migrations/0410-video-playlist-element.ts | 6 +- .../migrations/0415-thumbnail-auto-generated.ts | 6 +- server/initializers/migrations/0420-avatar-lazy.ts | 6 +- .../migrations/0425-nullable-actor-fields.ts | 6 +- .../0430-auto-follow-notification-setting.ts | 6 +- server/initializers/migrations/0435-user-modals.ts | 6 +- .../migrations/0440-user-auto-play-next-video.ts | 6 +- .../migrations/0445-shared-inbox-optional.ts | 6 +- .../migrations/0450-streaming-playlist-files.ts | 16 ++-- .../migrations/0455-soft-delete-video-comments.ts | 6 +- .../migrations/0460-user-playlist-autoplay.ts | 6 +- .../migrations/0465-thumbnail-file-url-length.ts | 6 +- .../initializers/migrations/0470-cleaup-indexes.ts | 6 +- .../migrations/0475-redundancy-expires-on.ts | 6 +- .../migrations/0480-caption-file-url.ts | 6 +- server/initializers/migrator.ts | 4 +- 90 files changed, 291 insertions(+), 300 deletions(-) (limited to 'server/initializers') diff --git a/server/initializers/checker-after-init.ts b/server/initializers/checker-after-init.ts index 44efd346c..978023129 100644 --- a/server/initializers/checker-after-init.ts +++ b/server/initializers/checker-after-init.ts @@ -3,7 +3,7 @@ import { isProdInstance, isTestInstance } from '../helpers/core-utils' import { UserModel } from '../models/account/user' import { ApplicationModel } from '../models/application/application' import { OAuthClientModel } from '../models/oauth/oauth-client' -import { parse } from 'url' +import { URL } from 'url' import { CONFIG } from './config' import { logger } from '../helpers/logger' import { getServerActor } from '../helpers/utils' @@ -16,7 +16,7 @@ import { WEBSERVER } from './constants' async function checkActivityPubUrls () { const actor = await getServerActor() - const parsed = parse(actor.url) + const parsed = new URL(actor.url) if (WEBSERVER.HOST !== parsed.host) { const NODE_ENV = config.util.getEnv('NODE_ENV') const NODE_CONFIG_DIR = config.util.getEnv('NODE_CONFIG_DIR') diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index 9731a0af9..a75f2cec2 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts @@ -35,8 +35,8 @@ function checkMissedConfig () { ] const requiredAlternatives = [ [ // set - ['redis.hostname', 'redis.port'], // alternative - ['redis.socket'] + [ 'redis.hostname', 'redis.port' ], // alternative + [ 'redis.socket' ] ] ] const miss: string[] = [] diff --git a/server/initializers/config.ts b/server/initializers/config.ts index fd8bf09fc..75372fa4e 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts @@ -301,7 +301,7 @@ function getLocalConfigFilePath () { if (process.env.NODE_ENV) filename += `-${process.env.NODE_ENV}` if (process.env.NODE_APP_INSTANCE) filename += `-${process.env.NODE_APP_INSTANCE}` - return join(dirname(configSources[ 0 ].name), filename + '.json') + return join(dirname(configSources[0].name), filename + '.json') } function buildVideosRedundancy (objs: any[]): VideosRedundancyStrategy[] { @@ -330,7 +330,7 @@ export function reloadConfig () { function purge () { for (const fileName in require.cache) { - if (-1 === fileName.indexOf(directory())) { + if (fileName.indexOf(directory()) === -1) { continue } diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 3a9946bba..fb8ae7cd6 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -4,7 +4,7 @@ import { ActivityPubActorType } from '../../shared/models/activitypub' import { FollowState } from '../../shared/models/actors' import { VideoAbuseState, VideoImportState, VideoPrivacy, VideoTranscodingFPS } from '../../shared/models/videos' // Do not use barrels, remain constants as independent as possible -import { isTestInstance, sanitizeHost, sanitizeUrl, root, parseDurationToMs } from '../helpers/core-utils' +import { isTestInstance, sanitizeHost, sanitizeUrl, root } from '../helpers/core-utils' import { NSFWPolicyType } from '../../shared/models/videos/nsfw-policy.type' import { invert } from 'lodash' import { CronRepeatOptions, EveryRepeatOptions } from 'bull' @@ -310,8 +310,8 @@ let CONTACT_FORM_LIFETIME = 60000 * 60 // 1 hour const VIDEO_TRANSCODING_FPS: VideoTranscodingFPS = { MIN: 10, - STANDARD: [24, 25, 30], - HD_STANDARD: [50, 60], + STANDARD: [ 24, 25, 30 ], + HD_STANDARD: [ 50, 60 ], AVERAGE: 30, MAX: 60, KEEP_ORIGIN_FPS_RESOLUTION_MIN: 720 // We keep the original FPS on high resolutions (720 minimum) @@ -361,42 +361,42 @@ const VIDEO_LICENCES = { 7: 'Public Domain Dedication' } -let VIDEO_LANGUAGES: { [id: string]: string } = {} +const VIDEO_LANGUAGES: { [id: string]: string } = {} const VIDEO_PRIVACIES = { - [ VideoPrivacy.PUBLIC ]: 'Public', - [ VideoPrivacy.UNLISTED ]: 'Unlisted', - [ VideoPrivacy.PRIVATE ]: 'Private', - [ VideoPrivacy.INTERNAL ]: 'Internal' + [VideoPrivacy.PUBLIC]: 'Public', + [VideoPrivacy.UNLISTED]: 'Unlisted', + [VideoPrivacy.PRIVATE]: 'Private', + [VideoPrivacy.INTERNAL]: 'Internal' } const VIDEO_STATES = { - [ VideoState.PUBLISHED ]: 'Published', - [ VideoState.TO_TRANSCODE ]: 'To transcode', - [ VideoState.TO_IMPORT ]: 'To import' + [VideoState.PUBLISHED]: 'Published', + [VideoState.TO_TRANSCODE]: 'To transcode', + [VideoState.TO_IMPORT]: 'To import' } const VIDEO_IMPORT_STATES = { - [ VideoImportState.FAILED ]: 'Failed', - [ VideoImportState.PENDING ]: 'Pending', - [ VideoImportState.SUCCESS ]: 'Success' + [VideoImportState.FAILED]: 'Failed', + [VideoImportState.PENDING]: 'Pending', + [VideoImportState.SUCCESS]: 'Success' } const VIDEO_ABUSE_STATES = { - [ VideoAbuseState.PENDING ]: 'Pending', - [ VideoAbuseState.REJECTED ]: 'Rejected', - [ VideoAbuseState.ACCEPTED ]: 'Accepted' + [VideoAbuseState.PENDING]: 'Pending', + [VideoAbuseState.REJECTED]: 'Rejected', + [VideoAbuseState.ACCEPTED]: 'Accepted' } const VIDEO_PLAYLIST_PRIVACIES = { - [ VideoPlaylistPrivacy.PUBLIC ]: 'Public', - [ VideoPlaylistPrivacy.UNLISTED ]: 'Unlisted', - [ VideoPlaylistPrivacy.PRIVATE ]: 'Private' + [VideoPlaylistPrivacy.PUBLIC]: 'Public', + [VideoPlaylistPrivacy.UNLISTED]: 'Unlisted', + [VideoPlaylistPrivacy.PRIVATE]: 'Private' } const VIDEO_PLAYLIST_TYPES = { - [ VideoPlaylistType.REGULAR ]: 'Regular', - [ VideoPlaylistType.WATCH_LATER ]: 'Watch later' + [VideoPlaylistType.REGULAR]: 'Regular', + [VideoPlaylistType.WATCH_LATER]: 'Watch later' } const MIMETYPES = { @@ -533,7 +533,7 @@ const LAZY_STATIC_PATHS = { } // Cache control -let STATIC_MAX_AGE = { +const STATIC_MAX_AGE = { SERVER: '2h', CLIENT: '30d' } @@ -671,14 +671,14 @@ if (isTestInstance() === true) { SCHEDULER_INTERVALS_MS.removeOldViews = 5000 SCHEDULER_INTERVALS_MS.updateVideos = 5000 SCHEDULER_INTERVALS_MS.autoFollowIndexInstances = 5000 - REPEAT_JOBS[ 'videos-views' ] = { every: 5000 } + REPEAT_JOBS['videos-views'] = { every: 5000 } REDUNDANCY.VIDEOS.RANDOMIZED_FACTOR = 1 VIDEO_VIEW_LIFETIME = 1000 // 1 second CONTACT_FORM_LIFETIME = 1000 // 1 second - JOB_ATTEMPTS[ 'email' ] = 1 + JOB_ATTEMPTS['email'] = 1 FILES_CACHE.VIDEO_CAPTIONS.MAX_AGE = 3000 MEMOIZE_TTL.OVERVIEWS_SAMPLE = 1 @@ -838,42 +838,42 @@ function loadLanguages () { function buildLanguages () { const iso639 = require('iso-639-3') - const languages: { [ id: string ]: string } = {} + const languages: { [id: string]: string } = {} const additionalLanguages = { - 'sgn': true, // Sign languages (macro language) - 'ase': true, // American sign language - 'sdl': true, // Arabian sign language - 'bfi': true, // British sign language - 'bzs': true, // Brazilian sign language - 'csl': true, // Chinese sign language - 'cse': true, // Czech sign language - 'dsl': true, // Danish sign language - 'fsl': true, // French sign language - 'gsg': true, // German sign language - 'pks': true, // Pakistan sign language - 'jsl': true, // Japanese sign language - 'sfs': true, // South African sign language - 'swl': true, // Swedish sign language - 'rsl': true, // Russian sign language: true - - 'epo': true, // Esperanto - 'tlh': true, // Klingon - 'jbo': true, // Lojban - 'avk': true // Kotava + sgn: true, // Sign languages (macro language) + ase: true, // American sign language + sdl: true, // Arabian sign language + bfi: true, // British sign language + bzs: true, // Brazilian sign language + csl: true, // Chinese sign language + cse: true, // Czech sign language + dsl: true, // Danish sign language + fsl: true, // French sign language + gsg: true, // German sign language + pks: true, // Pakistan sign language + jsl: true, // Japanese sign language + sfs: true, // South African sign language + swl: true, // Swedish sign language + rsl: true, // Russian sign language: true + + epo: true, // Esperanto + tlh: true, // Klingon + jbo: true, // Lojban + avk: true // Kotava } // Only add ISO639-1 languages and some sign languages (ISO639-3) iso639 .filter(l => { return (l.iso6391 !== null && l.type === 'living') || - additionalLanguages[ l.iso6393 ] === true + additionalLanguages[l.iso6393] === true }) - .forEach(l => languages[ l.iso6391 || l.iso6393 ] = l.name) + .forEach(l => { languages[l.iso6391 || l.iso6393] = l.name }) // Override Occitan label - languages[ 'oc' ] = 'Occitan' - languages[ 'el' ] = 'Greek' + languages['oc'] = 'Occitan' + languages['el'] = 'Greek' return languages } diff --git a/server/initializers/database.ts b/server/initializers/database.ts index 9ec146ab1..eedaf3c4e 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -119,8 +119,6 @@ async function initDatabaseModels (silent: boolean) { await createFunctions() if (!silent) logger.info('Database %s is ready.', dbname) - - return } // --------------------------------------------------------------------------- diff --git a/server/initializers/migrations/0005-email-pod.ts b/server/initializers/migrations/0005-email-pod.ts index c34a12255..417c33b1f 100644 --- a/server/initializers/migrations/0005-email-pod.ts +++ b/server/initializers/migrations/0005-email-pod.ts @@ -3,8 +3,8 @@ import * as Promise from 'bluebird' import { Migration } from '../../models/migrations' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0010-email-user.ts b/server/initializers/migrations/0010-email-user.ts index 37a7b0bb3..f7d01f6d6 100644 --- a/server/initializers/migrations/0010-email-user.ts +++ b/server/initializers/migrations/0010-email-user.ts @@ -3,8 +3,8 @@ import * as Promise from 'bluebird' import { Migration } from '../../models/migrations' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0015-video-views.ts b/server/initializers/migrations/0015-video-views.ts index 25164ff4d..47dd4069b 100644 --- a/server/initializers/migrations/0015-video-views.ts +++ b/server/initializers/migrations/0015-video-views.ts @@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize' import * as Promise from 'bluebird' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0020-video-likes.ts b/server/initializers/migrations/0020-video-likes.ts index 945be5a98..44333f3b0 100644 --- a/server/initializers/migrations/0020-video-likes.ts +++ b/server/initializers/migrations/0020-video-likes.ts @@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize' import * as Promise from 'bluebird' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0025-video-dislikes.ts b/server/initializers/migrations/0025-video-dislikes.ts index 27144c437..2aa22e2d7 100644 --- a/server/initializers/migrations/0025-video-dislikes.ts +++ b/server/initializers/migrations/0025-video-dislikes.ts @@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize' import * as Promise from 'bluebird' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0030-video-category.ts b/server/initializers/migrations/0030-video-category.ts index f784f820d..00cd2d8cf 100644 --- a/server/initializers/migrations/0030-video-category.ts +++ b/server/initializers/migrations/0030-video-category.ts @@ -3,8 +3,8 @@ import * as Promise from 'bluebird' import { Migration } from '../../models/migrations' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0035-video-licence.ts b/server/initializers/migrations/0035-video-licence.ts index 3d0b0bac9..61d666c5e 100644 --- a/server/initializers/migrations/0035-video-licence.ts +++ b/server/initializers/migrations/0035-video-licence.ts @@ -3,8 +3,8 @@ import * as Promise from 'bluebird' import { Migration } from '../../models/migrations' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0040-video-nsfw.ts b/server/initializers/migrations/0040-video-nsfw.ts index f7f70d3c4..44aec8a6c 100644 --- a/server/initializers/migrations/0040-video-nsfw.ts +++ b/server/initializers/migrations/0040-video-nsfw.ts @@ -3,8 +3,8 @@ import * as Promise from 'bluebird' import { Migration } from '../../models/migrations' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0045-user-display-nsfw.ts b/server/initializers/migrations/0045-user-display-nsfw.ts index aef420f0e..07795bd75 100644 --- a/server/initializers/migrations/0045-user-display-nsfw.ts +++ b/server/initializers/migrations/0045-user-display-nsfw.ts @@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize' import * as Promise from 'bluebird' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0050-video-language.ts b/server/initializers/migrations/0050-video-language.ts index 796fa5f95..6f90abb44 100644 --- a/server/initializers/migrations/0050-video-language.ts +++ b/server/initializers/migrations/0050-video-language.ts @@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize' import * as Promise from 'bluebird' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0055-video-uuid.ts b/server/initializers/migrations/0055-video-uuid.ts index e0f904080..8a58aebb8 100644 --- a/server/initializers/migrations/0055-video-uuid.ts +++ b/server/initializers/migrations/0055-video-uuid.ts @@ -3,8 +3,8 @@ import * as Promise from 'bluebird' import { Migration } from '../../models/migrations' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0060-video-file.ts b/server/initializers/migrations/0060-video-file.ts index c362cf71a..00647e60e 100644 --- a/server/initializers/migrations/0060-video-file.ts +++ b/server/initializers/migrations/0060-video-file.ts @@ -2,9 +2,9 @@ import * as Sequelize from 'sequelize' import * as Promise from 'bluebird' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0065-video-file-size.ts b/server/initializers/migrations/0065-video-file-size.ts index e9ce77e50..0bdc675c2 100644 --- a/server/initializers/migrations/0065-video-file-size.ts +++ b/server/initializers/migrations/0065-video-file-size.ts @@ -5,9 +5,9 @@ import { VideoModel } from '../../models/video/video' import { getVideoFilePath } from '@server/lib/video-paths' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { return utils.db.Video.listOwnedAndPopulateAuthorAndTags() diff --git a/server/initializers/migrations/0070-user-video-quota.ts b/server/initializers/migrations/0070-user-video-quota.ts index 37683432f..1d073f244 100644 --- a/server/initializers/migrations/0070-user-video-quota.ts +++ b/server/initializers/migrations/0070-user-video-quota.ts @@ -3,9 +3,9 @@ import * as Promise from 'bluebird' import { Migration } from '../../models/migrations' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0075-video-resolutions.ts b/server/initializers/migrations/0075-video-resolutions.ts index e4f26cb77..f56c1b2c3 100644 --- a/server/initializers/migrations/0075-video-resolutions.ts +++ b/server/initializers/migrations/0075-video-resolutions.ts @@ -5,9 +5,9 @@ import { getVideoFileResolution } from '../../helpers/ffmpeg-utils' import { readdir, rename } from 'fs-extra' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { const torrentDir = CONFIG.STORAGE.TORRENTS_DIR diff --git a/server/initializers/migrations/0080-video-channels.ts b/server/initializers/migrations/0080-video-channels.ts index 5512bdcf1..b8e9bd6d0 100644 --- a/server/initializers/migrations/0080-video-channels.ts +++ b/server/initializers/migrations/0080-video-channels.ts @@ -2,9 +2,9 @@ import * as Sequelize from 'sequelize' import * as uuidv4 from 'uuid/v4' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0085-user-role.ts b/server/initializers/migrations/0085-user-role.ts index de75faec2..ec7428fd5 100644 --- a/server/initializers/migrations/0085-user-role.ts +++ b/server/initializers/migrations/0085-user-role.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0090-videos-description.ts b/server/initializers/migrations/0090-videos-description.ts index 6f98dcade..32e518d75 100644 --- a/server/initializers/migrations/0090-videos-description.ts +++ b/server/initializers/migrations/0090-videos-description.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0095-videos-privacy.ts b/server/initializers/migrations/0095-videos-privacy.ts index 4c2bf91d0..c732d6f6a 100644 --- a/server/initializers/migrations/0095-videos-privacy.ts +++ b/server/initializers/migrations/0095-videos-privacy.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0100-activitypub.ts b/server/initializers/migrations/0100-activitypub.ts index 96d44a7ce..05fd37406 100644 --- a/server/initializers/migrations/0100-activitypub.ts +++ b/server/initializers/migrations/0100-activitypub.ts @@ -7,9 +7,9 @@ import { ApplicationModel } from '../../models/application/application' import { SERVER_ACTOR_NAME } from '../constants' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0105-server-mail.ts b/server/initializers/migrations/0105-server-mail.ts index 4b9600e91..5ee37c418 100644 --- a/server/initializers/migrations/0105-server-mail.ts +++ b/server/initializers/migrations/0105-server-mail.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { await utils.queryInterface.removeColumn('Servers', 'email') diff --git a/server/initializers/migrations/0110-server-key.ts b/server/initializers/migrations/0110-server-key.ts index 5ff6daf69..354cd7e76 100644 --- a/server/initializers/migrations/0110-server-key.ts +++ b/server/initializers/migrations/0110-server-key.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { await utils.queryInterface.removeColumn('Servers', 'publicKey') diff --git a/server/initializers/migrations/0115-account-avatar.ts b/server/initializers/migrations/0115-account-avatar.ts index b318e8163..604b6394a 100644 --- a/server/initializers/migrations/0115-account-avatar.ts +++ b/server/initializers/migrations/0115-account-avatar.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { await utils.db.Avatar.sync() diff --git a/server/initializers/migrations/0120-video-null.ts b/server/initializers/migrations/0120-video-null.ts index 6d253f04f..1b407b270 100644 --- a/server/initializers/migrations/0120-video-null.ts +++ b/server/initializers/migrations/0120-video-null.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { diff --git a/server/initializers/migrations/0125-table-lowercase.ts b/server/initializers/migrations/0125-table-lowercase.ts index 78041ccb0..f75a56791 100644 --- a/server/initializers/migrations/0125-table-lowercase.ts +++ b/server/initializers/migrations/0125-table-lowercase.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { await utils.queryInterface.renameTable('Applications', 'application') diff --git a/server/initializers/migrations/0130-user-autoplay-video.ts b/server/initializers/migrations/0130-user-autoplay-video.ts index 9f6878e39..d57934588 100644 --- a/server/initializers/migrations/0130-user-autoplay-video.ts +++ b/server/initializers/migrations/0130-user-autoplay-video.ts @@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize' import * as Promise from 'bluebird' function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const q = utils.queryInterface diff --git a/server/initializers/migrations/0135-video-channel-actor.ts b/server/initializers/migrations/0135-video-channel-actor.ts index 5ace0f4d2..c0c343384 100644 --- a/server/initializers/migrations/0135-video-channel-actor.ts +++ b/server/initializers/migrations/0135-video-channel-actor.ts @@ -3,8 +3,8 @@ import { DataType } from 'sequelize-typescript' import { createPrivateAndPublicKeys } from '../../helpers/peertube-crypto' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { // Create actor table @@ -64,10 +64,10 @@ async function up (utils: { type, uuid, "preferredUsername", url, "publicKey", "privateKey", "followersCount", "followingCount", "inboxUrl", "outboxUrl", "sharedInboxUrl", "followersUrl", "followingUrl", "avatarId", "serverId", "createdAt", "updatedAt" ) - SELECT + SELECT 'Application', uuid, name, url, "publicKey", "privateKey", "followersCount", "followingCount", "inboxUrl", "outboxUrl", - "sharedInboxUrl", "followersUrl", "followingUrl", "avatarId", "serverId", "createdAt", "updatedAt" - FROM account + "sharedInboxUrl", "followersUrl", "followingUrl", "avatarId", "serverId", "createdAt", "updatedAt" + FROM account WHERE "applicationId" IS NOT NULL ` await utils.sequelize.query(query1) @@ -79,10 +79,10 @@ async function up (utils: { type, uuid, "preferredUsername", url, "publicKey", "privateKey", "followersCount", "followingCount", "inboxUrl", "outboxUrl", "sharedInboxUrl", "followersUrl", "followingUrl", "avatarId", "serverId", "createdAt", "updatedAt" ) - SELECT + SELECT 'Person', uuid, name, url, "publicKey", "privateKey", "followersCount", "followingCount", "inboxUrl", "outboxUrl", - "sharedInboxUrl", "followersUrl", "followingUrl", "avatarId", "serverId", "createdAt", "updatedAt" - FROM account + "sharedInboxUrl", "followersUrl", "followingUrl", "avatarId", "serverId", "createdAt", "updatedAt" + FROM account WHERE "applicationId" IS NULL ` await utils.sequelize.query(query2) @@ -108,17 +108,17 @@ async function up (utils: { } { - const query = ` - INSERT INTO actor + const query = ` + INSERT INTO actor ( - type, uuid, "preferredUsername", url, "publicKey", "privateKey", "followersCount", "followingCount", "inboxUrl", "outboxUrl", + type, uuid, "preferredUsername", url, "publicKey", "privateKey", "followersCount", "followingCount", "inboxUrl", "outboxUrl", "sharedInboxUrl", "followersUrl", "followingUrl", "avatarId", "serverId", "createdAt", "updatedAt" ) - SELECT - 'Group', "videoChannel".uuid, "videoChannel".uuid, "videoChannel".url, null, null, 0, 0, "videoChannel".url || '/inbox', + SELECT + 'Group', "videoChannel".uuid, "videoChannel".uuid, "videoChannel".url, null, null, 0, 0, "videoChannel".url || '/inbox', "videoChannel".url || '/outbox', "videoChannel".url || '/inbox', "videoChannel".url || '/followers', "videoChannel".url || '/following', - null, account."serverId", "videoChannel"."createdAt", "videoChannel"."updatedAt" - FROM "videoChannel" + null, account."serverId", "videoChannel"."createdAt", "videoChannel"."updatedAt" + FROM "videoChannel" INNER JOIN "account" on "videoChannel"."accountId" = "account".id ` await utils.sequelize.query(query) @@ -157,13 +157,13 @@ async function up (utils: { } { - const query1 = `UPDATE "actorFollow" - SET "actorId" = + const query1 = `UPDATE "actorFollow" + SET "actorId" = (SELECT "account"."actorId" FROM account WHERE "account"."id" = "actorFollow"."actorId")` await utils.sequelize.query(query1) - const query2 = `UPDATE "actorFollow" - SET "targetActorId" = + const query2 = `UPDATE "actorFollow" + SET "targetActorId" = (SELECT "account"."actorId" FROM account WHERE "account"."id" = "actorFollow"."targetActorId")` await utils.sequelize.query(query2) @@ -189,8 +189,8 @@ async function up (utils: { await utils.queryInterface.removeConstraint('videoShare', 'videoShare_accountId_fkey') } - const query = `UPDATE "videoShare" - SET "actorId" = + const query = `UPDATE "videoShare" + SET "actorId" = (SELECT "actorId" FROM account WHERE id = "videoShare"."actorId")` await utils.sequelize.query(query) diff --git a/server/initializers/migrations/0140-actor-url.ts b/server/initializers/migrations/0140-actor-url.ts index 020499391..d790988ad 100644 --- a/server/initializers/migrations/0140-actor-url.ts +++ b/server/initializers/migrations/0140-actor-url.ts @@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize' import { WEBSERVER } from '../constants' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const toReplace = WEBSERVER.HOSTNAME + ':443' diff --git a/server/initializers/migrations/0145-delete-author.ts b/server/initializers/migrations/0145-delete-author.ts index cb23d1cc2..6c9427997 100644 --- a/server/initializers/migrations/0145-delete-author.ts +++ b/server/initializers/migrations/0145-delete-author.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { await utils.queryInterface.dropTable('Authors') diff --git a/server/initializers/migrations/0150-avatar-cascade.ts b/server/initializers/migrations/0150-avatar-cascade.ts index 821696717..fb3b25773 100644 --- a/server/initializers/migrations/0150-avatar-cascade.ts +++ b/server/initializers/migrations/0150-avatar-cascade.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { await utils.queryInterface.removeConstraint('actor', 'actor_avatarId_fkey') diff --git a/server/initializers/migrations/0155-video-comments-enabled.ts b/server/initializers/migrations/0155-video-comments-enabled.ts index 6949d3a0c..691640b35 100644 --- a/server/initializers/migrations/0155-video-comments-enabled.ts +++ b/server/initializers/migrations/0155-video-comments-enabled.ts @@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize' import { Migration } from '../../models/migrations' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const data = { diff --git a/server/initializers/migrations/0160-account-route.ts b/server/initializers/migrations/0160-account-route.ts index cab4c72f1..97469948b 100644 --- a/server/initializers/migrations/0160-account-route.ts +++ b/server/initializers/migrations/0160-account-route.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { { diff --git a/server/initializers/migrations/0165-video-route.ts b/server/initializers/migrations/0165-video-route.ts index 56d98bc69..aa7c75128 100644 --- a/server/initializers/migrations/0165-video-route.ts +++ b/server/initializers/migrations/0165-video-route.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { { diff --git a/server/initializers/migrations/0170-actor-follow-score.ts b/server/initializers/migrations/0170-actor-follow-score.ts index a12b35da9..901a3c799 100644 --- a/server/initializers/migrations/0170-actor-follow-score.ts +++ b/server/initializers/migrations/0170-actor-follow-score.ts @@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize' import { ACTOR_FOLLOW_SCORE } from '../constants' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { await utils.queryInterface.removeColumn('server', 'score') diff --git a/server/initializers/migrations/0175-actor-follow-counts.ts b/server/initializers/migrations/0175-actor-follow-counts.ts index 4fb524181..d7853f8dc 100644 --- a/server/initializers/migrations/0175-actor-follow-counts.ts +++ b/server/initializers/migrations/0175-actor-follow-counts.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const query = 'UPDATE "actor" SET ' + diff --git a/server/initializers/migrations/0180-job-table-delete.ts b/server/initializers/migrations/0180-job-table-delete.ts index df29145d0..fb48a0c9d 100644 --- a/server/initializers/migrations/0180-job-table-delete.ts +++ b/server/initializers/migrations/0180-job-table-delete.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { await utils.queryInterface.dropTable('job') diff --git a/server/initializers/migrations/0185-video-share-url.ts b/server/initializers/migrations/0185-video-share-url.ts index f7eeb0878..f59931e0f 100644 --- a/server/initializers/migrations/0185-video-share-url.ts +++ b/server/initializers/migrations/0185-video-share-url.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { { diff --git a/server/initializers/migrations/0190-video-comment-unique-url.ts b/server/initializers/migrations/0190-video-comment-unique-url.ts index b196c9352..a8769ed41 100644 --- a/server/initializers/migrations/0190-video-comment-unique-url.ts +++ b/server/initializers/migrations/0190-video-comment-unique-url.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { { diff --git a/server/initializers/migrations/0195-support.ts b/server/initializers/migrations/0195-support.ts index 3b9eabe79..3f7c75dce 100644 --- a/server/initializers/migrations/0195-support.ts +++ b/server/initializers/migrations/0195-support.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { { diff --git a/server/initializers/migrations/0200-video-published-at.ts b/server/initializers/migrations/0200-video-published-at.ts index 1701ea07a..d8c7b42a7 100644 --- a/server/initializers/migrations/0200-video-published-at.ts +++ b/server/initializers/migrations/0200-video-published-at.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { diff --git a/server/initializers/migrations/0205-user-nsfw-policy.ts b/server/initializers/migrations/0205-user-nsfw-policy.ts index d0f6e8962..9c2786f12 100644 --- a/server/initializers/migrations/0205-user-nsfw-policy.ts +++ b/server/initializers/migrations/0205-user-nsfw-policy.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { diff --git a/server/initializers/migrations/0210-video-language.ts b/server/initializers/migrations/0210-video-language.ts index ca95c7527..ee4ce9266 100644 --- a/server/initializers/migrations/0210-video-language.ts +++ b/server/initializers/migrations/0210-video-language.ts @@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize' import { CONSTRAINTS_FIELDS } from '../constants' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { diff --git a/server/initializers/migrations/0215-video-support-length.ts b/server/initializers/migrations/0215-video-support-length.ts index ba395050f..26c0ca700 100644 --- a/server/initializers/migrations/0215-video-support-length.ts +++ b/server/initializers/migrations/0215-video-support-length.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { { diff --git a/server/initializers/migrations/0255-video-blacklist-reason.ts b/server/initializers/migrations/0255-video-blacklist-reason.ts index 69d6efb9e..7de982f93 100644 --- a/server/initializers/migrations/0255-video-blacklist-reason.ts +++ b/server/initializers/migrations/0255-video-blacklist-reason.ts @@ -1,5 +1,4 @@ import * as Sequelize from 'sequelize' -import { VideoAbuseState } from '../../../shared/models/videos' async function up (utils: { transaction: Sequelize.Transaction diff --git a/server/initializers/migrations/0285-description-support.ts b/server/initializers/migrations/0285-description-support.ts index 85ef4ef39..aab3a938f 100644 --- a/server/initializers/migrations/0285-description-support.ts +++ b/server/initializers/migrations/0285-description-support.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0290-account-video-rate-url.ts b/server/initializers/migrations/0290-account-video-rate-url.ts index bdabf2929..b974b1a81 100644 --- a/server/initializers/migrations/0290-account-video-rate-url.ts +++ b/server/initializers/migrations/0290-account-video-rate-url.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0295-video-file-extname.ts b/server/initializers/migrations/0295-video-file-extname.ts index dbf249f66..e1999b072 100644 --- a/server/initializers/migrations/0295-video-file-extname.ts +++ b/server/initializers/migrations/0295-video-file-extname.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0300-user-videos-history-enabled.ts b/server/initializers/migrations/0300-user-videos-history-enabled.ts index aa5fc21fb..5e35e14ba 100644 --- a/server/initializers/migrations/0300-user-videos-history-enabled.ts +++ b/server/initializers/migrations/0300-user-videos-history-enabled.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0305-fix-unfederated-videos.ts b/server/initializers/migrations/0305-fix-unfederated-videos.ts index be206601f..9c5d56b7b 100644 --- a/server/initializers/migrations/0305-fix-unfederated-videos.ts +++ b/server/initializers/migrations/0305-fix-unfederated-videos.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0310-drop-unused-video-indexes.ts b/server/initializers/migrations/0310-drop-unused-video-indexes.ts index d51f430c0..181858d3d 100644 --- a/server/initializers/migrations/0310-drop-unused-video-indexes.ts +++ b/server/initializers/migrations/0310-drop-unused-video-indexes.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { const indexNames = [ diff --git a/server/initializers/migrations/0315-user-notifications.ts b/server/initializers/migrations/0315-user-notifications.ts index 8284c58a0..0e3f4fbef 100644 --- a/server/initializers/migrations/0315-user-notifications.ts +++ b/server/initializers/migrations/0315-user-notifications.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { diff --git a/server/initializers/migrations/0320-blacklist-unfederate.ts b/server/initializers/migrations/0320-blacklist-unfederate.ts index 6fb7bbb90..41de41c55 100644 --- a/server/initializers/migrations/0320-blacklist-unfederate.ts +++ b/server/initializers/migrations/0320-blacklist-unfederate.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { diff --git a/server/initializers/migrations/0325-video-abuse-fields.ts b/server/initializers/migrations/0325-video-abuse-fields.ts index fca6d666f..d88724a20 100644 --- a/server/initializers/migrations/0325-video-abuse-fields.ts +++ b/server/initializers/migrations/0325-video-abuse-fields.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { diff --git a/server/initializers/migrations/0330-video-streaming-playlist.ts b/server/initializers/migrations/0330-video-streaming-playlist.ts index c85a762ab..f75541a7f 100644 --- a/server/initializers/migrations/0330-video-streaming-playlist.ts +++ b/server/initializers/migrations/0330-video-streaming-playlist.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { diff --git a/server/initializers/migrations/0335-video-downloading-enabled.ts b/server/initializers/migrations/0335-video-downloading-enabled.ts index e79466447..c745f1f02 100644 --- a/server/initializers/migrations/0335-video-downloading-enabled.ts +++ b/server/initializers/migrations/0335-video-downloading-enabled.ts @@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize' import { Migration } from '../../models/migrations' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const data = { diff --git a/server/initializers/migrations/0340-add-originally-published-at.ts b/server/initializers/migrations/0340-add-originally-published-at.ts index fe4f4a5f9..7cbc14ab5 100644 --- a/server/initializers/migrations/0340-add-originally-published-at.ts +++ b/server/initializers/migrations/0340-add-originally-published-at.ts @@ -1,8 +1,8 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { diff --git a/server/initializers/migrations/0345-video-playlists.ts b/server/initializers/migrations/0345-video-playlists.ts index de69f5b9e..76813f93f 100644 --- a/server/initializers/migrations/0345-video-playlists.ts +++ b/server/initializers/migrations/0345-video-playlists.ts @@ -4,8 +4,8 @@ import * as uuidv4 from 'uuid/v4' import { WEBSERVER } from '../constants' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { const transaction = utils.transaction diff --git a/server/initializers/migrations/0350-video-blacklist-type.ts b/server/initializers/migrations/0350-video-blacklist-type.ts index 4849020ef..f79ae5ec7 100644 --- a/server/initializers/migrations/0350-video-blacklist-type.ts +++ b/server/initializers/migrations/0350-video-blacklist-type.ts @@ -2,9 +2,9 @@ import * as Sequelize from 'sequelize' import { VideoBlacklistType } from '../../../shared/models/videos' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0355-p2p-peer-version.ts b/server/initializers/migrations/0355-p2p-peer-version.ts index 18f23d9b7..89af28d07 100644 --- a/server/initializers/migrations/0355-p2p-peer-version.ts +++ b/server/initializers/migrations/0355-p2p-peer-version.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { diff --git a/server/initializers/migrations/0360-notification-instance-follower.ts b/server/initializers/migrations/0360-notification-instance-follower.ts index 05caf8e1d..6f9a01a9c 100644 --- a/server/initializers/migrations/0360-notification-instance-follower.ts +++ b/server/initializers/migrations/0360-notification-instance-follower.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0365-user-admin-flags.ts b/server/initializers/migrations/0365-user-admin-flags.ts index 20553100a..b705387da 100644 --- a/server/initializers/migrations/0365-user-admin-flags.ts +++ b/server/initializers/migrations/0365-user-admin-flags.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0370-thumbnail.ts b/server/initializers/migrations/0370-thumbnail.ts index 384ca1a15..07c25436a 100644 --- a/server/initializers/migrations/0370-thumbnail.ts +++ b/server/initializers/migrations/0370-thumbnail.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0375-account-description.ts b/server/initializers/migrations/0375-account-description.ts index 1258563fd..f9af942e0 100644 --- a/server/initializers/migrations/0375-account-description.ts +++ b/server/initializers/migrations/0375-account-description.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { const data = { diff --git a/server/initializers/migrations/0380-cleanup-timestamps.ts b/server/initializers/migrations/0380-cleanup-timestamps.ts index 2a9fd6f02..18ecfb997 100644 --- a/server/initializers/migrations/0380-cleanup-timestamps.ts +++ b/server/initializers/migrations/0380-cleanup-timestamps.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { try { diff --git a/server/initializers/migrations/0385-remove-actor-uuid.ts b/server/initializers/migrations/0385-remove-actor-uuid.ts index 032c0562b..eefbc386b 100644 --- a/server/initializers/migrations/0385-remove-actor-uuid.ts +++ b/server/initializers/migrations/0385-remove-actor-uuid.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { await utils.queryInterface.removeColumn('actor', 'uuid') diff --git a/server/initializers/migrations/0390-user-pending-email.ts b/server/initializers/migrations/0390-user-pending-email.ts index 5ca871746..9cf0affa5 100644 --- a/server/initializers/migrations/0390-user-pending-email.ts +++ b/server/initializers/migrations/0390-user-pending-email.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { const data = { diff --git a/server/initializers/migrations/0395-user-video-languages.ts b/server/initializers/migrations/0395-user-video-languages.ts index 278698bf4..9c24fbc9a 100644 --- a/server/initializers/migrations/0395-user-video-languages.ts +++ b/server/initializers/migrations/0395-user-video-languages.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { const data = { diff --git a/server/initializers/migrations/0400-user-theme.ts b/server/initializers/migrations/0400-user-theme.ts index f74d76115..7addb1bb3 100644 --- a/server/initializers/migrations/0400-user-theme.ts +++ b/server/initializers/migrations/0400-user-theme.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { const data = { diff --git a/server/initializers/migrations/0405-plugin.ts b/server/initializers/migrations/0405-plugin.ts index c55b81960..5c290b986 100644 --- a/server/initializers/migrations/0405-plugin.ts +++ b/server/initializers/migrations/0405-plugin.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0410-video-playlist-element.ts b/server/initializers/migrations/0410-video-playlist-element.ts index f536632a2..1b4692357 100644 --- a/server/initializers/migrations/0410-video-playlist-element.ts +++ b/server/initializers/migrations/0410-video-playlist-element.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0415-thumbnail-auto-generated.ts b/server/initializers/migrations/0415-thumbnail-auto-generated.ts index f822a4c05..98d563c88 100644 --- a/server/initializers/migrations/0415-thumbnail-auto-generated.ts +++ b/server/initializers/migrations/0415-thumbnail-auto-generated.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0420-avatar-lazy.ts b/server/initializers/migrations/0420-avatar-lazy.ts index 5fc57aac2..5c74819d2 100644 --- a/server/initializers/migrations/0420-avatar-lazy.ts +++ b/server/initializers/migrations/0420-avatar-lazy.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0425-nullable-actor-fields.ts b/server/initializers/migrations/0425-nullable-actor-fields.ts index 4e5f9e6ab..720b99ccc 100644 --- a/server/initializers/migrations/0425-nullable-actor-fields.ts +++ b/server/initializers/migrations/0425-nullable-actor-fields.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { const data = { diff --git a/server/initializers/migrations/0430-auto-follow-notification-setting.ts b/server/initializers/migrations/0430-auto-follow-notification-setting.ts index 034bdd46d..1734828a4 100644 --- a/server/initializers/migrations/0430-auto-follow-notification-setting.ts +++ b/server/initializers/migrations/0430-auto-follow-notification-setting.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0435-user-modals.ts b/server/initializers/migrations/0435-user-modals.ts index 5c2aa85b5..737440e9b 100644 --- a/server/initializers/migrations/0435-user-modals.ts +++ b/server/initializers/migrations/0435-user-modals.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0440-user-auto-play-next-video.ts b/server/initializers/migrations/0440-user-auto-play-next-video.ts index f0baafe7b..f3f663f59 100644 --- a/server/initializers/migrations/0440-user-auto-play-next-video.ts +++ b/server/initializers/migrations/0440-user-auto-play-next-video.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0445-shared-inbox-optional.ts b/server/initializers/migrations/0445-shared-inbox-optional.ts index dad2d6569..ade1a2a57 100644 --- a/server/initializers/migrations/0445-shared-inbox-optional.ts +++ b/server/initializers/migrations/0445-shared-inbox-optional.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0450-streaming-playlist-files.ts b/server/initializers/migrations/0450-streaming-playlist-files.ts index 460dac8be..08e2e3989 100644 --- a/server/initializers/migrations/0450-streaming-playlist-files.ts +++ b/server/initializers/migrations/0450-streaming-playlist-files.ts @@ -1,15 +1,9 @@ import * as Sequelize from 'sequelize' -import { join } from 'path' -import { HLS_STREAMING_PLAYLIST_DIRECTORY, WEBSERVER } from '@server/initializers/constants' -import { CONFIG } from '@server/initializers/config' -import { pathExists, stat, writeFile } from 'fs-extra' -import * as parseTorrent from 'parse-torrent' -import { createTorrentPromise } from '@server/helpers/webtorrent' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { @@ -42,8 +36,8 @@ async function up (utils: { { const query = 'insert into "videoFile" ' + '(resolution, size, "infoHash", "videoId", "createdAt", "updatedAt", fps, extname, "videoStreamingPlaylistId")' + - '(SELECT "videoFile".resolution, "videoFile".size, \'fake\', NULL, "videoFile"."createdAt", "videoFile"."updatedAt", "videoFile"."fps", ' + - '"videoFile".extname, "videoStreamingPlaylist".id FROM "videoStreamingPlaylist" ' + + '(SELECT "videoFile".resolution, "videoFile".size, \'fake\', NULL, "videoFile"."createdAt", "videoFile"."updatedAt", ' + + '"videoFile"."fps", "videoFile".extname, "videoStreamingPlaylist".id FROM "videoStreamingPlaylist" ' + 'inner join video ON video.id = "videoStreamingPlaylist"."videoId" inner join "videoFile" ON "videoFile"."videoId" = video.id)' await utils.sequelize.query(query, { transaction: utils.transaction }) diff --git a/server/initializers/migrations/0455-soft-delete-video-comments.ts b/server/initializers/migrations/0455-soft-delete-video-comments.ts index bcfb97b56..00e56015f 100644 --- a/server/initializers/migrations/0455-soft-delete-video-comments.ts +++ b/server/initializers/migrations/0455-soft-delete-video-comments.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0460-user-playlist-autoplay.ts b/server/initializers/migrations/0460-user-playlist-autoplay.ts index 3067ac1a4..d6f5081ab 100644 --- a/server/initializers/migrations/0460-user-playlist-autoplay.ts +++ b/server/initializers/migrations/0460-user-playlist-autoplay.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0465-thumbnail-file-url-length.ts b/server/initializers/migrations/0465-thumbnail-file-url-length.ts index db8c85c29..84a4fa0ba 100644 --- a/server/initializers/migrations/0465-thumbnail-file-url-length.ts +++ b/server/initializers/migrations/0465-thumbnail-file-url-length.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0470-cleaup-indexes.ts b/server/initializers/migrations/0470-cleaup-indexes.ts index 53e401c2b..7365c30f8 100644 --- a/server/initializers/migrations/0470-cleaup-indexes.ts +++ b/server/initializers/migrations/0470-cleaup-indexes.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { await utils.sequelize.query('DROP INDEX IF EXISTS video_share_account_id;') diff --git a/server/initializers/migrations/0475-redundancy-expires-on.ts b/server/initializers/migrations/0475-redundancy-expires-on.ts index 7e392c8c0..edbddba37 100644 --- a/server/initializers/migrations/0475-redundancy-expires-on.ts +++ b/server/initializers/migrations/0475-redundancy-expires-on.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrations/0480-caption-file-url.ts b/server/initializers/migrations/0480-caption-file-url.ts index 7d8a3d4b9..1f88206d3 100644 --- a/server/initializers/migrations/0480-caption-file-url.ts +++ b/server/initializers/migrations/0480-caption-file-url.ts @@ -1,9 +1,9 @@ import * as Sequelize from 'sequelize' async function up (utils: { - transaction: Sequelize.Transaction, - queryInterface: Sequelize.QueryInterface, - sequelize: Sequelize.Sequelize, + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize db: any }): Promise { { diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts index 1cb0116b7..77203ae24 100644 --- a/server/initializers/migrator.ts +++ b/server/initializers/migrator.ts @@ -20,7 +20,7 @@ async function migrate () { } const rows = await sequelizeTypescript.query<{ migrationVersion: number }>(query, options) - if (rows && rows[0] && rows[0].migrationVersion) { + if (rows?.[0]?.migrationVersion) { actualVersion = rows[0].migrationVersion } @@ -60,7 +60,7 @@ export { async function getMigrationScripts () { const files = await readdir(path.join(__dirname, 'migrations')) const filesToMigrate: { - version: string, + version: string script: string }[] = [] -- cgit v1.2.3