X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Flib%2Fplugins%2Fplugin-helpers-builder.ts;h=d235f52c08c07dfd29eb740c81119fbb5637b60a;hb=0c302acb3c358b4d4d8dee45aed1de1108ea37ea;hp=e75c0b99429c8d8da2f892761ce318429d007cee;hpb=9972ace3a3bc65865fb3aaaa865a400386e49252;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/plugins/plugin-helpers-builder.ts b/server/lib/plugins/plugin-helpers-builder.ts index e75c0b994..d235f52c0 100644 --- a/server/lib/plugins/plugin-helpers-builder.ts +++ b/server/lib/plugins/plugin-helpers-builder.ts @@ -1,7 +1,6 @@ import express from 'express' import { Server } from 'http' import { join } from 'path' -import { ffprobePromise } from '@server/helpers/ffmpeg/ffprobe-utils' import { buildLogger } from '@server/helpers/logger' import { CONFIG } from '@server/initializers/config' import { WEBSERVER } from '@server/initializers/constants' @@ -16,6 +15,7 @@ import { VideoModel } from '@server/models/video/video' import { VideoBlacklistModel } from '@server/models/video/video-blacklist' import { MPlugin, MVideo, UserNotificationModelForApi } from '@server/types/models' import { PeerTubeHelpers } from '@server/types/plugins' +import { ffprobePromise } from '@shared/ffmpeg' import { VideoBlacklistCreate, VideoStorage } from '@shared/models' import { addAccountInBlocklist, addServerInBlocklist, removeAccountFromBlocklist, removeServerFromBlocklist } from '../blocklist' import { PeerTubeSocket } from '../peertube-socket' @@ -133,7 +133,7 @@ function buildVideosHelpers () { const thumbnails = video.Thumbnails.map(t => ({ type: t.type, - url: t.getFileUrl(video), + url: t.getOriginFileUrl(video), path: t.getPath() })) @@ -209,6 +209,10 @@ function buildConfigHelpers () { return WEBSERVER.URL }, + getServerListeningConfig () { + return { hostname: CONFIG.LISTEN.HOSTNAME, port: CONFIG.LISTEN.PORT } + }, + getServerConfig () { return ServerConfigManager.Instance.getServerConfig() }