diff options
Diffstat (limited to 'server/models/actor')
-rw-r--r-- | server/models/actor/actor-follow.ts | 4 | ||||
-rw-r--r-- | server/models/actor/actor.ts | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/server/models/actor/actor-follow.ts b/server/models/actor/actor-follow.ts index 127b29ad7..9615229dd 100644 --- a/server/models/actor/actor-follow.ts +++ b/server/models/actor/actor-follow.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { difference, values } from 'lodash' | 1 | import { difference } from 'lodash' |
2 | import { Attributes, FindOptions, Includeable, IncludeOptions, Op, QueryTypes, Transaction, WhereAttributeHash } from 'sequelize' | 2 | import { Attributes, FindOptions, Includeable, IncludeOptions, Op, QueryTypes, Transaction, WhereAttributeHash } from 'sequelize' |
3 | import { | 3 | import { |
4 | AfterCreate, | 4 | AfterCreate, |
@@ -69,7 +69,7 @@ import { InstanceListFollowingQueryBuilder, ListFollowingOptions } from './sql/i | |||
69 | export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowModel>>> { | 69 | export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowModel>>> { |
70 | 70 | ||
71 | @AllowNull(false) | 71 | @AllowNull(false) |
72 | @Column(DataType.ENUM(...values(FOLLOW_STATES))) | 72 | @Column(DataType.ENUM(...Object.values(FOLLOW_STATES))) |
73 | state: FollowState | 73 | state: FollowState |
74 | 74 | ||
75 | @AllowNull(false) | 75 | @AllowNull(false) |
diff --git a/server/models/actor/actor.ts b/server/models/actor/actor.ts index 7be5a140c..88db241dc 100644 --- a/server/models/actor/actor.ts +++ b/server/models/actor/actor.ts | |||
@@ -1,4 +1,3 @@ | |||
1 | import { values } from 'lodash' | ||
2 | import { literal, Op, QueryTypes, Transaction } from 'sequelize' | 1 | import { literal, Op, QueryTypes, Transaction } from 'sequelize' |
3 | import { | 2 | import { |
4 | AllowNull, | 3 | AllowNull, |
@@ -163,7 +162,7 @@ export const unusedActorAttributesForAPI = [ | |||
163 | export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> { | 162 | export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> { |
164 | 163 | ||
165 | @AllowNull(false) | 164 | @AllowNull(false) |
166 | @Column(DataType.ENUM(...values(ACTIVITY_PUB_ACTOR_TYPES))) | 165 | @Column(DataType.ENUM(...Object.values(ACTIVITY_PUB_ACTOR_TYPES))) |
167 | type: ActivityPubActorType | 166 | type: ActivityPubActorType |
168 | 167 | ||
169 | @AllowNull(false) | 168 | @AllowNull(false) |