Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

유저 삭제 액티비티를 알고있는 모든 inbox에 전달하도록 #2

Merged
merged 1 commit into from
Jan 23, 2024
Merged

유저 삭제 액티비티를 알고있는 모든 inbox에 전달하도록 #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 15 additions & 24 deletions packages/backend/src/core/UserSuspendService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import { Inject, Injectable } from '@nestjs/common';
import { Not, IsNull } from 'typeorm';
import type { FollowingsRepository } from '@/models/_.js';
import type { UsersRepository } from '@/models/_.js';
import type { MiUser } from '@/models/User.js';
import { QueueService } from '@/core/QueueService.js';
import { GlobalEventService } from '@/core/GlobalEventService.js';
Expand All @@ -17,9 +17,8 @@ import { bindThis } from '@/decorators.js';
@Injectable()
export class UserSuspendService {
constructor(
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,

@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
private userEntityService: UserEntityService,
private queueService: QueueService,
private globalEventService: GlobalEventService,
Expand All @@ -37,18 +36,14 @@ export class UserSuspendService {

const queue: string[] = [];

const followings = await this.followingsRepository.find({
where: [
{ followerSharedInbox: Not(IsNull()) },
{ followeeSharedInbox: Not(IsNull()) },
],
select: ['followerSharedInbox', 'followeeSharedInbox'],
});

const inboxes = followings.map(x => x.followerSharedInbox ?? x.followeeSharedInbox);
const inboxes = await this.usersRepository.createQueryBuilder('user')
.select('user.sharedInbox')
.distinctOn(['user.sharedInbox'])
.where('user.sharedInbox IS NOT NULL')
.getMany();

for (const inbox of inboxes) {
if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
if (inbox.sharedInbox != null) queue.push(inbox.sharedInbox);
}

for (const inbox of queue) {
Expand All @@ -67,18 +62,14 @@ export class UserSuspendService {

const queue: string[] = [];

const followings = await this.followingsRepository.find({
where: [
{ followerSharedInbox: Not(IsNull()) },
{ followeeSharedInbox: Not(IsNull()) },
],
select: ['followerSharedInbox', 'followeeSharedInbox'],
});

const inboxes = followings.map(x => x.followerSharedInbox ?? x.followeeSharedInbox);
const inboxes = await this.usersRepository.createQueryBuilder('user')
.select('user.sharedInbox')
.distinctOn(['user.sharedInbox'])
.where('user.sharedInbox IS NOT NULL')
.getMany();

for (const inbox of inboxes) {
if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
if (inbox.sharedInbox != null) queue.push(inbox.sharedInbox);
}

for (const inbox of queue) {
Expand Down
Loading