diff options
Diffstat (limited to 'server/models/account/account-interface.ts')
-rw-r--r-- | server/models/account/account-interface.ts | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/server/models/account/account-interface.ts b/server/models/account/account-interface.ts index ce1afec02..1a567fb7a 100644 --- a/server/models/account/account-interface.ts +++ b/server/models/account/account-interface.ts | |||
@@ -1,8 +1,7 @@ | |||
1 | import * as Bluebird from 'bluebird' | 1 | import * as Bluebird from 'bluebird' |
2 | import * as Sequelize from 'sequelize' | 2 | import * as Sequelize from 'sequelize' |
3 | import { Account as FormattedAccount, ActivityPubActor } from '../../../shared' | 3 | import { Account as FormattedAccount, ActivityPubActor } from '../../../shared' |
4 | import { ResultList } from '../../../shared/models/result-list.model' | 4 | import { ServerInstance } from '../server/server-interface' |
5 | import { PodInstance } from '../pod/pod-interface' | ||
6 | import { VideoChannelInstance } from '../video/video-channel-interface' | 5 | import { VideoChannelInstance } from '../video/video-channel-interface' |
7 | 6 | ||
8 | export namespace AccountMethods { | 7 | export namespace AccountMethods { |
@@ -11,7 +10,7 @@ export namespace AccountMethods { | |||
11 | export type Load = (id: number) => Bluebird<AccountInstance> | 10 | export type Load = (id: number) => Bluebird<AccountInstance> |
12 | export type LoadByUUID = (uuid: string) => Bluebird<AccountInstance> | 11 | export type LoadByUUID = (uuid: string) => Bluebird<AccountInstance> |
13 | export type LoadByUrl = (url: string, transaction?: Sequelize.Transaction) => Bluebird<AccountInstance> | 12 | export type LoadByUrl = (url: string, transaction?: Sequelize.Transaction) => Bluebird<AccountInstance> |
14 | export type LoadAccountByPodAndUUID = (uuid: string, podId: number, transaction: Sequelize.Transaction) => Bluebird<AccountInstance> | 13 | export type LoadAccountByServerAndUUID = (uuid: string, serverId: number, transaction: Sequelize.Transaction) => Bluebird<AccountInstance> |
15 | export type LoadLocalByName = (name: string) => Bluebird<AccountInstance> | 14 | export type LoadLocalByName = (name: string) => Bluebird<AccountInstance> |
16 | export type LoadByNameAndHost = (name: string, host: string) => Bluebird<AccountInstance> | 15 | export type LoadByNameAndHost = (name: string, host: string) => Bluebird<AccountInstance> |
17 | export type ListOwned = () => Bluebird<AccountInstance[]> | 16 | export type ListOwned = () => Bluebird<AccountInstance[]> |
@@ -27,7 +26,7 @@ export namespace AccountMethods { | |||
27 | 26 | ||
28 | export interface AccountClass { | 27 | export interface AccountClass { |
29 | loadApplication: AccountMethods.LoadApplication | 28 | loadApplication: AccountMethods.LoadApplication |
30 | loadAccountByPodAndUUID: AccountMethods.LoadAccountByPodAndUUID | 29 | loadAccountByServerAndUUID: AccountMethods.LoadAccountByServerAndUUID |
31 | load: AccountMethods.Load | 30 | load: AccountMethods.Load |
32 | loadByUUID: AccountMethods.LoadByUUID | 31 | loadByUUID: AccountMethods.LoadByUUID |
33 | loadByUrl: AccountMethods.LoadByUrl | 32 | loadByUrl: AccountMethods.LoadByUrl |
@@ -51,7 +50,7 @@ export interface AccountAttributes { | |||
51 | 50 | ||
52 | uuid?: string | 51 | uuid?: string |
53 | 52 | ||
54 | podId?: number | 53 | serverId?: number |
55 | userId?: number | 54 | userId?: number |
56 | applicationId?: number | 55 | applicationId?: number |
57 | } | 56 | } |
@@ -69,7 +68,7 @@ export interface AccountInstance extends AccountClass, AccountAttributes, Sequel | |||
69 | createdAt: Date | 68 | createdAt: Date |
70 | updatedAt: Date | 69 | updatedAt: Date |
71 | 70 | ||
72 | Pod: PodInstance | 71 | Server: ServerInstance |
73 | VideoChannels: VideoChannelInstance[] | 72 | VideoChannels: VideoChannelInstance[] |
74 | } | 73 | } |
75 | 74 | ||