From a15871560f80e07386c1dabb8370cd2664ecfd1f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 31 Jan 2020 16:56:52 +0100 Subject: Move to eslint --- server/typings/models/account/account.ts | 42 +++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 14 deletions(-) (limited to 'server/typings/models/account/account.ts') diff --git a/server/typings/models/account/account.ts b/server/typings/models/account/account.ts index adb1f3689..7b826ee04 100644 --- a/server/typings/models/account/account.ts +++ b/server/typings/models/account/account.ts @@ -21,7 +21,8 @@ type Use = PickWith // ############################################################################ -export type MAccount = Omit // ############################################################################ @@ -34,62 +35,75 @@ export type MAccountUserId = Pick export type MAccountUrl = Use<'Actor', MActorUrl> export type MAccountAudience = Use<'Actor', MActorAudience> -export type MAccountIdActor = MAccountId & +export type MAccountIdActor = + MAccountId & Use<'Actor', MActor> -export type MAccountIdActorId = MAccountId & +export type MAccountIdActorId = + MAccountId & Use<'Actor', MActorId> // ############################################################################ // Default scope -export type MAccountDefault = MAccount & +export type MAccountDefault = + MAccount & Use<'Actor', MActorDefault> // Default with default association scopes -export type MAccountDefaultChannelDefault = MAccount & +export type MAccountDefaultChannelDefault = + MAccount & Use<'Actor', MActorDefault> & Use<'VideoChannels', MChannelDefault[]> // We don't need some actors attributes -export type MAccountLight = MAccount & +export type MAccountLight = + MAccount & Use<'Actor', MActorDefaultLight> // ############################################################################ // Full actor -export type MAccountActor = MAccount & +export type MAccountActor = + MAccount & Use<'Actor', MActor> // Full actor with server -export type MAccountServer = MAccount & +export type MAccountServer = + MAccount & Use<'Actor', MActorServer> // ############################################################################ // For API -export type MAccountSummary = FunctionProperties & +export type MAccountSummary = + FunctionProperties & Pick & Use<'Actor', MActorSummary> -export type MAccountSummaryBlocks = MAccountSummary & +export type MAccountSummaryBlocks = + MAccountSummary & Use<'BlockedAccounts', MAccountBlocklistId[]> -export type MAccountAPI = MAccount & +export type MAccountAPI = + MAccount & Use<'Actor', MActorAPI> // ############################################################################ // Format for API or AP object -export type MAccountSummaryFormattable = FunctionProperties & +export type MAccountSummaryFormattable = + FunctionProperties & Pick & Use<'Actor', MActorSummaryFormattable> -export type MAccountFormattable = FunctionProperties & +export type MAccountFormattable = + FunctionProperties & Pick & Use<'Actor', MActorFormattable> -export type MAccountAP = Pick & +export type MAccountAP = + Pick & Use<'Actor', MActorAP> -- cgit v1.2.3