6 files changed, 176 insertions, 0 deletions

diff --git a/server/typings/models/account/account-blocklist.ts b/server/typings/models/account/account-blocklist.ts
new file mode 100644
index 000000000..6d1771de8
--- /dev/null
+++ b/server/typings/models/account/account-blocklist.ts
@@ -0,0 +1,11 @@
+import { AccountBlocklistModel } from '../../../models/account/account-blocklist'
+import { PickWith } from '../../utils'
+import { MAccountDefault } from './account'
+
+export type MAccountBlocklist = Omit<AccountBlocklistModel, 'ByAccount' | 'BlockedAccount'>
+
+export type MAccountBlocklistId = Pick<AccountBlocklistModel, 'id'>
+
+export type MAccountBlocklistAccounts = MAccountBlocklist &
+  PickWith<AccountBlocklistModel, 'ByAccount', MAccountDefault> &
+  PickWith<AccountBlocklistModel, 'BlockedAccount', MAccountDefault>
diff --git a/server/typings/models/account/account.ts b/server/typings/models/account/account.ts
new file mode 100644
index 000000000..f3646d510
--- /dev/null
+++ b/server/typings/models/account/account.ts
@@ -0,0 +1,56 @@
+import { AccountModel } from '../../../models/account/account'
+import {
+  MActor,
+  MActorAccountChannelId,
+  MActorAPI,
+  MActorAudience,
+  MActorDefault,
+  MActorDefaultLight, MActorId,
+  MActorServer,
+  MActorSummary,
+  MActorUrl
+} from './actor'
+import { PickWith } from '../../utils'
+import { MAccountBlocklistId } from './account-blocklist'
+import { MChannelDefault } from '@server/typings/models'
+
+export type MAccountId = Pick<AccountModel, 'id'>
+export type MAccountIdActor = MAccountId &
+  PickWith<AccountModel, 'Actor', MActorAccountChannelId>
+export type MAccountIdActorId = MAccountId &
+  PickWith<AccountModel, 'Actor', MActorId>
+
+export type MAccount = Omit<AccountModel, 'Actor' | 'User' | 'Application' | 'VideoChannels' | 'VideoPlaylists' |
+  'VideoComments' | 'BlockedAccounts'>
+
+// Default scope
+export type MAccountDefault = MAccount &
+  PickWith<AccountModel, 'Actor', MActorDefault>
+
+export type MAccountDefaultChannelDefault = MAccountDefault &
+  PickWith<AccountModel, 'VideoChannels', MChannelDefault[]>
+
+export type MAccountLight = MAccount &
+  PickWith<AccountModel, 'Actor', MActorDefaultLight>
+
+export type MAccountUserId = Pick<MAccount, 'userId'>
+
+export type MAccountActor = MAccount &
+  PickWith<AccountModel, 'Actor', MActor>
+export type MAccountServer = MAccountActor &
+  PickWith<AccountModel, 'Actor', MActorServer>
+
+export type MAccountActorDefault = MAccount &
+  PickWith<AccountModel, 'Actor', MActorDefault>
+
+export type MAccountSummary = Pick<MAccount, 'id' | 'name'> &
+  PickWith<AccountModel, 'Actor', MActorSummary>
+
+export type MAccountBlocks = MAccountSummary &
+  PickWith<AccountModel, 'BlockedAccounts', MAccountBlocklistId[]>
+
+export type MAccountAPI = MAccountDefault &
+  PickWith<AccountModel, 'Actor', MActorAPI>
+
+export type MAccountUrl = PickWith<AccountModel, 'Actor', MActorUrl>
+export type MAccountAudience = PickWith<AccountModel, 'Actor', MActorAudience>
diff --git a/server/typings/models/account/actor-follow.ts b/server/typings/models/account/actor-follow.ts
new file mode 100644
index 000000000..96c53d857
--- /dev/null
+++ b/server/typings/models/account/actor-follow.ts
@@ -0,0 +1,27 @@
+import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
+import { MActor, MActorAccountChannel, MActorChannel, MActorChannelAccount, MActorDefault, MActorHost, MActorUsername } from './actor'
+import { PickWith } from '../../utils'
+
+export type MActorFollow = Omit<ActorFollowModel, 'ActorFollower' | 'ActorFollowing'>
+
+export type MActorFollowActors = MActorFollow &
+  PickWith<ActorFollowModel, 'ActorFollower', MActor> &
+  PickWith<ActorFollowModel, 'ActorFollowing', MActor>
+
+export type MActorFollowActorsDefault = MActorFollow &
+  PickWith<ActorFollowModel, 'ActorFollower', MActorDefault> &
+  PickWith<ActorFollowModel, 'ActorFollowing', MActorDefault>
+
+export type MActorFollowActorsDefaultSubscription = MActorFollow &
+  PickWith<ActorFollowModel, 'ActorFollower', MActorDefault> &
+  PickWith<ActorFollowModel, 'ActorFollowing', MActorDefault & MActorChannel>
+
+export type MActorFollowFull = MActorFollow &
+  PickWith<ActorFollowModel, 'ActorFollower', MActorAccountChannel> &
+  PickWith<ActorFollowModel, 'ActorFollowing', MActorAccountChannel>
+
+export type MActorFollowFollowingHost = MActorFollow &
+  PickWith<ActorFollowModel, 'ActorFollowing', MActorUsername & MActorHost>
+
+export type MActorFollowSubscriptions = MActorFollow &
+  PickWith<ActorFollowModel, 'ActorFollowing', MActorChannelAccount>
diff --git a/server/typings/models/account/actor.ts b/server/typings/models/account/actor.ts
new file mode 100644
index 000000000..f3e752a98
--- /dev/null
+++ b/server/typings/models/account/actor.ts
@@ -0,0 +1,74 @@
+import { ActorModel } from '../../../models/activitypub/actor'
+import { PickWith } from '../../utils'
+import { MAccount, MAccountActorDefault, MAccountId, MAccountIdActor } from './account'
+import { MServerHost, MServerHostBlocks, MServer } from '../server'
+import { MAvatar } from './avatar'
+import { MChannel, MChannelAccountActor, MChannelActorAccountDefault, MChannelId, MChannelIdActor } from '../video'
+
+export type MActor = Omit<ActorModel, 'Account' | 'VideoChannel' | 'ActorFollowing' | 'Avatar' | 'ActorFollowers' | 'Server'>
+
+export type MActorUrl = Pick<MActor, 'url'>
+export type MActorId = Pick<MActor, 'id'>
+export type MActorUsername = Pick<MActor, 'preferredUsername'>
+export type MActorHost = PickWith<ActorModel, 'Server', MServerHost>
+
+export type MActorFollowersUrl = Pick<MActor, 'followersUrl'>
+export type MActorAudience = MActorUrl & MActorFollowersUrl
+
+export type MActorLight = Omit<MActor, 'privateKey' | 'privateKey'>
+
+export type MActorDefaultLight = MActorLight &
+  MActorHost &
+  PickWith<ActorModel, 'Avatar', MAvatar>
+
+export type MActorAccountId = MActor &
+  PickWith<ActorModel, 'Account', MAccountId>
+export type MActorAccountIdActor = MActor &
+  PickWith<ActorModel, 'Account', MAccountIdActor>
+
+export type MActorChannelId = MActor &
+  PickWith<ActorModel, 'VideoChannel', MChannelId>
+export type MActorChannelIdActor = MActor &
+  PickWith<ActorModel, 'VideoChannel', MChannelIdActor>
+
+export type MActorAccountChannelId = MActorAccountId & MActorChannelId
+export type MActorAccountChannelIdActor = MActorAccountIdActor & MActorChannelIdActor
+
+export type MActorAccount = MActor &
+  PickWith<ActorModel, 'Account', MAccount>
+
+export type MActorChannel = MActor &
+  PickWith<ActorModel, 'VideoChannel', MChannel>
+
+export type MActorAccountChannel = MActorAccount & MActorChannel
+
+export type MActorChannelAccount = MActor &
+  PickWith<ActorModel, 'VideoChannel', MChannelAccountActor>
+
+export type MActorServer = MActor &
+  PickWith<ActorModel, 'Server', MServer>
+
+export type MActorDefault = MActorServer &
+  PickWith<ActorModel, 'Avatar', MAvatar>
+
+export type MActorFull = MActorDefault &
+  PickWith<ActorModel, 'Account', MAccount> &
+  PickWith<ActorModel, 'VideoChannel', MChannelAccountActor>
+
+export type MActorFullActor = MActorDefault &
+  PickWith<ActorModel, 'Account', MAccountActorDefault> &
+  PickWith<ActorModel, 'VideoChannel', MChannelActorAccountDefault>
+
+export type MActorSummary = Pick<MActor, 'id' | 'preferredUsername' | 'url' | 'serverId' | 'avatarId'> &
+  MActorHost &
+  PickWith<ActorModel, 'Avatar', MAvatar>
+
+export type MActorSummaryBlocks = Omit<MActorSummary, 'Server'> &
+  PickWith<ActorModel, 'Server', MServerHostBlocks>
+
+export type MActorFollowerException = Pick<ActorModel, 'sharedInboxUrl' | 'inboxUrl'>
+
+export type MActorAPI = Omit<MActorDefault, 'publicKey' | 'privateKey' | 'inboxUrl' | 'outboxUrl' | 'sharedInboxUrl' |
+  'followersUrl' | 'followingUrl' | 'url' | 'createdAt' | 'updatedAt'>
+
+export type MActorSignature = MActorAccountChannelId
diff --git a/server/typings/models/account/avatar.ts b/server/typings/models/account/avatar.ts
new file mode 100644
index 000000000..257c48bfc
--- /dev/null
+++ b/server/typings/models/account/avatar.ts
@@ -0,0 +1,3 @@
+import { AvatarModel } from '../../../models/avatar/avatar'
+
+export type MAvatar = AvatarModel
diff --git a/server/typings/models/account/index.d.ts b/server/typings/models/account/index.d.ts
new file mode 100644
index 000000000..513c09c40
--- /dev/null
+++ b/server/typings/models/account/index.d.ts
@@ -0,0 +1,5 @@
+export * from './account'
+export * from './account-blocklist'
+export * from './actor'
+export * from './actor-follow'
+export * from './avatar'