aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/model-loaders
diff options
context:
space:
mode:
Diffstat (limited to 'server/lib/model-loaders')
-rw-r--r--server/lib/model-loaders/actor.ts9
-rw-r--r--server/lib/model-loaders/video.ts45
2 files changed, 28 insertions, 26 deletions
diff --git a/server/lib/model-loaders/actor.ts b/server/lib/model-loaders/actor.ts
index 234cb344f..1355d8ee2 100644
--- a/server/lib/model-loaders/actor.ts
+++ b/server/lib/model-loaders/actor.ts
@@ -2,15 +2,16 @@
2import { ActorModel } from '../../models/actor/actor' 2import { ActorModel } from '../../models/actor/actor'
3import { MActorAccountChannelId, MActorFull } from '../../types/models' 3import { MActorAccountChannelId, MActorFull } from '../../types/models'
4 4
5type ActorFetchByUrlType = 'all' | 'association-ids' 5type ActorLoadByUrlType = 'all' | 'association-ids'
6 6
7function fetchActorByUrl (url: string, fetchType: ActorFetchByUrlType): Promise<MActorFull | MActorAccountChannelId> { 7function loadActorByUrl (url: string, fetchType: ActorLoadByUrlType): Promise<MActorFull | MActorAccountChannelId> {
8 if (fetchType === 'all') return ActorModel.loadByUrlAndPopulateAccountAndChannel(url) 8 if (fetchType === 'all') return ActorModel.loadByUrlAndPopulateAccountAndChannel(url)
9 9
10 if (fetchType === 'association-ids') return ActorModel.loadByUrl(url) 10 if (fetchType === 'association-ids') return ActorModel.loadByUrl(url)
11} 11}
12 12
13export { 13export {
14 ActorFetchByUrlType, 14 ActorLoadByUrlType,
15 fetchActorByUrl 15
16 loadActorByUrl
16} 17}
diff --git a/server/lib/model-loaders/video.ts b/server/lib/model-loaders/video.ts
index 7aaf00e89..597c94395 100644
--- a/server/lib/model-loaders/video.ts
+++ b/server/lib/model-loaders/video.ts
@@ -8,21 +8,21 @@ import {
8 MVideoWithRights 8 MVideoWithRights
9} from '@server/types/models' 9} from '@server/types/models'
10 10
11type VideoFetchType = 'all' | 'only-video' | 'only-video-with-rights' | 'id' | 'none' | 'only-immutable-attributes' 11type VideoLoadType = 'all' | 'only-video' | 'only-video-with-rights' | 'id' | 'none' | 'only-immutable-attributes'
12 12
13function fetchVideo (id: number | string, fetchType: 'all', userId?: number): Promise<MVideoFullLight> 13function loadVideo (id: number | string, fetchType: 'all', userId?: number): Promise<MVideoFullLight>
14function fetchVideo (id: number | string, fetchType: 'only-immutable-attributes'): Promise<MVideoImmutable> 14function loadVideo (id: number | string, fetchType: 'only-immutable-attributes'): Promise<MVideoImmutable>
15function fetchVideo (id: number | string, fetchType: 'only-video', userId?: number): Promise<MVideoThumbnail> 15function loadVideo (id: number | string, fetchType: 'only-video', userId?: number): Promise<MVideoThumbnail>
16function fetchVideo (id: number | string, fetchType: 'only-video-with-rights', userId?: number): Promise<MVideoWithRights> 16function loadVideo (id: number | string, fetchType: 'only-video-with-rights', userId?: number): Promise<MVideoWithRights>
17function fetchVideo (id: number | string, fetchType: 'id' | 'none', userId?: number): Promise<MVideoIdThumbnail> 17function loadVideo (id: number | string, fetchType: 'id' | 'none', userId?: number): Promise<MVideoIdThumbnail>
18function fetchVideo ( 18function loadVideo (
19 id: number | string, 19 id: number | string,
20 fetchType: VideoFetchType, 20 fetchType: VideoLoadType,
21 userId?: number 21 userId?: number
22): Promise<MVideoFullLight | MVideoThumbnail | MVideoWithRights | MVideoIdThumbnail | MVideoImmutable> 22): Promise<MVideoFullLight | MVideoThumbnail | MVideoWithRights | MVideoIdThumbnail | MVideoImmutable>
23function fetchVideo ( 23function loadVideo (
24 id: number | string, 24 id: number | string,
25 fetchType: VideoFetchType, 25 fetchType: VideoLoadType,
26 userId?: number 26 userId?: number
27): Promise<MVideoFullLight | MVideoThumbnail | MVideoWithRights | MVideoIdThumbnail | MVideoImmutable> { 27): Promise<MVideoFullLight | MVideoThumbnail | MVideoWithRights | MVideoIdThumbnail | MVideoImmutable> {
28 if (fetchType === 'all') return VideoModel.loadAndPopulateAccountAndServerAndTags(id, undefined, userId) 28 if (fetchType === 'all') return VideoModel.loadAndPopulateAccountAndServerAndTags(id, undefined, userId)
@@ -36,18 +36,18 @@ function fetchVideo (
36 if (fetchType === 'id' || fetchType === 'none') return VideoModel.loadOnlyId(id) 36 if (fetchType === 'id' || fetchType === 'none') return VideoModel.loadOnlyId(id)
37} 37}
38 38
39type VideoFetchByUrlType = 'all' | 'only-video' | 'only-immutable-attributes' 39type VideoLoadByUrlType = 'all' | 'only-video' | 'only-immutable-attributes'
40 40
41function fetchVideoByUrl (url: string, fetchType: 'all'): Promise<MVideoAccountLightBlacklistAllFiles> 41function loadVideoByUrl (url: string, fetchType: 'all'): Promise<MVideoAccountLightBlacklistAllFiles>
42function fetchVideoByUrl (url: string, fetchType: 'only-immutable-attributes'): Promise<MVideoImmutable> 42function loadVideoByUrl (url: string, fetchType: 'only-immutable-attributes'): Promise<MVideoImmutable>
43function fetchVideoByUrl (url: string, fetchType: 'only-video'): Promise<MVideoThumbnail> 43function loadVideoByUrl (url: string, fetchType: 'only-video'): Promise<MVideoThumbnail>
44function fetchVideoByUrl ( 44function loadVideoByUrl (
45 url: string, 45 url: string,
46 fetchType: VideoFetchByUrlType 46 fetchType: VideoLoadByUrlType
47): Promise<MVideoAccountLightBlacklistAllFiles | MVideoThumbnail | MVideoImmutable> 47): Promise<MVideoAccountLightBlacklistAllFiles | MVideoThumbnail | MVideoImmutable>
48function fetchVideoByUrl ( 48function loadVideoByUrl (
49 url: string, 49 url: string,
50 fetchType: VideoFetchByUrlType 50 fetchType: VideoLoadByUrlType
51): Promise<MVideoAccountLightBlacklistAllFiles | MVideoThumbnail | MVideoImmutable> { 51): Promise<MVideoAccountLightBlacklistAllFiles | MVideoThumbnail | MVideoImmutable> {
52 if (fetchType === 'all') return VideoModel.loadByUrlAndPopulateAccount(url) 52 if (fetchType === 'all') return VideoModel.loadByUrlAndPopulateAccount(url)
53 53
@@ -57,8 +57,9 @@ function fetchVideoByUrl (
57} 57}
58 58
59export { 59export {
60 VideoFetchType, 60 VideoLoadType,
61 VideoFetchByUrlType, 61 VideoLoadByUrlType,
62 fetchVideo, 62
63 fetchVideoByUrl 63 loadVideo,
64 loadVideoByUrl
64} 65}