summaryrefslogtreecommitdiff
path: root/packages/backend/src/core/UserBlockingService.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-08-16 17:51:28 +0900
committerGitHub <noreply@github.com>2023-08-16 17:51:28 +0900
commit792622aeadf3e36d50cddec3c64b2ff0105ea927 (patch)
treec42a71da86be3c33e2752b4c673e280b1158e57b /packages/backend/src/core/UserBlockingService.ts
parentbuild(deps): bump actions/setup-node from 3.7.0 to 3.8.0 (#11726) (diff)
downloadsharkey-792622aeadf3e36d50cddec3c64b2ff0105ea927.tar.gz
sharkey-792622aeadf3e36d50cddec3c64b2ff0105ea927.tar.bz2
sharkey-792622aeadf3e36d50cddec3c64b2ff0105ea927.zip
refactor: prefix Mi for all entities (#11719)
* wip * wip * wip * wip * Update RepositoryModule.ts * wip * wip * wip * Revert "wip" This reverts commit c1c13b37d2aaf3c65bc148212da302b0eb7868bf.
Diffstat (limited to 'packages/backend/src/core/UserBlockingService.ts')
-rw-r--r--packages/backend/src/core/UserBlockingService.ts16
1 files changed, 8 insertions, 8 deletions
diff --git a/packages/backend/src/core/UserBlockingService.ts b/packages/backend/src/core/UserBlockingService.ts
index 28ecf81a13..44e2066a11 100644
--- a/packages/backend/src/core/UserBlockingService.ts
+++ b/packages/backend/src/core/UserBlockingService.ts
@@ -6,8 +6,8 @@
import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
import { ModuleRef } from '@nestjs/core';
import { IdService } from '@/core/IdService.js';
-import type { User } from '@/models/entities/User.js';
-import type { Blocking } from '@/models/entities/Blocking.js';
+import type { MiUser } from '@/models/entities/User.js';
+import type { MiBlocking } from '@/models/entities/Blocking.js';
import { QueueService } from '@/core/QueueService.js';
import { GlobalEventService } from '@/core/GlobalEventService.js';
import { DI } from '@/di-symbols.js';
@@ -58,7 +58,7 @@ export class UserBlockingService implements OnModuleInit {
}
@bindThis
- public async block(blocker: User, blockee: User, silent = false) {
+ public async block(blocker: MiUser, blockee: MiUser, silent = false) {
await Promise.all([
this.cancelRequest(blocker, blockee, silent),
this.cancelRequest(blockee, blocker, silent),
@@ -74,7 +74,7 @@ export class UserBlockingService implements OnModuleInit {
blockerId: blocker.id,
blockee,
blockeeId: blockee.id,
- } as Blocking;
+ } as MiBlocking;
await this.blockingsRepository.insert(blocking);
@@ -93,7 +93,7 @@ export class UserBlockingService implements OnModuleInit {
}
@bindThis
- private async cancelRequest(follower: User, followee: User, silent = false) {
+ private async cancelRequest(follower: MiUser, followee: MiUser, silent = false) {
const request = await this.followRequestsRepository.findOneBy({
followeeId: followee.id,
followerId: follower.id,
@@ -143,7 +143,7 @@ export class UserBlockingService implements OnModuleInit {
}
@bindThis
- private async removeFromList(listOwner: User, user: User) {
+ private async removeFromList(listOwner: MiUser, user: MiUser) {
const userLists = await this.userListsRepository.findBy({
userId: listOwner.id,
});
@@ -157,7 +157,7 @@ export class UserBlockingService implements OnModuleInit {
}
@bindThis
- public async unblock(blocker: User, blockee: User) {
+ public async unblock(blocker: MiUser, blockee: MiUser) {
const blocking = await this.blockingsRepository.findOneBy({
blockerId: blocker.id,
blockeeId: blockee.id,
@@ -191,7 +191,7 @@ export class UserBlockingService implements OnModuleInit {
}
@bindThis
- public async checkBlocked(blockerId: User['id'], blockeeId: User['id']): Promise<boolean> {
+ public async checkBlocked(blockerId: MiUser['id'], blockeeId: MiUser['id']): Promise<boolean> {
return (await this.cacheService.userBlockingCache.fetch(blockerId)).has(blockeeId);
}
}