Merge branch 'release/1.4.0' into develop

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

diff --git a/server/typings/models/account/account.ts b/server/typings/models/account/account.ts
index 33940517eafb54ad6afc81be04da29c837c3c39a..ec78fece8a589cac377037bff3f2094fe2b4dfe2 100644 (file)
--- a/server/typings/models/account/account.ts
+++ b/server/typings/models/account/account.ts
@@ -1,17 +1,17 @@
 import { AccountModel } from '../../../models/account/account'
 import {
   MActor,
-  MActorAccountChannelId,
+  MActorAP,
   MActorAPI,
   MActorAudience,
   MActorDefault,
   MActorDefaultLight,
+  MActorFormattable,
   MActorId,
   MActorServer,
   MActorSummary,
   MActorSummaryFormattable,
-  MActorUrl,
-  MActorFormattable
+  MActorUrl
 } from './actor'
 import { FunctionProperties, PickWith } from '../../utils'
 import { MAccountBlocklistId } from './account-blocklist'
@@ -35,7 +35,7 @@ export type MAccountUrl = Use<'Actor', MActorUrl>
 export type MAccountAudience = Use<'Actor', MActorAudience>
 
 export type MAccountIdActor = MAccountId &
-  Use<'Actor', MActorAccountChannelId>
+  Use<'Actor', MActor>
 
 export type MAccountIdActorId = MAccountId &
   Use<'Actor', MActorId>
@@ -90,3 +90,6 @@ export type MAccountSummaryFormattable = FunctionProperties<MAccount> &
 export type MAccountFormattable = FunctionProperties<MAccount> &
   Pick<MAccount, 'id' | 'name' | 'description' | 'createdAt' | 'updatedAt' | 'userId'> &
   Use<'Actor', MActorFormattable>
+
+export type MAccountAP = Pick<MAccount, 'name' | 'description'> &
+  Use<'Actor', MActorAP>