yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 02:09:37 +02:00
Code Issues Releases Wiki Activity

Upgrade sequelize to v6

Browse source
This commit is contained in:
Chocobozzz 2020-12-08 14:30:29 +01:00 • committed by Chocobozzz
parent 6c8c15f914
commit b49f22d8f9
75 changed files with 436 additions and 498 deletions
Download patch file Download diff file Expand all files Collapse all files

31
server/lib/client-html.ts
View file

@ -1,29 +1,28 @@
import * as express from 'express'
import * as Bluebird from 'bluebird'
import { readFile } from 'fs-extra'
import { join } from 'path'
import validator from 'validator'
import { buildFileLocale, getDefaultLocale, is18nLocale, POSSIBLE_LOCALES } from '../../shared/core-utils/i18n/i18n'
import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes'
import { VideoPlaylistPrivacy, VideoPrivacy } from '../../shared/models/videos'
import { escapeHTML, isTestInstance, sha256 } from '../helpers/core-utils'
import { logger } from '../helpers/logger'
import { CONFIG } from '../initializers/config'
import {
ACCEPT_HEADERS,
AVATARS_SIZE,
CUSTOM_HTML_TAG_COMMENTS,
EMBED_SIZE,
PLUGIN_GLOBAL_CSS_PATH,
WEBSERVER,
FILES_CONTENT_HASH,
ACCEPT_HEADERS
PLUGIN_GLOBAL_CSS_PATH,
WEBSERVER
} from '../initializers/constants'
import { join } from 'path'
import { escapeHTML, isTestInstance, sha256 } from '../helpers/core-utils'
import { VideoModel } from '../models/video/video'
import { VideoPlaylistModel } from '../models/video/video-playlist'
import validator from 'validator'
import { VideoPrivacy, VideoPlaylistPrivacy } from '../../shared/models/videos'
import { readFile } from 'fs-extra'
import { getActivityStreamDuration } from '../models/video/video-format-utils'
import { AccountModel } from '../models/account/account'
import { VideoModel } from '../models/video/video'
import { VideoChannelModel } from '../models/video/video-channel'
import { CONFIG } from '../initializers/config'
import { logger } from '../helpers/logger'
import { getActivityStreamDuration } from '../models/video/video-format-utils'
import { VideoPlaylistModel } from '../models/video/video-playlist'
import { MAccountActor, MChannelActor } from '../types/models'
import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes'
type Tags = {
ogType: string
@ -218,7 +217,7 @@ class ClientHtml {
}
private static async getAccountOrChannelHTMLPage (
loader: () => Bluebird<MAccountActor | MChannelActor>,
loader: () => Promise<MAccountActor | MChannelActor>,
req: express.Request,
res: express.Response
) {