aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/activitypub/videos/get.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-06-03 18:10:56 +0200
committerChocobozzz <me@florianbigard.com>2021-06-03 18:10:56 +0200
commit868fce62f86812759ccedccf7634236ac3701d9a (patch)
tree79074e065d885bf8903920bf38af06cb209919b6 /server/lib/activitypub/videos/get.ts
parent10363c74c1d869f0e0c7bc4d0367b1f34d1bb6a4 (diff)
downloadPeerTube-868fce62f86812759ccedccf7634236ac3701d9a.tar.gz
PeerTube-868fce62f86812759ccedccf7634236ac3701d9a.tar.zst
PeerTube-868fce62f86812759ccedccf7634236ac3701d9a.zip
fetch -> load
avoid confusion with AP fetch functions
Diffstat (limited to 'server/lib/activitypub/videos/get.ts')
-rw-r--r--server/lib/activitypub/videos/get.ts8
1 files changed, 4 insertions, 4 deletions
diff --git a/server/lib/activitypub/videos/get.ts b/server/lib/activitypub/videos/get.ts
index 38ba4978c..5d1f92bba 100644
--- a/server/lib/activitypub/videos/get.ts
+++ b/server/lib/activitypub/videos/get.ts
@@ -1,7 +1,7 @@
1import { getAPId } from '@server/helpers/activitypub' 1import { getAPId } from '@server/helpers/activitypub'
2import { retryTransactionWrapper } from '@server/helpers/database-utils' 2import { retryTransactionWrapper } from '@server/helpers/database-utils'
3import { JobQueue } from '@server/lib/job-queue' 3import { JobQueue } from '@server/lib/job-queue'
4import { fetchVideoByUrl, VideoFetchByUrlType } from '@server/lib/model-loaders' 4import { loadVideoByUrl, VideoLoadByUrlType } from '@server/lib/model-loaders'
5import { MVideoAccountLightBlacklistAllFiles, MVideoImmutable, MVideoThumbnail } from '@server/types/models' 5import { MVideoAccountLightBlacklistAllFiles, MVideoImmutable, MVideoThumbnail } from '@server/types/models'
6import { refreshVideoIfNeeded } from './refresh' 6import { refreshVideoIfNeeded } from './refresh'
7import { APVideoCreator, fetchRemoteVideo, SyncParam, syncVideoExternalAttributes } from './shared' 7import { APVideoCreator, fetchRemoteVideo, SyncParam, syncVideoExternalAttributes } from './shared'
@@ -47,7 +47,7 @@ async function getOrCreateAPVideo (
47 47
48 // Get video url 48 // Get video url
49 const videoUrl = getAPId(options.videoObject) 49 const videoUrl = getAPId(options.videoObject)
50 let videoFromDatabase = await fetchVideoByUrl(videoUrl, fetchType) 50 let videoFromDatabase = await loadVideoByUrl(videoUrl, fetchType)
51 51
52 if (videoFromDatabase) { 52 if (videoFromDatabase) {
53 if (allowRefresh === true) { 53 if (allowRefresh === true) {
@@ -71,7 +71,7 @@ async function getOrCreateAPVideo (
71 } catch (err) { 71 } catch (err) {
72 // Maybe a concurrent getOrCreateAPVideo call created this video 72 // Maybe a concurrent getOrCreateAPVideo call created this video
73 if (err.name === 'SequelizeUniqueConstraintError') { 73 if (err.name === 'SequelizeUniqueConstraintError') {
74 const alreadyCreatedVideo = await fetchVideoByUrl(videoUrl, fetchType) 74 const alreadyCreatedVideo = await loadVideoByUrl(videoUrl, fetchType)
75 if (alreadyCreatedVideo) return { video: alreadyCreatedVideo, created: false } 75 if (alreadyCreatedVideo) return { video: alreadyCreatedVideo, created: false }
76 } 76 }
77 77
@@ -87,7 +87,7 @@ export {
87 87
88// --------------------------------------------------------------------------- 88// ---------------------------------------------------------------------------
89 89
90async function scheduleRefresh (video: MVideoThumbnail, fetchType: VideoFetchByUrlType, syncParam: SyncParam) { 90async function scheduleRefresh (video: MVideoThumbnail, fetchType: VideoLoadByUrlType, syncParam: SyncParam) {
91 if (!video.isOutdated()) return video 91 if (!video.isOutdated()) return video
92 92
93 const refreshOptions = { 93 const refreshOptions = {