Merge branch 'release/3.2.0' into develop

[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 7b826ee046be0db57aa86e42ab7fb39b500c21aa..9848412919eeb9454ff165f70db6b0716ea3c4aa 100644 (file)
--- a/server/types/models/account/account.ts
+++ b/server/types/models/account/account.ts
@@ -1,7 +1,8 @@
+import { FunctionProperties, PickWith } from '@shared/core-utils'
 import { AccountModel } from '../../../models/account/account'
 import {
   MActor,
-  MActorAP,
+  MActorAPAccount,
   MActorAPI,
   MActorAudience,
   MActorDefault,
@@ -12,10 +13,9 @@ import {
   MActorSummary,
   MActorSummaryFormattable,
   MActorUrl
-} from './actor'
-import { FunctionProperties, PickWith } from '../../utils'
-import { MAccountBlocklistId } from './account-blocklist'
+} from '../actor'
 import { MChannelDefault } from '../video/video-channels'
+import { MAccountBlocklistId } from './account-blocklist'
 
 type Use<K extends keyof AccountModel, M> = PickWith<AccountModel, K, M>
 
@@ -106,4 +106,4 @@ export type MAccountFormattable =
 
 export type MAccountAP =
   Pick<MAccount, 'name' | 'description'> &
-  Use<'Actor', MActorAP>
+  Use<'Actor', MActorAPAccount>