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/user/user.ts | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'server/typings/models/user/user.ts') diff --git a/server/typings/models/user/user.ts b/server/typings/models/user/user.ts index 6ac19c20b..31cf075ef 100644 --- a/server/typings/models/user/user.ts +++ b/server/typings/models/user/user.ts @@ -29,36 +29,44 @@ export type MUserId = Pick // With account -export type MUserAccountId = MUser & +export type MUserAccountId = + MUser & Use<'Account', MAccountId> -export type MUserAccountUrl = MUser & +export type MUserAccountUrl = + MUser & Use<'Account', MAccountUrl & MAccountIdActorId> -export type MUserAccount = MUser & +export type MUserAccount = + MUser & Use<'Account', MAccount> -export type MUserAccountDefault = MUser & +export type MUserAccountDefault = + MUser & Use<'Account', MAccountDefault> // With channel -export type MUserNotifSettingChannelDefault = MUser & +export type MUserNotifSettingChannelDefault = + MUser & Use<'NotificationSetting', MNotificationSetting> & Use<'Account', MAccountDefaultChannelDefault> // With notification settings -export type MUserWithNotificationSetting = MUser & +export type MUserWithNotificationSetting = + MUser & Use<'NotificationSetting', MNotificationSetting> -export type MUserNotifSettingAccount = MUser & +export type MUserNotifSettingAccount = + MUser & Use<'NotificationSetting', MNotificationSetting> & Use<'Account', MAccount> // Default scope -export type MUserDefault = MUser & +export type MUserDefault = + MUser & Use<'NotificationSetting', MNotificationSetting> & Use<'Account', MAccountDefault> @@ -67,12 +75,15 @@ export type MUserDefault = MUser & // Format for API or AP object type MAccountWithChannels = MAccountFormattable & PickWithOpt -type MAccountWithChannelsAndSpecialPlaylists = MAccountWithChannels & +type MAccountWithChannelsAndSpecialPlaylists = + MAccountWithChannels & PickWithOpt -export type MUserFormattable = MUserQuotaUsed & +export type MUserFormattable = + MUserQuotaUsed & Use<'Account', MAccountWithChannels> & PickWithOpt -export type MMyUserFormattable = MUserFormattable & +export type MMyUserFormattable = + MUserFormattable & Use<'Account', MAccountWithChannelsAndSpecialPlaylists> -- cgit v1.2.3