From 94c4b401e618be493de2bf57ff64c75fe939ea94 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Wed, 22 Oct 2025 16:43:26 -0400 Subject: [PATCH] fix user silence not saving --- .../src/server/api/endpoints/admin/silence-user.ts | 9 ++++----- .../src/server/api/endpoints/admin/unsilence-user.ts | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/backend/src/server/api/endpoints/admin/silence-user.ts b/packages/backend/src/server/api/endpoints/admin/silence-user.ts index e69c46e55a..8c841c5bd9 100644 --- a/packages/backend/src/server/api/endpoints/admin/silence-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/silence-user.ts @@ -10,7 +10,7 @@ import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; import { CacheService } from '@/core/CacheService.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; -import { GlobalEventService } from '@/core/GlobalEventService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; export const meta = { tags: ['admin'], @@ -36,7 +36,7 @@ export default class extends Endpoint { // eslint- private readonly cacheService: CacheService, private readonly moderationLogService: ModerationLogService, private readonly roleService: RoleService, - private readonly globalEventService: GlobalEventService, + private readonly internalEventService: InternalEventService, ) { super(meta, paramDef, async (ps, me) => { const user = await this.cacheService.findUserById(ps.userId); @@ -47,11 +47,10 @@ export default class extends Endpoint { // eslint- if (user.isSilenced) return; - await this.usersRepository.update(user.id, { + await this.usersRepository.update({ id: user.id }, { isSilenced: true, }); - - this.globalEventService.publishInternalEvent(user.host == null ? 'localUserUpdated' : 'remoteUserUpdated', { + await this.internalEventService.emit(user.host == null ? 'localUserUpdated' : 'remoteUserUpdated', { id: user.id, }); diff --git a/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts b/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts index f511859c2c..08c0b8cc55 100644 --- a/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts @@ -9,7 +9,7 @@ import type { UsersRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; import { CacheService } from '@/core/CacheService.js'; -import { GlobalEventService } from '@/core/GlobalEventService.js'; +import { InternalEventService } from '@/global/InternalEventService.js'; export const meta = { tags: ['admin'], @@ -34,18 +34,17 @@ export default class extends Endpoint { // eslint- private readonly usersRepository: UsersRepository, private readonly cacheService: CacheService, private readonly moderationLogService: ModerationLogService, - private readonly globalEventService: GlobalEventService, + private readonly internalEventService: InternalEventService, ) { super(meta, paramDef, async (ps, me) => { const user = await this.cacheService.findUserById(ps.userId); if (!user.isSilenced) return; - await this.usersRepository.update(user.id, { + await this.usersRepository.update({ id: user.id }, { isSilenced: false, }); - - this.globalEventService.publishInternalEvent(user.host == null ? 'localUserUpdated' : 'remoteUserUpdated', { + await this.internalEventService.emit(user.host == null ? 'localUserUpdated' : 'remoteUserUpdated', { id: user.id, });