X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fstatic.ts;h=8a747ec52cbfeadd8657b27f0c75a175f0dc2a5a;hb=1e4d2cb5aef11898585fae4053da4ebd0a69b480;hp=e6a0628e68b9de16d9fa74b16ee008d56fce45dd;hpb=2cb03dc1f4e01ba491c36caff30c33fe9c5bad89;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/static.ts b/server/controllers/static.ts index e6a0628e6..8a747ec52 100644 --- a/server/controllers/static.ts +++ b/server/controllers/static.ts @@ -1,10 +1,10 @@ import * as cors from 'cors' import * as express from 'express' import { join } from 'path' -import { getRegisteredPlugins, getRegisteredThemes } from '@server/controllers/api/config' import { serveIndexHTML } from '@server/lib/client-html' +import { getEnabledResolutions, getRegisteredPlugins, getRegisteredThemes } from '@server/lib/config' import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes' -import { HttpNodeinfoDiasporaSoftwareNsSchema20 } from '../../shared/models/nodeinfo' +import { HttpNodeinfoDiasporaSoftwareNsSchema20 } from '../../shared/models/nodeinfo/nodeinfo.model' import { root } from '../helpers/core-utils' import { CONFIG, isEmailEnabled } from '../initializers/config' import { @@ -18,10 +18,9 @@ import { WEBSERVER } from '../initializers/constants' import { getThemeOrDefault } from '../lib/plugins/theme-utils' -import { getEnabledResolutions } from '../lib/video-transcoding' import { asyncMiddleware } from '../middlewares' import { cacheRoute } from '../middlewares/cache' -import { UserModel } from '../models/account/user' +import { UserModel } from '../models/user/user' import { VideoModel } from '../models/video/video' import { VideoCommentModel } from '../models/video/video-comment'