Fix some bugs

Author: Gerrit0

src/bot.ts

@@ -1,5 +1,5 @@
 import { Message, Client, User, GuildMember } from 'discord.js';
-import { prefixes, trustedRoleId } from './env';
+import { botAdmins, prefixes, trustedRoleId } from './env';
 
 export interface CommandRegistration {
 	aliases: string[];
@@ -21,13 +21,21 @@ export class Bot {
 				const content = msg.content
 					.substring(triggerWithPrefix.length + 1)
 					.trim();
-				this.getByTrigger(
+
+				const command = this.getByTrigger(
 					triggerWithPrefix.substring(matchingPrefix.length),
-				)
-					?.listener(msg, content)
-					.catch(err => {
-						this.client.emit('error', err);
-					});
+				);
+
+				if (
+					!command ||
+					(this.adminCommands.includes(command) &&
+						!this.isAdmin(msg.author))
+				) {
+					return;
+				}
+				command.listener(msg, content).catch(err => {
+					this.client.emit('error', err);
+				});
 			}
 		});
 	}
@@ -49,6 +57,10 @@ export class Bot {
 		return member?.permissions.has('ManageMessages') ?? false;
 	}
 
+	isAdmin(user: User) {
+		return botAdmins.includes(user.id);
+	}
+
 	getTrustedMemberError(msg: Message) {
 		if (!msg.guild || !msg.member || !msg.channel.isTextBased()) {
 			return ":warning: you can't use that command here.";

src/modules/etc.ts

@@ -18,7 +18,7 @@ const emojiRegex = /<:\w+?:(\d+?)>|(\p{Emoji_Presentation})/gu;
 const defaultPollEmojis = ['✅', '❌', '🤷'];
 
 export function etcModule(bot: Bot) {
-	bot.registerAdminCommand({
+	bot.registerCommand({
 		aliases: ['ping'],
 		description: 'See if the bot is alive',
 		async listener(msg) {

src/modules/playground.ts

@@ -31,7 +31,7 @@ export async function playgroundModule(bot: Bot) {
 	const editedLongLink = new LimitedSizeMap<string, Message>(1000);
 
 	bot.registerCommand({
-		aliases: ['pg', 'playg', 'playground'],
+		aliases: ['playground', 'pg', 'playg'],
 		description: 'Shorten a TypeScript playground link',
 		async listener(msg, content) {
 			console.log('Playground', msg.content);
@@ -46,7 +46,6 @@ export async function playgroundModule(bot: Bot) {
 						":warning: couldn't find a codeblock!",
 					);
 			}
-			console.log('Code is', code);
 			const embed = new EmbedBuilder()
 				.setURL(PLAYGROUND_BASE + compressToEncodedURIComponent(code))
 				.setTitle('View in Playground')