diff options
author | Chocobozzz <me@florianbigard.com> | 2021-12-16 18:04:16 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-12-16 18:04:16 +0100 |
commit | 6b5f72beda96d8b7e4d6329c4001827334de27dd (patch) | |
tree | 1c14354896ce1d44b373f18f9ae0dfc72e0b12df /server/models/abuse | |
parent | 077f344891b3f4b00a8a4f8d700306d4392b3a2f (diff) | |
download | PeerTube-6b5f72beda96d8b7e4d6329c4001827334de27dd.tar.gz PeerTube-6b5f72beda96d8b7e4d6329c4001827334de27dd.tar.zst PeerTube-6b5f72beda96d8b7e4d6329c4001827334de27dd.zip |
Move typescript utils in its own directory
Diffstat (limited to 'server/models/abuse')
-rw-r--r-- | server/models/abuse/abuse-message.ts | 2 | ||||
-rw-r--r-- | server/models/abuse/abuse.ts | 3 | ||||
-rw-r--r-- | server/models/abuse/video-abuse.ts | 2 | ||||
-rw-r--r-- | server/models/abuse/video-comment-abuse.ts | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/server/models/abuse/abuse-message.ts b/server/models/abuse/abuse-message.ts index 2c5987e96..6a441a210 100644 --- a/server/models/abuse/abuse-message.ts +++ b/server/models/abuse/abuse-message.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' | 1 | import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' |
2 | import { isAbuseMessageValid } from '@server/helpers/custom-validators/abuses' | 2 | import { isAbuseMessageValid } from '@server/helpers/custom-validators/abuses' |
3 | import { MAbuseMessage, MAbuseMessageFormattable } from '@server/types/models' | 3 | import { MAbuseMessage, MAbuseMessageFormattable } from '@server/types/models' |
4 | import { AttributesOnly } from '@shared/core-utils' | 4 | import { AttributesOnly } from '@shared/typescript-utils' |
5 | import { AbuseMessage } from '@shared/models' | 5 | import { AbuseMessage } from '@shared/models' |
6 | import { AccountModel, ScopeNames as AccountScopeNames } from '../account/account' | 6 | import { AccountModel, ScopeNames as AccountScopeNames } from '../account/account' |
7 | import { getSort, throwIfNotValid } from '../utils' | 7 | import { getSort, throwIfNotValid } from '../utils' |
diff --git a/server/models/abuse/abuse.ts b/server/models/abuse/abuse.ts index 3518f5c02..4344df006 100644 --- a/server/models/abuse/abuse.ts +++ b/server/models/abuse/abuse.ts | |||
@@ -16,7 +16,7 @@ import { | |||
16 | UpdatedAt | 16 | UpdatedAt |
17 | } from 'sequelize-typescript' | 17 | } from 'sequelize-typescript' |
18 | import { isAbuseModerationCommentValid, isAbuseReasonValid, isAbuseStateValid } from '@server/helpers/custom-validators/abuses' | 18 | import { isAbuseModerationCommentValid, isAbuseReasonValid, isAbuseStateValid } from '@server/helpers/custom-validators/abuses' |
19 | import { abusePredefinedReasonsMap, AttributesOnly } from '@shared/core-utils' | 19 | import { abusePredefinedReasonsMap } from '@shared/core-utils' |
20 | import { | 20 | import { |
21 | AbuseFilter, | 21 | AbuseFilter, |
22 | AbuseObject, | 22 | AbuseObject, |
@@ -30,6 +30,7 @@ import { | |||
30 | UserAbuse, | 30 | UserAbuse, |
31 | UserVideoAbuse | 31 | UserVideoAbuse |
32 | } from '@shared/models' | 32 | } from '@shared/models' |
33 | import { AttributesOnly } from '@shared/typescript-utils' | ||
33 | import { ABUSE_STATES, CONSTRAINTS_FIELDS } from '../../initializers/constants' | 34 | import { ABUSE_STATES, CONSTRAINTS_FIELDS } from '../../initializers/constants' |
34 | import { MAbuseAdminFormattable, MAbuseAP, MAbuseFull, MAbuseReporter, MAbuseUserFormattable, MUserAccountId } from '../../types/models' | 35 | import { MAbuseAdminFormattable, MAbuseAP, MAbuseFull, MAbuseReporter, MAbuseUserFormattable, MUserAccountId } from '../../types/models' |
35 | import { AccountModel, ScopeNames as AccountScopeNames, SummaryOptions as AccountSummaryOptions } from '../account/account' | 36 | import { AccountModel, ScopeNames as AccountScopeNames, SummaryOptions as AccountSummaryOptions } from '../account/account' |
diff --git a/server/models/abuse/video-abuse.ts b/server/models/abuse/video-abuse.ts index 95bff50d0..773a9ebba 100644 --- a/server/models/abuse/video-abuse.ts +++ b/server/models/abuse/video-abuse.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript' | 1 | import { AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript' |
2 | import { AttributesOnly } from '@shared/core-utils' | 2 | import { AttributesOnly } from '@shared/typescript-utils' |
3 | import { VideoDetails } from '@shared/models' | 3 | import { VideoDetails } from '@shared/models' |
4 | import { VideoModel } from '../video/video' | 4 | import { VideoModel } from '../video/video' |
5 | import { AbuseModel } from './abuse' | 5 | import { AbuseModel } from './abuse' |
diff --git a/server/models/abuse/video-comment-abuse.ts b/server/models/abuse/video-comment-abuse.ts index 32cb2ca64..337aaaa58 100644 --- a/server/models/abuse/video-comment-abuse.ts +++ b/server/models/abuse/video-comment-abuse.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript' | 1 | import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript' |
2 | import { AttributesOnly } from '@shared/core-utils' | 2 | import { AttributesOnly } from '@shared/typescript-utils' |
3 | import { VideoCommentModel } from '../video/video-comment' | 3 | import { VideoCommentModel } from '../video/video-comment' |
4 | import { AbuseModel } from './abuse' | 4 | import { AbuseModel } from './abuse' |
5 | 5 | ||