Skip to content

Commit

Permalink
fix(moderation): ユーザーが凍結された際、処理されていないフォローリクエストをすべて削除する (#692)
Browse files Browse the repository at this point in the history
  • Loading branch information
u1-liquid authored Aug 14, 2024
1 parent 90be631 commit cd2c14d
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion packages/backend/src/core/UserSuspendService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { bindThis } from '@/decorators.js';
import { DI } from '@/di-symbols.js';
import type Logger from '@/logger.js';
import type { MiUser } from '@/models/User.js';
import type { FollowingsRepository } from '@/models/_.js';
import type { FollowingsRepository, FollowRequestsRepository } from '@/models/_.js';
import { QueueService } from '@/core/QueueService.js';
import { GlobalEventService } from '@/core/GlobalEventService.js';
import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
Expand All @@ -27,6 +27,9 @@ export class UserSuspendService {
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,

@Inject(DI.followRequestsRepository)
private followRequestsRepository: FollowRequestsRepository,

private queueService: QueueService,
private globalEventService: GlobalEventService,
private apRendererService: ApRendererService,
Expand All @@ -42,6 +45,11 @@ export class UserSuspendService {

this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: true });

await Promise.all([
this.followRequestsRepository.delete({ followeeId: user.id }),
this.followRequestsRepository.delete({ followerId: user.id }),
]).catch(() => null);

if (this.userEntityService.isLocalUser(user)) {
// 知り得る全SharedInboxにDelete配信
const content = this.apRendererService.addContext(this.apRendererService.renderDelete(this.userEntityService.genLocalUserUri(user.id), user));
Expand Down

0 comments on commit cd2c14d

Please sign in to comment.