From 7481ece4331fe9002aba3db348999f5638353425 Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Tue, 26 Sep 2023 13:25:55 +0200 Subject: fix: emojis not being populated for local users --- packages/backend/src/core/CustomEmojiService.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'packages/backend/src/core/CustomEmojiService.ts') diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts index 1b545a124e..f9368eb6d3 100644 --- a/packages/backend/src/core/CustomEmojiService.ts +++ b/packages/backend/src/core/CustomEmojiService.ts @@ -19,6 +19,7 @@ import { UtilityService } from '@/core/UtilityService.js'; import { query } from '@/misc/prelude/url.js'; import type { Serialized } from '@/server/api/stream/types.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; +import type { Config } from '@/config.js'; const parseEmojiStrRegexp = /^(\w+)(?:@([\w.-]+))?$/; @@ -31,6 +32,9 @@ export class CustomEmojiService implements OnApplicationShutdown { @Inject(DI.redis) private redisClient: Redis.Redis, + @Inject(DI.config) + private config: Config, + @Inject(DI.emojisRepository) private emojisRepository: EmojisRepository, @@ -330,9 +334,11 @@ export class CustomEmojiService implements OnApplicationShutdown { if (name == null) return null; if (host == null) return null; + const newHost = host === this.config.host ? null : host; + const queryOrNull = async () => (await this.emojisRepository.findOneBy({ name, - host: host ?? IsNull(), + host: newHost ?? IsNull(), })) ?? null; const emoji = await this.cache.fetch(`${name} ${host}`, queryOrNull); -- cgit v1.2.3-freya