From cc116c2ec3ecfc50c7d55c0e4df7c81c7b863439 Mon Sep 17 00:00:00 2001
From: Dominic Ferrando <mail@dominicferrando.com>
Date: Sat, 22 Aug 2026 17:35:12 -0400
Subject: [PATCH] More restructuring

---
 src/{services => }/cmd/registry/chan.ts      | 2 +-
 src/{services => }/cmd/registry/comfy.ts     | 2 +-
 src/{services => }/cmd/registry/mode.ts      | 0
 src/{services => }/cmd/registry/redpillme.ts | 0
 src/{services => }/cmd/service.ts            | 0
 src/index.ts                                 | 4 ++--
 src/services/{role/service.ts => role.ts}    | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{services => }/cmd/registry/chan.ts (93%)
 rename src/{services => }/cmd/registry/comfy.ts (91%)
 rename src/{services => }/cmd/registry/mode.ts (100%)
 rename src/{services => }/cmd/registry/redpillme.ts (100%)
 rename src/{services => }/cmd/service.ts (100%)
 rename src/services/{role/service.ts => role.ts} (98%)

diff --git a/src/services/cmd/registry/chan.ts b/src/cmd/registry/chan.ts
similarity index 93%
rename from src/services/cmd/registry/chan.ts
rename to src/cmd/registry/chan.ts
index a22379c..a274492 100644
--- a/src/services/cmd/registry/chan.ts
+++ b/src/cmd/registry/chan.ts
@@ -1,6 +1,6 @@
 import type { Message } from "discord.js";
 import type { Command } from "../service";
-import Chan from "../../../util/chan";
+import Chan from "../../util/chan";
 
 export default {
   name: "chan",
diff --git a/src/services/cmd/registry/comfy.ts b/src/cmd/registry/comfy.ts
similarity index 91%
rename from src/services/cmd/registry/comfy.ts
rename to src/cmd/registry/comfy.ts
index de42525..7fbcc41 100644
--- a/src/services/cmd/registry/comfy.ts
+++ b/src/cmd/registry/comfy.ts
@@ -1,6 +1,6 @@
 import type { Message } from "discord.js";
 import type { Command } from "../service";
-import Chan from "../../../util/chan";
+import Chan from "../../util/chan";
 
 export default {
   name: "comfy",
diff --git a/src/services/cmd/registry/mode.ts b/src/cmd/registry/mode.ts
similarity index 100%
rename from src/services/cmd/registry/mode.ts
rename to src/cmd/registry/mode.ts
diff --git a/src/services/cmd/registry/redpillme.ts b/src/cmd/registry/redpillme.ts
similarity index 100%
rename from src/services/cmd/registry/redpillme.ts
rename to src/cmd/registry/redpillme.ts
diff --git a/src/services/cmd/service.ts b/src/cmd/service.ts
similarity index 100%
rename from src/services/cmd/service.ts
rename to src/cmd/service.ts
diff --git a/src/index.ts b/src/index.ts
index 39611d9..730ace3 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,6 +1,6 @@
 import { Client, Events, GatewayIntentBits } from 'discord.js';
-import { CommandService } from './services/cmd/service';
-import RoleService from './services/role/service';
+import { CommandService } from './cmd/service';
+import RoleService from './services/role';
 
 const client = new Client({ intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMembers, GatewayIntentBits.GuildMessages, GatewayIntentBits.MessageContent] });
 
diff --git a/src/services/role/service.ts b/src/services/role.ts
similarity index 98%
rename from src/services/role/service.ts
rename to src/services/role.ts
index 3ecb97a..37dfe33 100644
--- a/src/services/role/service.ts
+++ b/src/services/role.ts
@@ -68,7 +68,7 @@ export default class RoleService {
   validate(guilds: Collection<string, Guild>): void {
     guilds.forEach(guild => {
       const missing = Object.values(RoleService.ROLES).filter(role => !this.getRoleByName(guild, role.name));
-      if (missing.length) console.error(`${guild.name} is missing roles: ${missing.join(",")}`);
+      if (missing.length) console.error(`${guild.name} is missing roles: ${missing.map(r => r.name).join(", ")}`);
     });
   }