From dfd6b4f21369ae18224a930a6e5d136b42bb44db Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 20 Jul 2023 10:18:22 +0000
Subject: [PATCH] fix?

---
 packages/backend/src/config.ts      | 6 +++---
 packages/backend/src/queue/const.ts | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 3d7475fd83..2add8f7ac9 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -108,9 +108,9 @@ export type Mixin = {
 	mediaProxy: string;
 	externalMediaProxyEnabled: boolean;
 	videoThumbnailGenerator: string | null;
-	redis: RedisOptions;
-	redisForPubsub: RedisOptions;
-	redisForJobQueue: RedisOptions;
+	redis: RedisOptions & RedisOptionsSource;
+	redisForPubsub: RedisOptions & RedisOptionsSource;
+	redisForJobQueue: RedisOptions & RedisOptionsSource;
 };
 
 export type Config = Source & Mixin;
diff --git a/packages/backend/src/queue/const.ts b/packages/backend/src/queue/const.ts
index 18ad542c87..d49951a1c3 100644
--- a/packages/backend/src/queue/const.ts
+++ b/packages/backend/src/queue/const.ts
@@ -14,7 +14,10 @@ export const QUEUE = {
 
 export function baseQueueOptions(config: Config, queueName: typeof QUEUE[keyof typeof QUEUE]): Bull.QueueOptions {
 	return {
-		connection: config.redisForJobQueue,
+		connection: {
+			...config.redisForJobQueue,
+			keyPrefix: undefined
+		},
 		prefix: config.redisForJobQueue.prefix ? `${config.redisForJobQueue.prefix}:queue:${queueName}` : `queue:${queueName}`,
 	};
 }