diff options
Diffstat (limited to 'server/models')
-rw-r--r-- | server/models/account/account-video-rate-interface.ts | 6 | ||||
-rw-r--r-- | server/models/account/account.ts | 27 |
2 files changed, 15 insertions, 18 deletions
diff --git a/server/models/account/account-video-rate-interface.ts b/server/models/account/account-video-rate-interface.ts index 82cbe38cc..316056246 100644 --- a/server/models/account/account-video-rate-interface.ts +++ b/server/models/account/account-video-rate-interface.ts | |||
@@ -17,10 +17,12 @@ export interface AccountVideoRateAttributes { | |||
17 | videoId: number | 17 | videoId: number |
18 | } | 18 | } |
19 | 19 | ||
20 | export interface AccountVideoRateInstance extends AccountVideoRateClass, AccountVideoRateAttributes, Sequelize.Instance<AccountVideoRateAttributes> { | 20 | export interface AccountVideoRateInstance |
21 | extends AccountVideoRateClass, AccountVideoRateAttributes, Sequelize.Instance<AccountVideoRateAttributes> { | ||
21 | id: number | 22 | id: number |
22 | createdAt: Date | 23 | createdAt: Date |
23 | updatedAt: Date | 24 | updatedAt: Date |
24 | } | 25 | } |
25 | 26 | ||
26 | export interface AccountVideoRateModel extends AccountVideoRateClass, Sequelize.Model<AccountVideoRateInstance, AccountVideoRateAttributes> {} | 27 | export interface AccountVideoRateModel |
28 | extends AccountVideoRateClass, Sequelize.Model<AccountVideoRateInstance, AccountVideoRateAttributes> {} | ||
diff --git a/server/models/account/account.ts b/server/models/account/account.ts index c370e1709..faf5fa841 100644 --- a/server/models/account/account.ts +++ b/server/models/account/account.ts | |||
@@ -1,29 +1,24 @@ | |||
1 | import * as Sequelize from 'sequelize' | 1 | import * as Sequelize from 'sequelize' |
2 | 2 | ||
3 | import { | 3 | import { |
4 | isUserUsernameValid, | 4 | activityPubContextify, |
5 | isAccountPublicKeyValid, | ||
6 | isAccountUrlValid, | ||
7 | isAccountPrivateKeyValid, | ||
8 | isAccountFollowersCountValid, | 5 | isAccountFollowersCountValid, |
6 | isAccountFollowersValid, | ||
9 | isAccountFollowingCountValid, | 7 | isAccountFollowingCountValid, |
8 | isAccountFollowingValid, | ||
10 | isAccountInboxValid, | 9 | isAccountInboxValid, |
11 | isAccountOutboxValid, | 10 | isAccountOutboxValid, |
11 | isAccountPrivateKeyValid, | ||
12 | isAccountPublicKeyValid, | ||
12 | isAccountSharedInboxValid, | 13 | isAccountSharedInboxValid, |
13 | isAccountFollowersValid, | 14 | isAccountUrlValid, |
14 | isAccountFollowingValid, | 15 | isUserUsernameValid |
15 | activityPubContextify | ||
16 | } from '../../helpers' | 16 | } from '../../helpers' |
17 | |||
18 | import { addMethodsToModel, getSort } from '../utils' | ||
19 | import { | ||
20 | AccountInstance, | ||
21 | AccountAttributes, | ||
22 | |||
23 | AccountMethods | ||
24 | } from './account-interface' | ||
25 | import { sendDeleteAccount } from '../../lib/activitypub/send-request' | ||
26 | import { CONFIG, CONSTRAINTS_FIELDS } from '../../initializers/constants' | 17 | import { CONFIG, CONSTRAINTS_FIELDS } from '../../initializers/constants' |
18 | import { sendDeleteAccount } from '../../lib/activitypub/send-request' | ||
19 | |||
20 | import { addMethodsToModel } from '../utils' | ||
21 | import { AccountAttributes, AccountInstance, AccountMethods } from './account-interface' | ||
27 | 22 | ||
28 | let Account: Sequelize.Model<AccountInstance, AccountAttributes> | 23 | let Account: Sequelize.Model<AccountInstance, AccountAttributes> |
29 | let loadAccountByServerAndUUID: AccountMethods.LoadAccountByServerAndUUID | 24 | let loadAccountByServerAndUUID: AccountMethods.LoadAccountByServerAndUUID |