4 files changed, 20 insertions, 9 deletions
diff --git a/src/commands/moulberry-bush/giveawayPing.ts b/src/commands/moulberry-bush/giveawayPing.ts
index d93e0c9..6803c0c 100644
--- a/src/commands/moulberry-bush/giveawayPing.ts
+++ b/src/commands/moulberry-bush/giveawayPing.ts
@@ -1,4 +1,4 @@
-import { AllowedMentions, BushCommand, clientSendAndPermCheck, emojis, type CommandMessage } from '#lib';
+import { AllowedMentions, BushCommand, clientSendAndPermCheck, emojis, mappings, type CommandMessage } from '#lib';
 import assert from 'assert';
 import { PermissionFlagsBits } from 'discord.js';
 
@@ -24,8 +24,8 @@ export default class GiveawayPingCommand extends BushCommand {
 			cooldown: 1.44e7, //4 hours
 			ratelimit: 1,
 			editable: false,
-			restrictedGuilds: ['516977525906341928'],
-			restrictedChannels: ['767782084981817344', '833855738501267456']
+			restrictedGuilds: [mappings.guilds["Moulberry's Bush"]],
+			restrictedChannels: [mappings.channels['giveaways']]
 		});
 	}
 
diff --git a/src/commands/moulberry-bush/moulHammer.ts b/src/commands/moulberry-bush/moulHammer.ts
index 0eeb769..277f051 100644
--- a/src/commands/moulberry-bush/moulHammer.ts
+++ b/src/commands/moulberry-bush/moulHammer.ts
@@ -1,4 +1,12 @@
-import { BushCommand, clientSendAndPermCheck, colors, type ArgType, type CommandMessage, type SlashMessage } from '#lib';
+import {
+	BushCommand,
+	clientSendAndPermCheck,
+	colors,
+	mappings,
+	type ArgType,
+	type CommandMessage,
+	type SlashMessage
+} from '#lib';
 import assert from 'assert';
 import { ApplicationCommandOptionType, EmbedBuilder, PermissionFlagsBits } from 'discord.js';
 
@@ -22,8 +30,8 @@ export default class MoulHammerCommand extends BushCommand {
 			],
 			slash: true,
 			channel: 'guild',
-			slashGuilds: ['516977525906341928'],
-			restrictedGuilds: ['516977525906341928'],
+			slashGuilds: [mappings.guilds["Moulberry's Bush"]],
+			restrictedGuilds: [mappings.guilds["Moulberry's Bush"]],
 			clientPermissions: (m) => clientSendAndPermCheck(m, [PermissionFlagsBits.EmbedLinks], true),
 			userPermissions: []
 		});
diff --git a/src/commands/moulberry-bush/report.ts b/src/commands/moulberry-bush/report.ts
index 13ef2b6..6d1203c 100644
--- a/src/commands/moulberry-bush/report.ts
+++ b/src/commands/moulberry-bush/report.ts
@@ -4,6 +4,7 @@ import {
 	clientSendAndPermCheck,
 	colors,
 	emojis,
+	mappings,
 	timestampAndDelta,
 	type ArgType,
 	type CommandMessage
@@ -54,11 +55,12 @@ export default class ReportCommand extends BushCommand {
 			return await message.util.reply(`${emojis.error} This command can only be used in servers where reporting is enabled.`);
 
 		if (!member) return await message.util.reply(`${emojis.error} Choose someone to report`);
-		if (member.user.id === '322862723090219008')
+		if (member.user.id === mappings.users['IRONM00N'])
 			return await message.util.reply({
 				content: `Thank you for your report! We take these allegations very seriously and have reported <@${member.user.id}> to the FBI!`,
 				allowedMentions: AllowedMentions.none()
 			});
+
 		if (member.user.bot)
 			return await message.util.reply(`${emojis.error} You cannot report a bot <:WeirdChamp:756283321301860382>.`);
 
diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/rule.ts
index d58b78e..25a3ef0 100644
--- a/src/commands/moulberry-bush/rule.ts
+++ b/src/commands/moulberry-bush/rule.ts
@@ -3,6 +3,7 @@ import {
 	Arg,
 	BushCommand,
 	clientSendAndPermCheck,
+	mappings,
 	type CommandMessage,
 	type OptArgType,
 	type SlashMessage
@@ -98,11 +99,11 @@ export default class RuleCommand extends BushCommand {
 				}
 			],
 			slash: true,
-			slashGuilds: ['516977525906341928'],
+			slashGuilds: [mappings.guilds["Moulberry's Bush"]],
 			channel: 'guild',
 			clientPermissions: (m) => clientSendAndPermCheck(m, [PermissionFlagsBits.EmbedLinks], true),
 			userPermissions: [],
-			restrictedGuilds: ['516977525906341928']
+			restrictedGuilds: [mappings.guilds["Moulberry's Bush"]]
 		});
 	}