diff options
author | Chocobozzz <me@florianbigard.com> | 2020-12-08 14:30:29 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2020-12-09 11:41:22 +0100 |
commit | b49f22d8f9a52ab75fd38db2d377249eb58fa678 (patch) | |
tree | a2825877d7b3b53454804a79c9d2a14c5d37385c /server/lib/client-html.ts | |
parent | 6c8c15f914cd375da1db5d0cd4d924a86c53d4c1 (diff) | |
download | PeerTube-b49f22d8f9a52ab75fd38db2d377249eb58fa678.tar.gz PeerTube-b49f22d8f9a52ab75fd38db2d377249eb58fa678.tar.zst PeerTube-b49f22d8f9a52ab75fd38db2d377249eb58fa678.zip |
Upgrade sequelize to v6
Diffstat (limited to 'server/lib/client-html.ts')
-rw-r--r-- | server/lib/client-html.ts | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts index 32f5d29ab..43585c591 100644 --- a/server/lib/client-html.ts +++ b/server/lib/client-html.ts | |||
@@ -1,29 +1,28 @@ | |||
1 | import * as express from 'express' | 1 | import * as express from 'express' |
2 | import * as Bluebird from 'bluebird' | 2 | import { readFile } from 'fs-extra' |
3 | import { join } from 'path' | ||
4 | import validator from 'validator' | ||
3 | import { buildFileLocale, getDefaultLocale, is18nLocale, POSSIBLE_LOCALES } from '../../shared/core-utils/i18n/i18n' | 5 | import { buildFileLocale, getDefaultLocale, is18nLocale, POSSIBLE_LOCALES } from '../../shared/core-utils/i18n/i18n' |
6 | import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes' | ||
7 | import { VideoPlaylistPrivacy, VideoPrivacy } from '../../shared/models/videos' | ||
8 | import { escapeHTML, isTestInstance, sha256 } from '../helpers/core-utils' | ||
9 | import { logger } from '../helpers/logger' | ||
10 | import { CONFIG } from '../initializers/config' | ||
4 | import { | 11 | import { |
12 | ACCEPT_HEADERS, | ||
5 | AVATARS_SIZE, | 13 | AVATARS_SIZE, |
6 | CUSTOM_HTML_TAG_COMMENTS, | 14 | CUSTOM_HTML_TAG_COMMENTS, |
7 | EMBED_SIZE, | 15 | EMBED_SIZE, |
8 | PLUGIN_GLOBAL_CSS_PATH, | ||
9 | WEBSERVER, | ||
10 | FILES_CONTENT_HASH, | 16 | FILES_CONTENT_HASH, |
11 | ACCEPT_HEADERS | 17 | PLUGIN_GLOBAL_CSS_PATH, |
18 | WEBSERVER | ||
12 | } from '../initializers/constants' | 19 | } from '../initializers/constants' |
13 | import { join } from 'path' | ||
14 | import { escapeHTML, isTestInstance, sha256 } from '../helpers/core-utils' | ||
15 | import { VideoModel } from '../models/video/video' | ||
16 | import { VideoPlaylistModel } from '../models/video/video-playlist' | ||
17 | import validator from 'validator' | ||
18 | import { VideoPrivacy, VideoPlaylistPrivacy } from '../../shared/models/videos' | ||
19 | import { readFile } from 'fs-extra' | ||
20 | import { getActivityStreamDuration } from '../models/video/video-format-utils' | ||
21 | import { AccountModel } from '../models/account/account' | 20 | import { AccountModel } from '../models/account/account' |
21 | import { VideoModel } from '../models/video/video' | ||
22 | import { VideoChannelModel } from '../models/video/video-channel' | 22 | import { VideoChannelModel } from '../models/video/video-channel' |
23 | import { CONFIG } from '../initializers/config' | 23 | import { getActivityStreamDuration } from '../models/video/video-format-utils' |
24 | import { logger } from '../helpers/logger' | 24 | import { VideoPlaylistModel } from '../models/video/video-playlist' |
25 | import { MAccountActor, MChannelActor } from '../types/models' | 25 | import { MAccountActor, MChannelActor } from '../types/models' |
26 | import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes' | ||
27 | 26 | ||
28 | type Tags = { | 27 | type Tags = { |
29 | ogType: string | 28 | ogType: string |
@@ -218,7 +217,7 @@ class ClientHtml { | |||
218 | } | 217 | } |
219 | 218 | ||
220 | private static async getAccountOrChannelHTMLPage ( | 219 | private static async getAccountOrChannelHTMLPage ( |
221 | loader: () => Bluebird<MAccountActor | MChannelActor>, | 220 | loader: () => Promise<MAccountActor | MChannelActor>, |
222 | req: express.Request, | 221 | req: express.Request, |
223 | res: express.Response | 222 | res: express.Response |
224 | ) { | 223 | ) { |