.dev.env

@@ -7,7 +7,7 @@
 # any secret values.
 
 BOT_TOKEN=
-BOT_VER=3.2 DEV
+BOT_VER=3.1.3
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=682942374040961060

.drone.yml

@@ -54,11 +54,11 @@ steps:
   - yarn install --frozen-lockfile
   - yarn build
 
-# - name: test
-#   image: node
-#   commands:
-#   - yarn install --frozen-lockfile
-#   - yarn test
+- name: test
+  image: node
+  commands:
+  - yarn install --frozen-lockfile
+  - yarn test
 
 trigger:
   branch:

.gitea/PULL_REQUEST_TEMPLATE.md

@@ -24,6 +24,6 @@ Please describe the tests that you ran to verify the changes. Provide instructio
 - [ ] I have commented my code, particularly in hard-to-understand areas
 - [ ] I have made corresponding changes to the documentation
 - [ ] My changes generate no new warnings
-- [ ] I have added tests that provide my fix is effective or that my feature works
+- [ ] I have added tests that provde my fix is effective or that my feature works
 - [ ] New and existing unit tests pass locally with my changes
 - [ ] Any dependent changes have been merged and published in downstream modules

.prod.env

@@ -7,7 +7,7 @@
 # any secret values.
 
 BOT_TOKEN=
-BOT_VER=3.2
+BOT_VER=3.1.3
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=680083120896081954

.stage.env

@@ -7,7 +7,7 @@
 # any secret values.
 
 BOT_TOKEN=
-BOT_VER=3.2 BETA
+BOT_VER=3.1.3
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=1016767908740857949

data/usage/config.txt

@@ -26,11 +26,11 @@ event.message.delete.channel: Sets the channel the bot will log message delete e
 event.message.update.enabled: Enables/Disables the message delete log event (Default: "false")
 event.message.update.channel: Sets the channel the bot will log message delete events to (Default: "message-logs")
 
-event.member.add.enabled: Enables/Disables the member join log event (Default: "false")
-event.member.add.channel: Sets the channel the bot will log member join events to (Default: "member-logs")
+event.member.add.enabled: Enables/Disables the message delete log event (Default: "false")
+event.member.add.channel: Sets the channel the bot will log message delete events to (Default: "member-logs")
 
-event.member.remove.enabled: Enables/Disables the member leave log event (Default: "false")
-event.member.remove.channel: Sets the channel the bot will log member leave events to (Default: "member-logs")
+event.member.remove.enabled: Enables/Disables the message delete log event (Default: "false")
+event.member.remove.channel: Sets the channel the bot will log message delete events to (Default: "member-logs")
 
-event.member.update.enabled: Enables/Disables the member update log event (Default: "false")
-event.member.update.channel: Sets the channel the bot will log member update events to (Default: "member-logs")
+event.member.update.enabled: Enables/Disables the message delete log event (Default: "false")
+event.member.update.channel: Sets the channel the bot will log message delete events to (Default: "member-logs")

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vylbot-app",
-  "version": "3.2.0",
+  "version": "3.1.3",
   "description": "A discord bot made for Vylpes' Den",
   "main": "./dist/vylbot",
   "typings": "./dist",
@@ -26,7 +26,7 @@
   "homepage": "https://github.com/Vylpes/vylbot-app",
   "funding": "https://ko-fi.com/vylpes",
   "dependencies": {
-    "@discordjs/rest": "^2.0.0",
+    "@discordjs/rest": "^1.1.0",
     "@types/jest": "^29.0.0",
     "@types/uuid": "^9.0.0",
     "discord.js": "^14.3.0",
@@ -34,7 +34,7 @@
     "emoji-regex": "^10.0.0",
     "jest": "^29.0.0",
     "jest-mock-extended": "^3.0.0",
-    "minimatch": "9.0.3",
+    "minimatch": "9.0.2",
     "mysql": "^2.18.1",
     "random-bunny": "^2.0.5",
     "ts-jest": "^29.0.0",
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
-    "np": "^9.0.0",
+    "np": "^8.0.4",
     "typescript": "^5.0.0"
   }
 }

src/buttonEvents/verify.ts

@@ -1,42 +0,0 @@
-import { ButtonInteraction, CacheType } from "discord.js";
-import { ButtonEvent } from "../type/buttonEvent";
-import SettingsHelper from "../helpers/SettingsHelper";
-
-export default class Verify extends ButtonEvent {
-    public override async execute(interaction: ButtonInteraction<CacheType>) {
-        if (!interaction.guildId || !interaction.guild) return;
-
-        const roleName = await SettingsHelper.GetSetting("verification.role", interaction.guildId);
-
-        if (!roleName) return;
-
-        const role = interaction.guild.roles.cache.find(x => x.name == roleName);
-
-        if (!role) {
-            await interaction.reply({
-                content: `Unable to find the role, ${roleName}`,
-                ephemeral: true,
-            });
-
-            return;
-        }
-
-        const member = interaction.guild.members.cache.find(x => x.id == interaction.user.id);
-
-        if (!member || !member.manageable) {
-            await interaction.reply({
-                content: "Unable to give role to user",
-                ephemeral: true,
-            });
-
-            return;
-        }
-
-        await member.roles.add(role);
-
-        await interaction.reply({
-            content: "Given role",
-            ephemeral: true,
-        });
-    }
-}

src/client/client.ts

@@ -1,4 +1,4 @@
-import { Client, Partials } from "discord.js";
+import { Client } from "discord.js";
 import * as dotenv from "dotenv";
 import { createConnection } from "typeorm";
 import { EventType } from "../constants/EventType";
@@ -9,13 +9,10 @@ import { Command } from "../type/command";
 import { Events } from "./events";
 import { Util } from "./util";
 import AppDataSource from "../database/dataSources/appDataSource";
-import ButtonEventItem from "../contracts/ButtonEventItem";
-import { ButtonEvent } from "../type/buttonEvent";
 
 export class CoreClient extends Client {
     private static _commandItems: ICommandItem[];
     private static _eventItems: IEventItem[];
-    private static _buttonEvents: ButtonEventItem[];
 
     private _events: Events;
     private _util: Util;
@@ -28,17 +25,12 @@ export class CoreClient extends Client {
         return this._eventItems;
     }
 
-    public static get buttonEvents(): ButtonEventItem[] {
-        return this._buttonEvents;
-    }
-
-    constructor(intents: number[], partials: Partials[]) {
-        super({ intents: intents, partials: partials });
+    constructor(intents: number[]) {
+        super({ intents: intents });
         dotenv.config();
 
         CoreClient._commandItems = [];
         CoreClient._eventItems = [];
-        CoreClient._buttonEvents = [];
 
         this._events = new Events();
         this._util = new Util();
@@ -81,13 +73,4 @@ export class CoreClient extends Client {
 
         CoreClient._eventItems.push(item);
     }
-
-    public static RegisterButtonEvent(buttonId: string, event: ButtonEvent) {
-        const item: ButtonEventItem = {
-            ButtonId: buttonId,
-            Event: event,
-        };
-
-        CoreClient._buttonEvents.push(item);
-    }
 }

src/client/events.ts

@@ -1,18 +1,40 @@
 import { Interaction } from "discord.js";
-import ChatInputCommand from "./interactionCreate/chatInputCommand";
-import Button from "./interactionCreate/button";
+import ICommandItem from "../contracts/ICommandItem";
+import SettingsHelper from "../helpers/SettingsHelper";
+import { CoreClient } from "./client";
 
 export class Events {
     public async onInteractionCreate(interaction: Interaction) {
+        if (!interaction.isChatInputCommand()) return;
         if (!interaction.guildId) return;
 
-        if (interaction.isChatInputCommand()) {
-            ChatInputCommand.onChatInput(interaction);
+        const disabledCommandsString = await SettingsHelper.GetSetting("commands.disabled", interaction.guildId);
+        const disabledCommands = disabledCommandsString?.split(",");
+
+        const disabledCommandsMessage = await SettingsHelper.GetSetting("commands.disabled.message", interaction.guildId);
+
+        if (disabledCommands?.find(x => x == interaction.commandName)) {
+            await interaction.reply(disabledCommandsMessage || "This command is disabled.");
+            return;
         }
 
-        if (interaction.isButton()) {
-            Button.onButtonClicked(interaction);
+        const item = CoreClient.commandItems.find(x => x.Name == interaction.commandName && !x.ServerId);
+        const itemForServer = CoreClient.commandItems.find(x => x.Name == interaction.commandName && x.ServerId == interaction.guildId);
+
+        let itemToUse: ICommandItem;
+
+        if (!itemForServer) {
+            if (!item) {
+                await interaction.reply('Command not found');
+                return;
+            }
+
+            itemToUse = item;
+        } else {
+            itemToUse = itemForServer;
         }
+
+        itemToUse.Command.execute(interaction);
     }
 
     // Emit when bot is logged in and ready to use

src/client/interactionCreate/button.ts

@@ -1,17 +0,0 @@
-import { ButtonInteraction } from "discord.js";
-import { CoreClient } from "../client";
-
-export default class Button {
-    public static async onButtonClicked(interaction: ButtonInteraction) {
-        if (!interaction.isButton) return;
-
-        const item = CoreClient.buttonEvents.find(x => x.ButtonId == interaction.customId.split(" ")[0]);
-
-        if (!item) {
-            await interaction.reply("Event not found.");
-            return;
-        }
-
-        item.Event.execute(interaction);
-    }
-}

src/client/interactionCreate/chatInputCommand.ts

@@ -1,27 +0,0 @@
-import { Interaction } from "discord.js";
-import { CoreClient } from "../client";
-import ICommandItem from "../../contracts/ICommandItem";
-
-export default class ChatInputCommand {
-    public static async onChatInput(interaction: Interaction) {
-        if (!interaction.isChatInputCommand()) return;
-
-        const item = CoreClient.commandItems.find(x => x.Name == interaction.commandName && !x.ServerId);
-        const itemForServer = CoreClient.commandItems.find(x => x.Name == interaction.commandName && x.ServerId == interaction.guildId);
-
-        let itemToUse: ICommandItem;
-
-        if (!itemForServer) {
-            if (!item) {
-                await interaction.reply("Command not found.");
-                return;
-            }
-
-            itemToUse = item;
-        } else {
-            itemToUse = itemForServer;
-        }
-
-        itemToUse.Command.execute(interaction);
-    }
-}

src/commands/ban.ts

@@ -44,7 +44,6 @@ export default class Ban extends Command {
             .setColor(EmbedColours.Ok)
             .setTitle("Member Banned")
             .setDescription(`<@${targetUser.user.id}> \`${targetUser.user.tag}\``)
-            .setThumbnail(targetUser.user.avatarURL())
             .addFields([
                 {
                     name: "Moderator",

src/commands/config.ts

@@ -116,15 +116,9 @@ export default class Config extends Command {
         const setting = server.Settings.filter(x => x.Key == key.value)[0];
 
         if (setting) {
-            await interaction.reply(`\`${key.value}\`: \`${setting.Value}\``);
+            await interaction.reply(`\`${key}\`: \`${setting.Value}\``);
         } else {
-            var defaultValue = DefaultValues.GetValue(key.value.toString());
-
-            if (defaultValue) {
-                await interaction.reply(`\`${key.value}\`: \`${defaultValue}\` <DEFAULT>`);
-            } else {
-                await interaction.reply(`\`${key.value}\`: <NONE>`);
-            }
+            await interaction.reply(`\`${key}\`: \`${DefaultValues.GetValue(key.value.toString())}\` <DEFAULT>`);
         }
     }
 

src/commands/kick.ts

@@ -44,7 +44,6 @@ export default class Kick extends Command {
             .setColor(EmbedColours.Ok)
             .setTitle("Member Kicked")
             .setDescription(`<@${targetUser.user.id}> \`${targetUser.user.tag}\``)
-            .setThumbnail(targetUser.user.avatarURL())
             .addFields([
                 {
                     name: "Moderator",

src/commands/mute.ts

@@ -42,7 +42,6 @@ export default class Mute extends Command {
             .setColor(EmbedColours.Ok)
             .setTitle("Member Muted")
             .setDescription(`<@${targetUser.user.id}> \`${targetUser.user.tag}\``)
-            .setThumbnail(targetUser.user.avatarURL())
             .addFields([
                 {
                     name: "Moderator",
@@ -54,14 +53,7 @@ export default class Mute extends Command {
                 },
             ]);
 
-        const mutedRoleName = await SettingsHelper.GetSetting('role.muted', interaction.guildId);
-
-        if (!mutedRoleName) {
-            await interaction.reply('Unable to find configuration. Please contact the bot author.');
-            return;
-        }
-
-        const mutedRole = interaction.guild.roles.cache.find(role => role.name == mutedRoleName);
+        const mutedRole = interaction.guild.roles.cache.find(role => role.name == process.env.ROLES_MUTED);
 
         if (!mutedRole) {
             await interaction.reply('Muted role not found.');

src/commands/rules.ts

@@ -1,8 +1,7 @@
-import { ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder } from "discord.js";
+import { CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder } from "discord.js";
 import { existsSync, readFileSync } from "fs";
 import EmbedColours from "../constants/EmbedColours";
 import { Command } from "../type/command";
-import SettingsHelper from "../helpers/SettingsHelper";
 
 interface IRules {
     title?: string;
@@ -15,36 +14,13 @@ export default class Rules extends Command {
     constructor() {
         super();
 
-        this.CommandBuilder = new SlashCommandBuilder()
-            .setName('rules')
-            .setDescription("Rules-related commands")
-            .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator)
-            .addSubcommand(x =>
-                x
-                    .setName('embeds')
-                    .setDescription('Send the rules embeds for this server'))
-            .addSubcommand(x =>
-                x
-                    .setName('access')
-                    .setDescription('Send the server verification embed button'));
+        super.CommandBuilder = new SlashCommandBuilder()
+            .setName("rules")
+            .setDescription("Send the rules embeds for this server")
+            .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator);
     }
 
     public override async execute(interaction: CommandInteraction) {
-        if (!interaction.isChatInputCommand()) return;
-
-        switch (interaction.options.getSubcommand()) {
-            case "embeds":
-                await this.SendEmbeds(interaction);
-                break;
-            case "access":
-                await this.SendAccessButton(interaction);
-                break;
-            default:
-                await interaction.reply("Subcommand doesn't exist.");
-        }
-    }
-
-    private async SendEmbeds(interaction: CommandInteraction) {
         if (!interaction.guildId) return;
 
         if (!existsSync(`${process.cwd()}/data/rules/${interaction.guildId}.json`)) {
@@ -95,27 +71,4 @@ export default class Rules extends Command {
 
         await interaction.reply({ embeds: [ successEmbed ], ephemeral: true });
     }
-
-    private async SendAccessButton(interaction: CommandInteraction) {
-        if (!interaction.guildId) return;
-
-        const buttonLabel = await SettingsHelper.GetSetting("rules.access.label", interaction.guildId);
-
-        const row = new ActionRowBuilder<ButtonBuilder>()
-            .addComponents([
-                new ButtonBuilder()
-                    .setCustomId('verify')
-                    .setStyle(ButtonStyle.Primary)
-                    .setLabel(buttonLabel || "Verify")
-            ]);
-
-        await interaction.channel?.send({
-            components: [ row ]
-        });
-
-        await interaction.reply({
-            content: "Success",
-            ephemeral: true,
-        });
-    }
 }

src/commands/timeout.ts

@@ -64,7 +64,6 @@ export default class Timeout extends Command {
             .setColor(EmbedColours.Ok)
             .setTitle("Member Timed Out")
             .setDescription(`<@${targetUser.user.id}> \`${targetUser.user.tag}\``)
-            .setThumbnail(targetUser.user.avatarURL())
             .addFields([
                 {
                     name: "Moderator",

src/commands/unmute.ts

@@ -40,7 +40,6 @@ export default class Unmute extends Command {
             .setColor(EmbedColours.Ok)
             .setTitle("Member Unmuted")
             .setDescription(`<@${targetUser.user.id}> \`${targetUser.user.tag}\``)
-            .setThumbnail(targetUser.user.avatarURL())
             .addFields([
                 {
                     name: "Moderator",
@@ -52,14 +51,7 @@ export default class Unmute extends Command {
                 },
             ]);
 
-        const mutedRoleName = await SettingsHelper.GetSetting('role.muted', interaction.guildId);
-
-        if (!mutedRoleName) {
-            await interaction.reply('Unable to find configuration. Please contact the bot author.');
-            return;
-        }
-
-        const mutedRole = interaction.guild.roles.cache.find(role => role.name == mutedRoleName);
+        const mutedRole = interaction.guild.roles.cache.find(role => role.name == process.env.ROLES_MUTED);
 
         if (!mutedRole) {
             await interaction.reply('Muted role not found.');

src/commands/warn.ts

@@ -41,7 +41,6 @@ export default class Warn extends Command {
             .setColor(EmbedColours.Ok)
             .setTitle("Member Warned")
             .setDescription(`<@${targetUser.user.id}> \`${targetUser.user.tag}\``)
-            .setThumbnail(targetUser.user.avatarURL())
             .addFields([
                 {
                     name: "Moderator",

src/constants/DefaultValues.ts

@@ -31,7 +31,6 @@ export default class DefaultValues {
 
             // Rules (Command)
             this.values.push({ Key: "rules.file", Value: "data/rules/rules" });
-            this.values.push({ Key: "rules.access.label", Value: "Verify" });
 
             // Channels
             this.values.push({ Key: "channels.logs.message", Value: "message-logs" });
@@ -58,7 +57,7 @@ export default class DefaultValues {
             this.values.push({ Key: "event.member.remove.channel", Value: "member-logs" });
             
             this.values.push({ Key: "event.member.update.enabled", Value: "false" });
-            this.values.push({ Key: "event.member.update.channel", Value: "member-logs" });
+            this.values.push({ Key: "event.member.remove.channel", Value: "member-logs" });
 
         }
     }

src/contracts/ButtonEventItem.ts

@@ -1,8 +0,0 @@
-import { ButtonEvent } from "../type/buttonEvent";
-
-interface ButtonEventItem {
-    ButtonId: string,
-    Event: ButtonEvent,
-}
-
-export default ButtonEventItem;

src/events/MessageEvents/MessageDelete.ts

@@ -33,8 +33,8 @@ export default async function MessageDelete(message: Message) {
     if (message.attachments.size > 0) {
         embed.addFields([
             {
-                name: `Attachments (${message.attachments.size})`,
-                value: `\`\`\`${message.attachments.map(x => x.name).join("\n")}\`\`\``
+                name: "Attachments",
+                value: `\`\`\`${message.attachments.map(x => x.url).join("\n")}\`\`\``
             }
         ]);
     }

src/registry.ts

@@ -37,9 +37,6 @@ import MessageDelete from "./events/MessageEvents/MessageDelete";
 import MessageUpdate from "./events/MessageEvents/MessageUpdate";
 import MessageCreate from "./events/MessageEvents/MessageCreate";
 
-// Button Event Imports
-import Verify from "./buttonEvents/verify";
-
 export default class Registry {
     public static RegisterCommands() {
         CoreClient.RegisterCommand("about", new About());
@@ -87,8 +84,4 @@ export default class Registry {
         CoreClient.RegisterEvent(EventType.MessageUpdate, MessageUpdate);
         CoreClient.RegisterEvent(EventType.MessageCreate, MessageCreate);
     }
-
-    public static RegisterButtonEvents() {
-        CoreClient.RegisterButtonEvent("verify", new Verify());
-    }
 }

src/type/buttonEvent.ts

@@ -1,5 +0,0 @@
-import { ButtonInteraction } from "discord.js";
-
-export abstract class ButtonEvent {
-    abstract execute(interaction: ButtonInteraction): Promise<void>;
-}

src/vylbot.ts

@@ -1,7 +1,7 @@
 import { CoreClient } from "./client/client";
 import * as dotenv from "dotenv";
 import registry from "./registry";
-import { IntentsBitField, Partials } from "discord.js";
+import { IntentsBitField } from "discord.js";
 
 dotenv.config();
 
@@ -30,13 +30,9 @@ const client = new CoreClient([
     IntentsBitField.Flags.GuildMessages,
     IntentsBitField.Flags.GuildMembers,
     IntentsBitField.Flags.MessageContent,
-], [
-    Partials.GuildMember,
-    Partials.User,
 ]);
 
 registry.RegisterCommands();
 registry.RegisterEvents();
-registry.RegisterButtonEvents();
 
 client.start();