aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'server/controllers')
-rw-r--r--server/controllers/api/videos/import.ts16
-rw-r--r--server/controllers/static.ts13
2 files changed, 23 insertions, 6 deletions
diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts
index bfb690906..dcba0e08f 100644
--- a/server/controllers/api/videos/import.ts
+++ b/server/controllers/api/videos/import.ts
@@ -26,6 +26,7 @@ import { sequelizeTypescript } from '../../../initializers/database'
26import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail' 26import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail'
27import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' 27import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type'
28import { ThumbnailModel } from '../../../models/video/thumbnail' 28import { ThumbnailModel } from '../../../models/video/thumbnail'
29import { UserModel } from '../../../models/account/user'
29 30
30const auditLogger = auditLoggerFactory('video-imports') 31const auditLogger = auditLoggerFactory('video-imports')
31const videoImportsRouter = express.Router() 32const videoImportsRouter = express.Router()
@@ -107,7 +108,8 @@ async function addTorrentImport (req: express.Request, res: express.Response, to
107 previewModel, 108 previewModel,
108 videoChannel: res.locals.videoChannel, 109 videoChannel: res.locals.videoChannel,
109 tags, 110 tags,
110 videoImportAttributes 111 videoImportAttributes,
112 user
111 }) 113 })
112 114
113 // Create job to import the video 115 // Create job to import the video
@@ -151,12 +153,13 @@ async function addYoutubeDLImport (req: express.Request, res: express.Response)
151 userId: user.id 153 userId: user.id
152 } 154 }
153 const videoImport = await insertIntoDB({ 155 const videoImport = await insertIntoDB({
154 video: video, 156 video,
155 thumbnailModel, 157 thumbnailModel,
156 previewModel, 158 previewModel,
157 videoChannel: res.locals.videoChannel, 159 videoChannel: res.locals.videoChannel,
158 tags, 160 tags,
159 videoImportAttributes 161 videoImportAttributes,
162 user
160 }) 163 })
161 164
162 // Create job to import the video 165 // Create job to import the video
@@ -227,9 +230,10 @@ function insertIntoDB (parameters: {
227 previewModel: ThumbnailModel, 230 previewModel: ThumbnailModel,
228 videoChannel: VideoChannelModel, 231 videoChannel: VideoChannelModel,
229 tags: string[], 232 tags: string[],
230 videoImportAttributes: Partial<VideoImportModel> 233 videoImportAttributes: Partial<VideoImportModel>,
234 user: UserModel
231}): Bluebird<VideoImportModel> { 235}): Bluebird<VideoImportModel> {
232 let { video, thumbnailModel, previewModel, videoChannel, tags, videoImportAttributes } = parameters 236 const { video, thumbnailModel, previewModel, videoChannel, tags, videoImportAttributes, user } = parameters
233 237
234 return sequelizeTypescript.transaction(async t => { 238 return sequelizeTypescript.transaction(async t => {
235 const sequelizeOptions = { transaction: t } 239 const sequelizeOptions = { transaction: t }
@@ -241,7 +245,7 @@ function insertIntoDB (parameters: {
241 if (thumbnailModel) await videoCreated.addAndSaveThumbnail(thumbnailModel, t) 245 if (thumbnailModel) await videoCreated.addAndSaveThumbnail(thumbnailModel, t)
242 if (previewModel) await videoCreated.addAndSaveThumbnail(previewModel, t) 246 if (previewModel) await videoCreated.addAndSaveThumbnail(previewModel, t)
243 247
244 await autoBlacklistVideoIfNeeded(video, videoChannel.Account.User, t) 248 await autoBlacklistVideoIfNeeded(video, user, t)
245 249
246 // Set tags to the video 250 // Set tags to the video
247 if (tags) { 251 if (tags) {
diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index d57dba6ce..a6b462443 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -156,6 +156,19 @@ staticRouter.use('/.well-known/change-password',
156 } 156 }
157) 157)
158 158
159staticRouter.use('/.well-known/host-meta',
160 (_, res: express.Response) => {
161 res.type('application/xml')
162
163 const xml = '<?xml version="1.0" encoding="UTF-8"?>\n' +
164 '<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">\n' +
165 ` <Link rel="lrdd" type="application/xrd+xml" template="${WEBSERVER.URL}/.well-known/webfinger?resource={uri}"/>\n` +
166 '</XRD>'
167
168 res.send(xml).end()
169 }
170)
171
159// --------------------------------------------------------------------------- 172// ---------------------------------------------------------------------------
160 173
161export { 174export {