usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "インポートで防げてないのを修正" 

This reverts commit d96b2b8e9d.
This commit is contained in:
kakkokari-gtyih 2024-10-18 17:20:16 +09:00
parent 0dc536a3fa
commit 0978aa429a
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/backend/src/queue/processors/ImportBlockingProcessorService.ts
View File

@ -6,14 +6,12 @@
import { Inject, Injectable } from '@nestjs/common'; import { Inject, Injectable } from '@nestjs/common';
import { IsNull } from 'typeorm'; import { IsNull } from 'typeorm';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import type { MiMeta } from '@/models/Meta.js';
import type { UsersRepository, DriveFilesRepository } from '@/models/_.js'; import type { UsersRepository, DriveFilesRepository } from '@/models/_.js';
import type Logger from '@/logger.js'; import type Logger from '@/logger.js';
import * as Acct from '@/misc/acct.js'; import * as Acct from '@/misc/acct.js';
import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js'; import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js';
import { DownloadService } from '@/core/DownloadService.js'; import { DownloadService } from '@/core/DownloadService.js';
import { UtilityService } from '@/core/UtilityService.js'; import { UtilityService } from '@/core/UtilityService.js';
import { RoleService } from '@/core/RoleService.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { QueueService } from '@/core/QueueService.js'; import { QueueService } from '@/core/QueueService.js';
import { QueueLoggerService } from '../QueueLoggerService.js'; import { QueueLoggerService } from '../QueueLoggerService.js';
@ -25,16 +23,12 @@ export class ImportBlockingProcessorService {
private logger: Logger; private logger: Logger;
constructor( constructor(
@Inject(DI.meta)
private serverSettings: MiMeta,
@Inject(DI.usersRepository) @Inject(DI.usersRepository)
private usersRepository: UsersRepository, private usersRepository: UsersRepository,
@Inject(DI.driveFilesRepository) @Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository, private driveFilesRepository: DriveFilesRepository,
private roleService: RoleService,
private queueService: QueueService, private queueService: QueueService,
private utilityService: UtilityService, private utilityService: UtilityService,
private remoteUserResolveService: RemoteUserResolveService, private remoteUserResolveService: RemoteUserResolveService,
@ -99,15 +93,6 @@ export class ImportBlockingProcessorService {
// skip myself // skip myself
if (target.id === job.data.user.id) return; if (target.id === job.data.user.id) return;
// skip if server prohibits blocking
if (
this.serverSettings.forciblyFollowedUsers.includes(target.id) &&
!await this.roleService.isModerator({ id: user.id, isRoot: false })
) {
this.logger.warn(`Cannot block due to server policy: ${target.id}`);
return;
}
this.logger.info(`Block ${target.id} ...`); this.logger.info(`Block ${target.id} ...`);
this.queueService.createBlockJob([{ from: { id: user.id }, to: { id: target.id }, silent: true }]); this.queueService.createBlockJob([{ from: { id: user.id }, to: { id: target.id }, silent: true }]);

15
packages/backend/src/queue/processors/ImportMutingProcessorService.ts
View File

@ -6,7 +6,6 @@
import { Inject, Injectable } from '@nestjs/common'; import { Inject, Injectable } from '@nestjs/common';
import { IsNull } from 'typeorm'; import { IsNull } from 'typeorm';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import type { MiMeta } from '@/models/Meta.js';
import type { UsersRepository, DriveFilesRepository } from '@/models/_.js'; import type { UsersRepository, DriveFilesRepository } from '@/models/_.js';
import type Logger from '@/logger.js'; import type Logger from '@/logger.js';
import * as Acct from '@/misc/acct.js'; import * as Acct from '@/misc/acct.js';
@ -14,7 +13,6 @@ import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js';
import { DownloadService } from '@/core/DownloadService.js'; import { DownloadService } from '@/core/DownloadService.js';
import { UserMutingService } from '@/core/UserMutingService.js'; import { UserMutingService } from '@/core/UserMutingService.js';
import { UtilityService } from '@/core/UtilityService.js'; import { UtilityService } from '@/core/UtilityService.js';
import { RoleService } from '@/core/RoleService.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { QueueLoggerService } from '../QueueLoggerService.js'; import { QueueLoggerService } from '../QueueLoggerService.js';
import type * as Bull from 'bullmq'; import type * as Bull from 'bullmq';
@ -25,16 +23,12 @@ export class ImportMutingProcessorService {
private logger: Logger; private logger: Logger;
constructor( constructor(
@Inject(DI.meta)
private serverSettings: MiMeta,
@Inject(DI.usersRepository) @Inject(DI.usersRepository)
private usersRepository: UsersRepository, private usersRepository: UsersRepository,
@Inject(DI.driveFilesRepository) @Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository, private driveFilesRepository: DriveFilesRepository,
private roleService: RoleService,
private utilityService: UtilityService, private utilityService: UtilityService,
private userMutingService: UserMutingService, private userMutingService: UserMutingService,
private remoteUserResolveService: RemoteUserResolveService, private remoteUserResolveService: RemoteUserResolveService,
@ -94,15 +88,6 @@ export class ImportMutingProcessorService {
// skip myself // skip myself
if (target.id === job.data.user.id) continue; if (target.id === job.data.user.id) continue;
// skip if server prohibits muting
if (
this.serverSettings.forciblyFollowedUsers.includes(target.id) &&
!await this.roleService.isModerator({ id: user.id, isRoot: false })
) {
this.logger.info(`Skip[${linenum}] ${target.id} because of server policy ...`);
continue;
}
this.logger.info(`Mute[${linenum}] ${target.id} ...`); this.logger.info(`Mute[${linenum}] ${target.id} ...`);
await this.userMutingService.mute(user, target); await this.userMutingService.mute(user, target);