aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models/account
diff options
context:
space:
mode:
Diffstat (limited to 'server/models/account')
-rw-r--r--server/models/account/account-blocklist.ts2
-rw-r--r--server/models/account/account-video-rate.ts2
-rw-r--r--server/models/account/account.ts2
-rw-r--r--server/models/account/user-notification-setting.ts2
-rw-r--r--server/models/account/user-notification.ts2
-rw-r--r--server/models/account/user-video-history.ts2
-rw-r--r--server/models/account/user.ts2
7 files changed, 7 insertions, 7 deletions
diff --git a/server/models/account/account-blocklist.ts b/server/models/account/account-blocklist.ts
index 2c6b756d2..cf8872fd5 100644
--- a/server/models/account/account-blocklist.ts
+++ b/server/models/account/account-blocklist.ts
@@ -4,7 +4,7 @@ import { getSort, searchAttribute } from '../utils'
4import { AccountBlock } from '../../../shared/models/blocklist' 4import { AccountBlock } from '../../../shared/models/blocklist'
5import { Op } from 'sequelize' 5import { Op } from 'sequelize'
6import * as Bluebird from 'bluebird' 6import * as Bluebird from 'bluebird'
7import { MAccountBlocklist, MAccountBlocklistAccounts, MAccountBlocklistFormattable } from '@server/typings/models' 7import { MAccountBlocklist, MAccountBlocklistAccounts, MAccountBlocklistFormattable } from '@server/types/models'
8import { ActorModel } from '../activitypub/actor' 8import { ActorModel } from '../activitypub/actor'
9import { ServerModel } from '../server/server' 9import { ServerModel } from '../server/server'
10 10
diff --git a/server/models/account/account-video-rate.ts b/server/models/account/account-video-rate.ts
index 8aeb486d1..5064987dc 100644
--- a/server/models/account/account-video-rate.ts
+++ b/server/models/account/account-video-rate.ts
@@ -16,7 +16,7 @@ import {
16 MAccountVideoRateAccountUrl, 16 MAccountVideoRateAccountUrl,
17 MAccountVideoRateAccountVideo, 17 MAccountVideoRateAccountVideo,
18 MAccountVideoRateFormattable 18 MAccountVideoRateFormattable
19} from '@server/typings/models/video/video-rate' 19} from '@server/types/models/video/video-rate'
20 20
21/* 21/*
22 Account rates per video. 22 Account rates per video.
diff --git a/server/models/account/account.ts b/server/models/account/account.ts
index ad649837a..4395d179a 100644
--- a/server/models/account/account.ts
+++ b/server/models/account/account.ts
@@ -32,7 +32,7 @@ import { FindOptions, IncludeOptions, Op, Transaction, WhereOptions } from 'sequ
32import { AccountBlocklistModel } from './account-blocklist' 32import { AccountBlocklistModel } from './account-blocklist'
33import { ServerBlocklistModel } from '../server/server-blocklist' 33import { ServerBlocklistModel } from '../server/server-blocklist'
34import { ActorFollowModel } from '../activitypub/actor-follow' 34import { ActorFollowModel } from '../activitypub/actor-follow'
35import { MAccountActor, MAccountAP, MAccountDefault, MAccountFormattable, MAccountSummaryFormattable, MAccount } from '../../typings/models' 35import { MAccountActor, MAccountAP, MAccountDefault, MAccountFormattable, MAccountSummaryFormattable, MAccount } from '../../types/models'
36import * as Bluebird from 'bluebird' 36import * as Bluebird from 'bluebird'
37import { ModelCache } from '@server/models/model-cache' 37import { ModelCache } from '@server/models/model-cache'
38import { VideoModel } from '../video/video' 38import { VideoModel } from '../video/video'
diff --git a/server/models/account/user-notification-setting.ts b/server/models/account/user-notification-setting.ts
index dc69a17fd..b69b47265 100644
--- a/server/models/account/user-notification-setting.ts
+++ b/server/models/account/user-notification-setting.ts
@@ -17,7 +17,7 @@ import { UserModel } from './user'
17import { isUserNotificationSettingValid } from '../../helpers/custom-validators/user-notifications' 17import { isUserNotificationSettingValid } from '../../helpers/custom-validators/user-notifications'
18import { UserNotificationSetting, UserNotificationSettingValue } from '../../../shared/models/users/user-notification-setting.model' 18import { UserNotificationSetting, UserNotificationSettingValue } from '../../../shared/models/users/user-notification-setting.model'
19import { clearCacheByUserId } from '../../lib/oauth-model' 19import { clearCacheByUserId } from '../../lib/oauth-model'
20import { MNotificationSettingFormattable } from '@server/typings/models' 20import { MNotificationSettingFormattable } from '@server/types/models'
21 21
22@Table({ 22@Table({
23 tableName: 'userNotificationSetting', 23 tableName: 'userNotificationSetting',
diff --git a/server/models/account/user-notification.ts b/server/models/account/user-notification.ts
index 5a725187a..30985bb0f 100644
--- a/server/models/account/user-notification.ts
+++ b/server/models/account/user-notification.ts
@@ -16,7 +16,7 @@ import { ActorModel } from '../activitypub/actor'
16import { ActorFollowModel } from '../activitypub/actor-follow' 16import { ActorFollowModel } from '../activitypub/actor-follow'
17import { AvatarModel } from '../avatar/avatar' 17import { AvatarModel } from '../avatar/avatar'
18import { ServerModel } from '../server/server' 18import { ServerModel } from '../server/server'
19import { UserNotificationIncludes, UserNotificationModelForApi } from '@server/typings/models/user' 19import { UserNotificationIncludes, UserNotificationModelForApi } from '@server/types/models/user'
20 20
21enum ScopeNames { 21enum ScopeNames {
22 WITH_ALL = 'WITH_ALL' 22 WITH_ALL = 'WITH_ALL'
diff --git a/server/models/account/user-video-history.ts b/server/models/account/user-video-history.ts
index 522eebeaf..76b469fbf 100644
--- a/server/models/account/user-video-history.ts
+++ b/server/models/account/user-video-history.ts
@@ -2,7 +2,7 @@ import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, IsInt, Model, Tabl
2import { VideoModel } from '../video/video' 2import { VideoModel } from '../video/video'
3import { UserModel } from './user' 3import { UserModel } from './user'
4import { DestroyOptions, Op, Transaction } from 'sequelize' 4import { DestroyOptions, Op, Transaction } from 'sequelize'
5import { MUserAccountId, MUserId } from '@server/typings/models' 5import { MUserAccountId, MUserId } from '@server/types/models'
6 6
7@Table({ 7@Table({
8 tableName: 'userVideoHistory', 8 tableName: 'userVideoHistory',
diff --git a/server/models/account/user.ts b/server/models/account/user.ts
index fbd3080c6..3bde1e744 100644
--- a/server/models/account/user.ts
+++ b/server/models/account/user.ts
@@ -68,7 +68,7 @@ import {
68 MUserNotifSettingChannelDefault, 68 MUserNotifSettingChannelDefault,
69 MUserWithNotificationSetting, 69 MUserWithNotificationSetting,
70 MVideoFullLight 70 MVideoFullLight
71} from '@server/typings/models' 71} from '@server/types/models'
72 72
73enum ScopeNames { 73enum ScopeNames {
74 FOR_ME_API = 'FOR_ME_API', 74 FOR_ME_API = 'FOR_ME_API',