Feat: 特定ユーザーからのリアクションをブロックする機能の追加 #14986
+798
−7
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: sakuhanight and misskey-project | ||
| * SPDX-License-Identifier: AGPL-3.0-only | ||
| */ | ||
|
|
||
| export class MakeNotesHiddenBefore1729486255072 { | ||
| name = 'AddBlockingReactionUser1731566099974' | ||
| async up(queryRunner) { | ||
| await queryRunner.query(` | ||
| CREATE TABLE "blocking_reaction_user"( | ||
| id varchar(32) NULL, | ||
| blockeeId varchar(32) NULL, | ||
| blockerId varchar(32) NULL, | ||
| CONSTRAINT "PK_blocking_reaction_user" PRIMARY KEY (id), | ||
| CONSTRAINT "FK_blocking_reaction_user_blockeeid" FOREIGN KEY (blockeeid) REFERENCES "user" (id) ON DELETE CASCADE, | ||
| CONSTRAINT "FK_blocking_reaction_user_blockerid" FOREIGN KEY (blockerid) REFERENCES "user" (id) ON DELETE CASCADE); | ||
| `); | ||
| await queryRunner.query(`CREATE INDEX "IDX_blocking_reaction_user_id" ON "blocking_reaction_user" (id);`); | ||
| await queryRunner.query(`CREATE INDEX "IDX_blocking_reaction_user_blockeeid" ON "blocking_reaction_user" (blockeeid);`); | ||
| await queryRunner.query(`CREATE INDEX "IDX_blocking_reaction_user_blockerid" ON "blocking_reaction_user" (blockerid);`); | ||
| await queryRunner.query(`CREATE UNIQUE INDEX "IDX_blocking_reaction_user_blockeeid_blockerid" ON "blocking_reaction_user" (blockeeid, blockerid);`); | ||
| } | ||
|
|
||
| async down(queryRunner) { | ||
| await queryRunner.query(`DROP INDEX "IDX_blocking_reaction_user_blockeeid_blockerid";`); | ||
| await queryRunner.query(`DROP INDEX "IDX_blocking_reaction_user_blockerid";`); | ||
| await queryRunner.query(`DROP INDEX "IDX_blocking_reaction_user_blockeeid";`); | ||
| await queryRunner.query(`DROP INDEX "IDX_blocking_reaction_user_id";`); | ||
| await queryRunner.query(`ALTER TABLE "blocking_reaction_user" DROP CONSTRAINT "FK_blocking_reaction_user_blockerid";`); | ||
| await queryRunner.query(`ALTER TABLE "blocking_reaction_user" DROP CONSTRAINT "FK_blocking_reaction_user_blockeeid";`); | ||
| await queryRunner.query(`ALTER TABLE "blocking_reaction_user" DROP CONSTRAINT "PK_blocking_reaction_user";`); | ||
| await queryRunner.query(`DROP TABLE "blocking_reaction_user";`); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,110 @@ | ||||||
| /* | ||||||
| * SPDX-FileCopyrightText: syuilo and misskey-project | ||||||
| * SPDX-License-Identifier: AGPL-3.0-only | ||||||
| */ | ||||||
|
|
||||||
| import { Inject, Injectable, OnModuleInit } from '@nestjs/common'; | ||||||
| import { ModuleRef } from '@nestjs/core'; | ||||||
| import { IdService } from '@/core/IdService.js'; | ||||||
| import type { MiUser } from '@/models/User.js'; | ||||||
| import { QueueService } from '@/core/QueueService.js'; | ||||||
| import { GlobalEventService } from '@/core/GlobalEventService.js'; | ||||||
| import { DI } from '@/di-symbols.js'; | ||||||
| import type { | ||||||
| FollowRequestsRepository, | ||||||
| BlockingsRepository, | ||||||
| UserListsRepository, | ||||||
| UserListMembershipsRepository, | ||||||
| BlockingReactionUsersRepository | ||||||
| } from '@/models/_.js'; | ||||||
| import Logger from '@/logger.js'; | ||||||
| import { UserEntityService } from '@/core/entities/UserEntityService.js'; | ||||||
| import { ApRendererService } from '@/core/activitypub/ApRendererService.js'; | ||||||
| import { LoggerService } from '@/core/LoggerService.js'; | ||||||
| import { UserWebhookService } from '@/core/UserWebhookService.js'; | ||||||
| import { bindThis } from '@/decorators.js'; | ||||||
| import { CacheService } from '@/core/CacheService.js'; | ||||||
| import {MiBlockingReactionUser} from "@/models/_.js"; | ||||||
|
Check failure on line 27 in packages/backend/src/core/BlockingReactionUserService.ts
|
||||||
|
|
||||||
| @Injectable() | ||||||
| export class BlockingReactionUserService implements OnModuleInit { | ||||||
| private logger: Logger; | ||||||
|
|
||||||
| constructor( | ||||||
| private moduleRef: ModuleRef, | ||||||
|
|
||||||
| @Inject(DI.blockingReactionUsersRepository) | ||||||
| private blockingReactionUsersRepository: BlockingReactionUsersRepository, | ||||||
|
|
||||||
| private cacheService: CacheService, | ||||||
| private userEntityService: UserEntityService, | ||||||
| private idService: IdService, | ||||||
| private queueService: QueueService, | ||||||
| private globalEventService: GlobalEventService, | ||||||
| private webhookService: UserWebhookService, | ||||||
| private apRendererService: ApRendererService, | ||||||
| private loggerService: LoggerService, | ||||||
| ) { | ||||||
| this.logger = this.loggerService.getLogger('user-block'); | ||||||
| } | ||||||
|
|
||||||
| onModuleInit() { | ||||||
| } | ||||||
|
|
||||||
| @bindThis | ||||||
| public async block(blocker: MiUser, blockee: MiUser, silent = false) { | ||||||
| await Promise.all([ | ||||||
| ]); | ||||||
|
|
||||||
| const blocking = { | ||||||
| id: this.idService.gen(), | ||||||
| blocker, | ||||||
| blockerId: blocker.id, | ||||||
| blockee, | ||||||
| blockeeId: blockee.id, | ||||||
| } as MiBlockingReactionUser; | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
|
|
||||||
| await this.blockingReactionUsersRepository.insert(blocking); | ||||||
|
|
||||||
| this.cacheService.blockingReactionUserCache.refresh(blocker.id); | ||||||
| this.cacheService.blockedReactionUserCache.refresh(blockee.id); | ||||||
|
|
||||||
| this.globalEventService.publishInternalEvent('blockingReactionUserCreated', { | ||||||
| blockerId: blocker.id, | ||||||
| blockeeId: blockee.id, | ||||||
| }); | ||||||
| } | ||||||
|
|
||||||
| @bindThis | ||||||
| public async unblock(blocker: MiUser, blockee: MiUser) { | ||||||
| const blocking = await this.blockingReactionUsersRepository.findOneBy({ | ||||||
| blockerId: blocker.id, | ||||||
| blockeeId: blockee.id, | ||||||
| }); | ||||||
|
|
||||||
| if (blocking == null) { | ||||||
| this.logger.warn('ブロック解除がリクエストされましたがブロックしていませんでした'); | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| // Since we already have the blocker and blockee, we do not need to fetch | ||||||
| // them in the query above and can just manually insert them here. | ||||||
| blocking.blocker = blocker; | ||||||
| blocking.blockee = blockee; | ||||||
|
Comment on lines
+90
to
+93
There was a problem hiding this comment. 上記の処理は不要に見受けられるのですが、いかがでしょうか。 |
||||||
|
|
||||||
| await this.blockingReactionUsersRepository.delete(blocking.id); | ||||||
|
|
||||||
| this.cacheService.blockingReactionUserCache.refresh(blocker.id); | ||||||
| this.cacheService.blockedReactionUserCache.refresh(blockee.id); | ||||||
|
|
||||||
| this.globalEventService.publishInternalEvent('blockingReactionUserDeleted', { | ||||||
| blockerId: blocker.id, | ||||||
| blockeeId: blockee.id, | ||||||
| }); | ||||||
| } | ||||||
|
|
||||||
| @bindThis | ||||||
| public async checkBlocked(blockerId: MiUser['id'], blockeeId: MiUser['id']): Promise<boolean> { | ||||||
| return (await this.cacheService.blockingReactionUserCache.fetch(blockerId)).has(blockeeId); | ||||||
| } | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lint / code style