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/actor | |
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/actor')
-rw-r--r-- | server/models/actor/actor-follow.ts | 2 | ||||
-rw-r--r-- | server/models/actor/actor-image.ts | 2 | ||||
-rw-r--r-- | server/models/actor/actor.ts | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/server/models/actor/actor-follow.ts b/server/models/actor/actor-follow.ts index d6a2387a5..006282530 100644 --- a/server/models/actor/actor-follow.ts +++ b/server/models/actor/actor-follow.ts | |||
@@ -30,7 +30,7 @@ import { | |||
30 | MActorFollowFormattable, | 30 | MActorFollowFormattable, |
31 | MActorFollowSubscriptions | 31 | MActorFollowSubscriptions |
32 | } from '@server/types/models' | 32 | } from '@server/types/models' |
33 | import { AttributesOnly } from '@shared/core-utils' | 33 | import { AttributesOnly } from '@shared/typescript-utils' |
34 | import { ActivityPubActorType } from '@shared/models' | 34 | import { ActivityPubActorType } from '@shared/models' |
35 | import { FollowState } from '../../../shared/models/actors' | 35 | import { FollowState } from '../../../shared/models/actors' |
36 | import { ActorFollow } from '../../../shared/models/actors/follow.model' | 36 | import { ActorFollow } from '../../../shared/models/actors/follow.model' |
diff --git a/server/models/actor/actor-image.ts b/server/models/actor/actor-image.ts index 98a7f6fba..8edff5ab4 100644 --- a/server/models/actor/actor-image.ts +++ b/server/models/actor/actor-image.ts | |||
@@ -2,7 +2,7 @@ import { remove } from 'fs-extra' | |||
2 | import { join } from 'path' | 2 | import { join } from 'path' |
3 | import { AfterDestroy, AllowNull, Column, CreatedAt, Default, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' | 3 | import { AfterDestroy, AllowNull, Column, CreatedAt, Default, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' |
4 | import { MActorImageFormattable } from '@server/types/models' | 4 | import { MActorImageFormattable } from '@server/types/models' |
5 | import { AttributesOnly } from '@shared/core-utils' | 5 | import { AttributesOnly } from '@shared/typescript-utils' |
6 | import { ActorImageType } from '@shared/models' | 6 | import { ActorImageType } from '@shared/models' |
7 | import { ActorImage } from '../../../shared/models/actors/actor-image.model' | 7 | import { ActorImage } from '../../../shared/models/actors/actor-image.model' |
8 | import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' | 8 | import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' |
diff --git a/server/models/actor/actor.ts b/server/models/actor/actor.ts index cbd3f0e4a..c12dcf634 100644 --- a/server/models/actor/actor.ts +++ b/server/models/actor/actor.ts | |||
@@ -17,7 +17,8 @@ import { | |||
17 | UpdatedAt | 17 | UpdatedAt |
18 | } from 'sequelize-typescript' | 18 | } from 'sequelize-typescript' |
19 | import { ModelCache } from '@server/models/model-cache' | 19 | import { ModelCache } from '@server/models/model-cache' |
20 | import { getLowercaseExtension, AttributesOnly } from '@shared/core-utils' | 20 | import { getLowercaseExtension } from '@shared/core-utils' |
21 | import { AttributesOnly } from '@shared/typescript-utils' | ||
21 | import { ActivityIconObject, ActivityPubActorType } from '../../../shared/models/activitypub' | 22 | import { ActivityIconObject, ActivityPubActorType } from '../../../shared/models/activitypub' |
22 | import { ActorImage } from '../../../shared/models/actors/actor-image.model' | 23 | import { ActorImage } from '../../../shared/models/actors/actor-image.model' |
23 | import { activityPubContextify } from '../../helpers/activitypub' | 24 | import { activityPubContextify } from '../../helpers/activitypub' |