diff options
author | Chocobozzz <me@florianbigard.com> | 2021-06-03 18:10:56 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-06-03 18:10:56 +0200 |
commit | 868fce62f86812759ccedccf7634236ac3701d9a (patch) | |
tree | 79074e065d885bf8903920bf38af06cb209919b6 /server/middlewares | |
parent | 10363c74c1d869f0e0c7bc4d0367b1f34d1bb6a4 (diff) | |
download | PeerTube-868fce62f86812759ccedccf7634236ac3701d9a.tar.gz PeerTube-868fce62f86812759ccedccf7634236ac3701d9a.tar.zst PeerTube-868fce62f86812759ccedccf7634236ac3701d9a.zip |
fetch -> load
avoid confusion with AP fetch functions
Diffstat (limited to 'server/middlewares')
-rw-r--r-- | server/middlewares/validators/oembed.ts | 4 | ||||
-rw-r--r-- | server/middlewares/validators/shared/videos.ts | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/server/middlewares/validators/oembed.ts b/server/middlewares/validators/oembed.ts index ab117635e..e1015d7fd 100644 --- a/server/middlewares/validators/oembed.ts +++ b/server/middlewares/validators/oembed.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import * as express from 'express' | 1 | import * as express from 'express' |
2 | import { query } from 'express-validator' | 2 | import { query } from 'express-validator' |
3 | import { join } from 'path' | 3 | import { join } from 'path' |
4 | import { fetchVideo } from '@server/lib/model-loaders' | 4 | import { loadVideo } from '@server/lib/model-loaders' |
5 | import { VideoPlaylistModel } from '@server/models/video/video-playlist' | 5 | import { VideoPlaylistModel } from '@server/models/video/video-playlist' |
6 | import { VideoPlaylistPrivacy, VideoPrivacy } from '@shared/models' | 6 | import { VideoPlaylistPrivacy, VideoPrivacy } from '@shared/models' |
7 | import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes' | 7 | import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes' |
@@ -85,7 +85,7 @@ const oembedValidator = [ | |||
85 | } | 85 | } |
86 | 86 | ||
87 | if (isVideo) { | 87 | if (isVideo) { |
88 | const video = await fetchVideo(elementId, 'all') | 88 | const video = await loadVideo(elementId, 'all') |
89 | 89 | ||
90 | if (!video) { | 90 | if (!video) { |
91 | return res.fail({ | 91 | return res.fail({ |
diff --git a/server/middlewares/validators/shared/videos.ts b/server/middlewares/validators/shared/videos.ts index a6dad4374..3134f623d 100644 --- a/server/middlewares/validators/shared/videos.ts +++ b/server/middlewares/validators/shared/videos.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { Response } from 'express' | 1 | import { Response } from 'express' |
2 | import { fetchVideo, VideoFetchType } from '@server/lib/model-loaders' | 2 | import { loadVideo, VideoLoadType } from '@server/lib/model-loaders' |
3 | import { VideoChannelModel } from '@server/models/video/video-channel' | 3 | import { VideoChannelModel } from '@server/models/video/video-channel' |
4 | import { VideoFileModel } from '@server/models/video/video-file' | 4 | import { VideoFileModel } from '@server/models/video/video-file' |
5 | import { | 5 | import { |
@@ -15,10 +15,10 @@ import { | |||
15 | import { HttpStatusCode } from '@shared/core-utils' | 15 | import { HttpStatusCode } from '@shared/core-utils' |
16 | import { UserRight } from '@shared/models' | 16 | import { UserRight } from '@shared/models' |
17 | 17 | ||
18 | async function doesVideoExist (id: number | string, res: Response, fetchType: VideoFetchType = 'all') { | 18 | async function doesVideoExist (id: number | string, res: Response, fetchType: VideoLoadType = 'all') { |
19 | const userId = res.locals.oauth ? res.locals.oauth.token.User.id : undefined | 19 | const userId = res.locals.oauth ? res.locals.oauth.token.User.id : undefined |
20 | 20 | ||
21 | const video = await fetchVideo(id, fetchType, userId) | 21 | const video = await loadVideo(id, fetchType, userId) |
22 | 22 | ||
23 | if (video === null) { | 23 | if (video === null) { |
24 | res.fail({ | 24 | res.fail({ |