Add Podcast RSS feeds (#5487)

[github/Chocobozzz/PeerTube.git] / server / types / models / account / account.ts

diff --git a/server/types/models/account/account.ts b/server/types/models/account/account.ts
index 9848412919eeb9454ff165f70db6b0716ea3c4aa..d10b904abf94e279b10833954ebe29a2af9c0654 100644 (file)
--- a/server/types/models/account/account.ts
+++ b/server/types/models/account/account.ts
@@ -1,4 +1,4 @@
-import { FunctionProperties, PickWith } from '@shared/core-utils'
+import { FunctionProperties, PickWith } from '@shared/typescript-utils'
 import { AccountModel } from '../../../models/account/account'
 import {
   MActor,
@@ -8,8 +8,8 @@ import {
   MActorDefault,
   MActorDefaultLight,
   MActorFormattable,
+  MActorHost,
   MActorId,
-  MActorServer,
   MActorSummary,
   MActorSummaryFormattable,
   MActorUrl
@@ -23,7 +23,7 @@ type Use<K extends keyof AccountModel, M> = PickWith<AccountModel, K, M>
 
 export type MAccount =
   Omit<AccountModel, 'Actor' | 'User' | 'Application' | 'VideoChannels' | 'VideoPlaylists' |
-  'VideoComments' | 'BlockedAccounts'>
+  'VideoComments' | 'BlockedBy'>
 
 // ############################################################################
 
@@ -68,10 +68,9 @@ export type MAccountActor =
   MAccount &
   Use<'Actor', MActor>
 
-// Full actor with server
-export type MAccountServer =
+export type MAccountHost =
   MAccount &
-  Use<'Actor', MActorServer>
+  Use<'Actor', MActorHost>
 
 // ############################################################################
 
@@ -84,7 +83,7 @@ export type MAccountSummary =
 
 export type MAccountSummaryBlocks =
   MAccountSummary &
-  Use<'BlockedAccounts', MAccountBlocklistId[]>
+  Use<'BlockedBy', MAccountBlocklistId[]>
 
 export type MAccountAPI =
   MAccount &