1.4.0 Release

Release 1.4.0 to main branch

Author: NotAShelf

.dockerignore

@@ -2,10 +2,12 @@
 node_modules
 package-lock.json
 yarn.lock
+pnpm-lock.yaml
 
 ## Github ##
 */.github/
 */workflows/
+.gitignore
 
 ## Config ##
 config.yml
@@ -17,6 +19,7 @@ config.json
 Addons/
 Addon_Configs/
 EvoTickets
+Install/ # not supported in the Docker image
 
 ## Logs ##
 errors.txt

README.md renamed to .github/README.md

@@ -23,12 +23,11 @@ jobs:
 
         # Download the pterodactyl egg from Zorino's Discord link.
       - name: Receive Pterodactyl Egg
-        run: wget -O pterodactyl-egg.json https://cdn.discordapp.com/attachments/940967061566398515/960130923771351110/egg-brayan-bot-v17.json
+        run: wget -O pterodactyl-egg.json https://cdn.discordapp.com/attachments/940963220485718097/965499029763006474/egg-brayan-bot.json
 
         # Generate checksums for all files and log them to the appropriate file
       - name: Generate Checksums
         run: |
-          FILELIST=
           md5sum BrayanBot-v${{ steps.vars.outputs.version }}.zip pterodactyl-egg.json Dockerfile docker-compose.yml .dockerignore > md5-checksums.txt
           sha256sum BrayanBot-v${{ steps.vars.outputs.version }}.zip pterodactyl-egg.json Dockerfile docker-compose.yml .dockerignore > sha256-checksums.txt
           sha512sum BrayanBot-v${{ steps.vars.outputs.version }}.zip pterodactyl-egg.json Dockerfile docker-compose.yml .dockerignore > sha512-checksums.txt

.github/workflows/release.yml

@@ -1,6 +1,7 @@
 # IDE
 .history/
 .vscode/
+.idea/
 
 # Logs
 logs
@@ -34,3 +35,4 @@ disposal/
 .github/
 README.md
 egg-brayan-bot-v17.json
+pnpm-lock.yaml

.gitignore

@@ -18,14 +18,13 @@ module.exports = {
  * @param {Object} config
  */
 module.exports.run = async (bot, message, args, config) => {
-    let guildVariables = await module.exports.fetchGuildVariables(message.guild, "guild");
     message.channel.send(Utils.setupMessage({
         configPath: lang.General.ServerInfo,
         variables: [
             ...Utils.userVariables(message.member),
             ...Utils.userVariables(Utils.parseUser(message.guild.ownerId, message.guild), "guild-owner"),
             ...Utils.botVariables(bot),
-            ...guildVariables,
+            ...Utils.guildVariables(message.guild, "guild"),
         ],
     }));
 };
@@ -36,84 +35,13 @@ module.exports.run = async (bot, message, args, config) => {
  * @param {Discord.Interaction} interaction
  */
 module.exports.runSlash = async (bot, interaction) => {
-    let guildVariables = await module.exports.fetchGuildVariables(
-        interaction.guild,
-        "guild"
-    );
     interaction.reply(Utils.setupMessage({
         configPath: lang.General.ServerInfo,
         variables: [
             ...Utils.userVariables(interaction.member),
             ...Utils.userVariables(Utils.parseUser(interaction.guild.ownerId, interaction.guild), "guild-owner"),
             ...Utils.botVariables(bot),
-            ...guildVariables,
+            ...Utils.guildVariables(interaction.guild, "guild"),
         ],
     }, true));
-};
-
-module.exports.fetchGuildVariables = async (guild, prefix = "guild") => {
-    let members = await guild.members.fetch();
-    return [
-        { searchFor: new RegExp(`{${prefix}-id}`, "g"), replaceWith: guild.id },
-        {
-            searchFor: new RegExp(`{${prefix}-name}`, "g"), replaceWith: guild.name,
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-icon}`, "g"), replaceWith: guild.iconURL({ dynamic: true }),
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-boosts}`), replaceWith: guild.premiumSubscriptionCount == "NONE" ? 0 : guild.premiumSubscriptionCount,
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-level}`), replaceWith: guild.premiumTier,
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-max-members}`), replaceWith: guild.maximumMembers,
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-createdat}`), replaceWith: moment(guild.createdAt).format("MMMM Do YYYY, h:mm a"),
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-online-members}`), replaceWith: guild.members.cache.filter(
-                (member) => member.presence && (member.presence.status !== "offline").size),
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-online-bots}`), replaceWith: guild.members.cache.filter((member) =>
-                member.presence && member.presence.status !== "offline" && member.user.bot).size,
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-members}`), replaceWith: members.filter((m) => !m.user.bot).size,
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-bots}`), replaceWith: members.filter((m) => m.user.bot).size,
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-total-members}`), replaceWith: guild.memberCount,
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-total-roles}`), replaceWith: guild.roles.cache.size,
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-total-channels}`), replaceWith: guild.channels.cache.size,
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-total-emojis}`), replaceWith: guild.emojis.cache.size,
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-online-humans}`), replaceWith: guild.members.cache.filter((member) =>
-                member.presence && member.presence.status == "online" && !member.user.bot).size,
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-idle-humans}`), replaceWith: guild.members.cache.filter((member) =>
-                member.presence && member.presence.status == "idle" && !member.user.bot).size,
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-dnd-humans}`), replaceWith: guild.members.cache.filter((member) =>
-                member.presence && member.presence.status == "dnd" && !member.user.bot).size,
-        },
-        {
-            searchFor: new RegExp(`{${prefix}-offline-humans}`), replaceWith: guild.members.cache.filter((member) =>
-                member.presence && member.presence.status == "offline" && !member.user.bot).size,
-        },
-    ];
-};
+};

Commands/General/serverinfo.js

@@ -0,0 +1,47 @@
+const Discord = require("discord.js"),
+    Utils = require("../../Modules/Utils"),
+    { lang, config, commands } = require("../../index"),
+    { SlashCommandBuilder } = Utils.builder,
+    moment = require("moment");
+
+module.exports = {
+    name: "userinfo",
+    type: "general",
+    commandData: commands.General.UserInfo,
+};
+
+/**
+ *
+ * @param {Discord.Client} bot
+ * @param {Discord.Message} message
+ * @param {Array} args
+ * @param {Object} config
+ */
+module.exports.run = async (bot, message, args, config) => {
+    const user = Utils.parseUserFromMessage(message, args[0] ? args[0] : message.author.id, true);
+    message.channel.send(Utils.setupMessage({
+        configPath: lang.General.UserInfo,
+        variables: [
+            ...Utils.userVariables(user),
+            ...Utils.memberVariables(user),
+            ...Utils.botVariables(bot),
+        ],
+    }));
+};
+
+/**
+ *
+ * @param {Discord.Client} bot
+ * @param {Discord.Interaction} interaction
+ */
+module.exports.runSlash = async (bot, interaction) => {
+    const user = interaction.options.getUser("target") ? Utils.parseUser(interaction.options.getUser("target").id, interaction.guild) : interaction.member;
+    interaction.reply(Utils.setupMessage({
+        configPath: lang.General.UserInfo,
+        variables: [
+            ...Utils.userVariables(user),
+            ...Utils.memberVariables(user),
+            ...Utils.botVariables(bot),
+        ],
+    }, true));
+};

Commands/General/userinfo.js

@@ -1,24 +1,34 @@
-# BrayanBot Dockerfile v0.1.2
+# BrayanBot Dockerfile v0.1.3
 # authors:
 #  - NotAShelf <[email protected]>
-# Node 17
+# Node 18.2.0
+# TODO: Switch to pnpm inside Docker
 
-FROM node:17.4.0
+# From Node 18 Alpine image
+FROM node:18-alpine
+LABEL MAINTAINER="NotAShelf <[email protected]>"
+
+# update packages
+RUN apk update && apk add --no-cache git ca-certificates make gcc g++ bash
 
 # Set working directory
 WORKDIR /opt/brayanbot
-# and copy files into that directory (config.yml, modules etc.)
+
+# And copy files into that directory (config.yml, modules etc.)
 COPY . ./
 
-RUN npm install -g npm@8 && npm install --save-dev
+# Install dependencies
+RUN yarn
 
 # Ensure these directories & files exist for compose volumes
-RUN touch /opt/brayanbot/config.yml && \
-    touch /opt/brayanbot/lang.yml && \
-    touch /opt/brayanbot/commands.yml
+RUN touch /opt/brayanbot/lang.yml && \
+    touch /opt/brayanbot/commands.yml && \
+    cp /opt/brayanbot/example.config.yml /opt/brayanbot/config.yml
+
 
-# Create a config.yml based on example config
-# and then start BrayanBot
+# Clean Yarn cache
+RUN yarn cache clean
 
-CMD npm start
+# Start the bot
+CMD [ "yarn", "start" ]
 

Dockerfile

@@ -1,12 +1,58 @@
-const Discord = require("discord.js"),
-    Utils = require("../Modules/Utils");
+const Utils = require("../Modules/Utils");
+const Discord = require("discord.js");
+const chalk = require("chalk");
+const ms = require("ms");
 
+let db;
+/**
+ * @param {Discord.Client} bot 
+ * @param {Discord.Interaction} interaction 
+ */
 module.exports = async (bot, interaction) => {
+    if(!db) db = await Utils.database.getDatabase();
     const { config, lang, SlashCmds } = bot;
     // Slash Command Executing
     if (interaction.isCommand()) {
         const command = SlashCmds.find((x) => x.commandData.SlashCommand.Data.Name.toLowerCase() == interaction.commandName.toLowerCase());
+        let permissions = [], ignoreCooldown = false;
+
         if (command && typeof command.runSlash == "function") {
+            // Command Cooldown Check
+            if (command.commandData.Cooldown && !interaction.user.bot) {
+                const ignoreUserCheck = bot.commands.IgnoredCooldown.Users ? bot.commands.IgnoredCooldown.Users.includes(x => x.id == interaction.user.id
+                    || x.tag.toLowerCase() == interaction.user.tag.toLowerCase()
+                    || x.username.toLowerCase() == interaction.user.username.toLowerCase()) : false;
+
+                const ignoreRoleCheck = bot.commands.IgnoredCooldown.Roles ? bot.commands.IgnoredCooldown.Roles.includes(x =>
+                    interaction.member.roles.cache.some(y => y.id == x
+                    || y.name.toLowerCase() == x.toLowerCase())) : false;
+
+                if(ignoreUserCheck || ignoreRoleCheck) ignoreCooldown = true;
+
+                const cooldown = ms(command.commandData.Cooldown);
+                const isOnCooldown = db.prepare(`SELECT * FROM cooldowns WHERE user=? AND command=?`).get(interaction.user.id, command.name);
+
+
+                if (ignoreCooldown == false) {
+                    if(isOnCooldown && isOnCooldown.time - Date.now() < 0) {
+                        Utils.database.cooldowns.reset(command.name, interaction.user.id, cooldown)
+                    } else if(isOnCooldown) {
+                        return interaction.reply(Utils.setupMessage({
+                            configPath: lang.Presets.OnCooldown,
+                            variables: [
+                                ...Utils.userVariables(interaction.member, 'user'),
+                                { searchFor: /{cooldown}/g, replaceWith: ms(isOnCooldown.time - Date.now(), { long: true }) },
+                                { searchFor: /{command}/g, replaceWith: command.name }
+                            ]
+                        }))
+                    } else if(!isOnCooldown) {
+                        Utils.database.cooldowns.set(command.name, interaction.user.id, cooldown)
+                        db.prepare(`INSERT INTO cooldowns (user, command, time)VALUES(?,?,?)`).run(interaction.user.id, command.name, (Date.now() + cooldown));
+                    }
+                }
+            }
+
+            // Command Channel Check
             if (command.commandData.AllowedChannels) {
                 if (typeof command.commandData.AllowedChannels == "string")
                     command.commandData.AllowedChannels = [command.commandData.AllowedChannels];
@@ -28,18 +74,60 @@ module.exports = async (bot, interaction) => {
                         ],
                     }, true))
                 }
+            };
+
+            // Command Permission Check
+            if (command.commandData.Permission) {
+                if (typeof command.commandData.Permission == "string")
+                    command.commandData.Permission = [command.commandData.Permission];
+                else if (!command.commandData.Permission[0]) command.commandData.Permission = ["@everyone"];
+
+                if (command.commandData.Permission.includes("@everyone") || command.commandData.Permission.includes("everyone"))
+                    permissions.push(true);
+                else command.commandData.Permission.forEach(permission => {
+                    const roleExists = Utils.findRole(permission, interaction.guild, false);
+                    const userExists = Utils.parseUser(permission, interaction.guild);
+
+                    if (!roleExists && !userExists)
+                        Utils.logWarning(`${chalk.bold(permission)} is not a valid ${chalk.bold('role/user')} permission in command ${chalk.bold(command.name)}`)
+
+                    if (userExists && userExists.id === interaction.user.id) permissions.push(true);
+                    else if(Utils.hasRole(interaction.member, permission, false)) permissions.push(true);
+                })
+            };
+
+            if (permissions.includes(true)) {
+                let options = interaction.options && interaction.options._hoistedOptions ? Utils.parseSlashArgs(interaction.options._hoistedOptions) : {};
+                await command.runSlash(bot, interaction, options, {
+                    commandUsed: interaction.commandName,
+                    commandData: command
+                });
+            } else {
+                interaction.reply(Utils.setupMessage({
+                    configPath: lang.Presets.NoPermission,
+                    variables: [
+                        ...Utils.userVariables(interaction.member),
+                        {
+                            searchFor: /{perms}/g, replaceWith: permissions[0] ? command.commandData.Permission.map((x) => {
+                                if (!!Utils.findRole(x, interaction.guild, false)) {
+                                    let role = Utils.findRole(x, interaction.guild, true);
+                                    if (role) return Utils.builder.roleMention(role.id);
+                                }
+                                if (!!Utils.parseUser(x, interaction.guild)) {
+                                    let user = Utils.parseUser(x, interaction.guild, true);
+                                    if (user) return Utils.builder.userMention(user.id);
+                                }
+                            }).join(", ") : "Invalid Permissions configured.",
+                        },
+                    ],
+                }));
             }
-            let options = interaction.options && interaction.options._hoistedOptions ? Utils.parseSlashArgs(interaction.options._hoistedOptions) : {};
-            let commandUsed = interaction.commandName, commandData = command;
-            await command.runSlash(bot, interaction, options, { commandUsed, commandData });
+
         } else {
             let cmd = interaction.guild.commands.cache.find((x) =>
                 x.name.toLowerCase() == interaction.commandName.toLowerCase());
             if (cmd) cmd.delete();
-            interaction.reply({
-                content: "This command no longer exists.",
-                ephemeral: true,
-            });
+            interaction.reply({ content: "This command no longer exists.", ephemeral: true });
         }
     } else if (interaction.isButton()) {
         bot.emit("interactionCreate-Button", interaction);