Fix type errors

approvers · Feb 6, 2024 · 26223cc · 26223cc
1 parent 3d116f3
commit 26223cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/packages/bot/src/adaptor/discord/member-stats.ts b/packages/bot/src/adaptor/discord/member-stats.ts
@@ -1,23 +1,20 @@
 import type { Client, Guild } from 'discord.js';
 
-import type { Snowflake } from '../../model/id.js';
 import type {
   GuildMfaLevel,
   GuildNsfwLevel,
   GuildPremiumTier,
+  GuildRepository,
   GuildStats,
-  GuildStatsRepository,
   GuildVerificationLevel
-} from '../../service/command/guild-info.js';
-import type { MemberStats } from '../../service/command/kokusei-chousa.js';
+} from '../../model/guild.js';
+import type { Snowflake } from '../../model/id.js';
 import type {
+  MemberRepository,
   MemberWithRole,
-  MembersWithRoleRepository
-} from '../../service/command/role-rank.js';
-import type {
-  UserStats,
-  UserStatsRepository
-} from '../../service/command/user-info.js';
+  UserStats
+} from '../../model/member.js';
+import type { MemberStats } from '../../service/command/kokusei-chousa.js';
 
 const mappingMfaLevel: Record<Guild['mfaLevel'], GuildMfaLevel> = {
   0: '2FAを要求しない',
@@ -50,11 +47,7 @@ const mappingVerificationLevel: Record<
 };
 
 export class DiscordMemberStats
-  implements
-    MemberStats,
-    MembersWithRoleRepository,
-    UserStatsRepository,
-    GuildStatsRepository
+  implements MemberStats, MemberRepository, GuildRepository
 {
   constructor(
     private readonly client: Client,

diff --git a/packages/bot/src/adaptor/discord/role.ts b/packages/bot/src/adaptor/discord/role.ts
@@ -1,17 +1,10 @@
 import type { Client } from 'discord.js';
 
 import type { Snowflake } from '../../model/id.js';
-import type { RoleCreateManager } from '../../service/command/role-create.js';
-import type {
-  RoleIcon,
-  RoleStats,
-  RoleStatsRepository
-} from '../../service/command/role-info.js';
+import type { RoleIcon, RoleRepository, RoleStats } from '../../model/role.js';
 import type { RoleManager } from '../../service/kawaemon-has-all-roles.js';
 
-export class DiscordRoleManager
-  implements RoleManager, RoleCreateManager, RoleStatsRepository
-{
+export class DiscordRoleManager implements RoleManager, RoleRepository {
   constructor(
     private readonly client: Client,
     private readonly guildId: Snowflake