diff options
Diffstat (limited to 'server')
-rw-r--r-- | server/lib/activitypub/send/shared/audience-utils.ts | 2 | ||||
-rw-r--r-- | server/lib/redis.ts | 4 | ||||
-rw-r--r-- | server/models/abuse/abuse-message.ts | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/server/lib/activitypub/send/shared/audience-utils.ts b/server/lib/activitypub/send/shared/audience-utils.ts index a5f64a08d..ba4be487c 100644 --- a/server/lib/activitypub/send/shared/audience-utils.ts +++ b/server/lib/activitypub/send/shared/audience-utils.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Transaction } from 'sequelize/dist' | 1 | import { Transaction } from 'sequelize' |
2 | import { ACTIVITY_PUB } from '@server/initializers/constants' | 2 | import { ACTIVITY_PUB } from '@server/initializers/constants' |
3 | import { ActorModel } from '@server/models/actor/actor' | 3 | import { ActorModel } from '@server/models/actor/actor' |
4 | import { VideoModel } from '@server/models/video/video' | 4 | import { VideoModel } from '@server/models/video/video' |
diff --git a/server/lib/redis.ts b/server/lib/redis.ts index bbe94fe40..c4c1fa443 100644 --- a/server/lib/redis.ts +++ b/server/lib/redis.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { createClient, RedisClientOptions, RedisModules } from 'redis' | 1 | import { createClient, RedisClientOptions, RedisModules, RedisScripts } from 'redis' |
2 | import { exists } from '@server/helpers/custom-validators/misc' | 2 | import { exists } from '@server/helpers/custom-validators/misc' |
3 | import { sha256 } from '@shared/extra-utils' | 3 | import { sha256 } from '@shared/extra-utils' |
4 | import { logger } from '../helpers/logger' | 4 | import { logger } from '../helpers/logger' |
@@ -18,7 +18,7 @@ import { | |||
18 | 18 | ||
19 | // Only used for typings | 19 | // Only used for typings |
20 | // TODO: remove when https://github.com/microsoft/TypeScript/issues/37181 is fixed | 20 | // TODO: remove when https://github.com/microsoft/TypeScript/issues/37181 is fixed |
21 | const redisClientWrapperForType = () => createClient<{}>() | 21 | const redisClientWrapperForType = () => createClient<{}, RedisScripts>() |
22 | 22 | ||
23 | class Redis { | 23 | class Redis { |
24 | 24 | ||
diff --git a/server/models/abuse/abuse-message.ts b/server/models/abuse/abuse-message.ts index d9eb25f0f..20008768b 100644 --- a/server/models/abuse/abuse-message.ts +++ b/server/models/abuse/abuse-message.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | import { FindOptions } from 'sequelize' | ||
1 | import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' | 2 | import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' |
2 | import { isAbuseMessageValid } from '@server/helpers/custom-validators/abuses' | 3 | import { isAbuseMessageValid } from '@server/helpers/custom-validators/abuses' |
3 | import { MAbuseMessage, MAbuseMessageFormattable } from '@server/types/models' | 4 | import { MAbuseMessage, MAbuseMessageFormattable } from '@server/types/models' |
@@ -6,7 +7,6 @@ import { AttributesOnly } from '@shared/typescript-utils' | |||
6 | import { AccountModel, ScopeNames as AccountScopeNames } from '../account/account' | 7 | import { AccountModel, ScopeNames as AccountScopeNames } from '../account/account' |
7 | import { getSort, throwIfNotValid } from '../utils' | 8 | import { getSort, throwIfNotValid } from '../utils' |
8 | import { AbuseModel } from './abuse' | 9 | import { AbuseModel } from './abuse' |
9 | import { FindOptions } from 'sequelize/dist' | ||
10 | 10 | ||
11 | @Table({ | 11 | @Table({ |
12 | tableName: 'abuseMessage', | 12 | tableName: 'abuseMessage', |