From f4110e0a7273338da598c7524a826c3b44e41ef9 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 21 Mar 2022 14:20:47 +0100 Subject: Update server dependencies --- server/lib/activitypub/send/shared/audience-utils.ts | 2 +- server/lib/redis.ts | 4 ++-- server/models/abuse/abuse-message.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'server') 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 @@ -import { Transaction } from 'sequelize/dist' +import { Transaction } from 'sequelize' import { ACTIVITY_PUB } from '@server/initializers/constants' import { ActorModel } from '@server/models/actor/actor' 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 @@ -import { createClient, RedisClientOptions, RedisModules } from 'redis' +import { createClient, RedisClientOptions, RedisModules, RedisScripts } from 'redis' import { exists } from '@server/helpers/custom-validators/misc' import { sha256 } from '@shared/extra-utils' import { logger } from '../helpers/logger' @@ -18,7 +18,7 @@ import { // Only used for typings // TODO: remove when https://github.com/microsoft/TypeScript/issues/37181 is fixed -const redisClientWrapperForType = () => createClient<{}>() +const redisClientWrapperForType = () => createClient<{}, RedisScripts>() class Redis { 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 @@ +import { FindOptions } from 'sequelize' import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' import { isAbuseMessageValid } from '@server/helpers/custom-validators/abuses' import { MAbuseMessage, MAbuseMessageFormattable } from '@server/types/models' @@ -6,7 +7,6 @@ import { AttributesOnly } from '@shared/typescript-utils' import { AccountModel, ScopeNames as AccountScopeNames } from '../account/account' import { getSort, throwIfNotValid } from '../utils' import { AbuseModel } from './abuse' -import { FindOptions } from 'sequelize/dist' @Table({ tableName: 'abuseMessage', -- cgit v1.2.3