diff options
Diffstat (limited to 'server/types')
-rw-r--r-- | server/types/models/account/account.ts | 4 | ||||
-rw-r--r-- | server/types/models/server/server.ts | 2 | ||||
-rw-r--r-- | server/types/models/video/video.ts | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/server/types/models/account/account.ts b/server/types/models/account/account.ts index abe0de27b..71f6c79aa 100644 --- a/server/types/models/account/account.ts +++ b/server/types/models/account/account.ts | |||
@@ -23,7 +23,7 @@ type Use<K extends keyof AccountModel, M> = PickWith<AccountModel, K, M> | |||
23 | 23 | ||
24 | export type MAccount = | 24 | export type MAccount = |
25 | Omit<AccountModel, 'Actor' | 'User' | 'Application' | 'VideoChannels' | 'VideoPlaylists' | | 25 | Omit<AccountModel, 'Actor' | 'User' | 'Application' | 'VideoChannels' | 'VideoPlaylists' | |
26 | 'VideoComments' | 'BlockedAccounts'> | 26 | 'VideoComments' | 'BlockedBy'> |
27 | 27 | ||
28 | // ############################################################################ | 28 | // ############################################################################ |
29 | 29 | ||
@@ -84,7 +84,7 @@ export type MAccountSummary = | |||
84 | 84 | ||
85 | export type MAccountSummaryBlocks = | 85 | export type MAccountSummaryBlocks = |
86 | MAccountSummary & | 86 | MAccountSummary & |
87 | Use<'BlockedByAccounts', MAccountBlocklistId[]> | 87 | Use<'BlockedBy', MAccountBlocklistId[]> |
88 | 88 | ||
89 | export type MAccountAPI = | 89 | export type MAccountAPI = |
90 | MAccount & | 90 | MAccount & |
diff --git a/server/types/models/server/server.ts b/server/types/models/server/server.ts index f8b053e3b..876186fc0 100644 --- a/server/types/models/server/server.ts +++ b/server/types/models/server/server.ts | |||
@@ -15,7 +15,7 @@ export type MServerRedundancyAllowed = Pick<MServer, 'redundancyAllowed'> | |||
15 | 15 | ||
16 | export type MServerHostBlocks = | 16 | export type MServerHostBlocks = |
17 | MServerHost & | 17 | MServerHost & |
18 | Use<'BlockedByAccounts', MAccountBlocklistId[]> | 18 | Use<'BlockedBy', MAccountBlocklistId[]> |
19 | 19 | ||
20 | // ############################################################################ | 20 | // ############################################################################ |
21 | 21 | ||
diff --git a/server/types/models/video/video.ts b/server/types/models/video/video.ts index 16ddaf740..9a6b27888 100644 --- a/server/types/models/video/video.ts +++ b/server/types/models/video/video.ts | |||
@@ -210,7 +210,9 @@ export type MVideoFormattable = | |||
210 | PickWithOpt<VideoModel, 'UserVideoHistories', MUserVideoHistoryTime[]> & | 210 | PickWithOpt<VideoModel, 'UserVideoHistories', MUserVideoHistoryTime[]> & |
211 | Use<'VideoChannel', MChannelAccountSummaryFormattable> & | 211 | Use<'VideoChannel', MChannelAccountSummaryFormattable> & |
212 | PickWithOpt<VideoModel, 'ScheduleVideoUpdate', Pick<MScheduleVideoUpdate, 'updateAt' | 'privacy'>> & | 212 | PickWithOpt<VideoModel, 'ScheduleVideoUpdate', Pick<MScheduleVideoUpdate, 'updateAt' | 'privacy'>> & |
213 | PickWithOpt<VideoModel, 'VideoBlacklist', Pick<MVideoBlacklist, 'reason'>> | 213 | PickWithOpt<VideoModel, 'VideoBlacklist', Pick<MVideoBlacklist, 'reason'>> & |
214 | PickWithOpt<VideoModel, 'VideoStreamingPlaylists', MStreamingPlaylistFiles[]> & | ||
215 | PickWithOpt<VideoModel, 'VideoFiles', MVideoFile[]> | ||
214 | 216 | ||
215 | export type MVideoFormattableDetails = | 217 | export type MVideoFormattableDetails = |
216 | MVideoFormattable & | 218 | MVideoFormattable & |