Merge pull request #20 from BrayanbotDev/dev

Merge Dev to Main

Author: DakshNamdev

Commands/General/uptime.js

@@ -0,0 +1,44 @@
+const Discord = require("discord.js"), ms = require("ms"),
+    Utils = require("../../Modules/Utils"),
+    { lang, config, commands } = require("../../index");
+
+
+module.exports = {
+    name: "uptime",
+    type: "general",
+    commandData: commands.General.Uptime,
+};
+
+/**
+ *
+ * @param {Discord.Client} bot
+ * @param {Discord.Message} message
+ * @param {Array} args
+ * @param {Object} config
+ */
+module.exports.run = async (bot, message, args, config) => {
+    message.reply(Utils.setupMessage({
+        configPath: lang.General.Uptime,
+        variables: [
+            ...Utils.userVariables(message.member),
+            ...Utils.botVariables(bot),
+            { searchFor: /{uptime}/g, replaceWith: ms(bot.uptime, { long: true }) },
+        ],
+    }));
+};
+
+/**
+ *
+ * @param {Discord.Client} bot
+ * @param {Discord.Interaction} interaction
+ */
+module.exports.runSlash = async (bot, interaction) => {
+    interaction.reply(Utils.setupMessage({
+        configPath: lang.General.Uptime,
+        variables: [
+            ...Utils.userVariables(interaction.member),
+            ...Utils.botVariables(bot),
+            { searchFor: /{uptime}/g, replaceWith: ms(bot.uptime, { long: true }) },
+        ],
+    }));
+};

Modules/Utils/createCustomConfig.js

@@ -6,10 +6,8 @@ module.exports = function (name, configData, addonName) {
     let addon_config = null;
     const generateConfig = function (path, data, type, name) {
         if (["yml", "yaml"].includes(type.toLowerCase())) {
-            fs.writeFileSync(
-                path,
-                YAML.stringify(data, { indent: 2, prettyErrors: true })
-            );
+            data = (YAML.stringify(data, { indent: 2, prettyErrors: true })).replace(/("|')?~(\d+)?("|')?:\s("|')?.+("|')?/g, match => "# " + match.replace(/("|')?~(\d+)?("|')?:\s/g, '').replace(/("|')/g, ''))
+            fs.writeFileSync(path, data);
             addon_config = data;
         } else if (["json"].includes(type.toLowerCase())) {
             fs.writeFileSync(path, JSON.stringify(data, null, 4));

Modules/Utils/setupMessage.js

@@ -301,7 +301,7 @@ module.exports = (settings, ephemeral = false, components = null) => {
 
                                         if (Label) button.setLabel(Label);
                                         if (Emoji) button.setEmoji(Emoji);
-                                        if (Disbled) button.setDisabled(true);
+                                        if (Disabled) button.setDisabled(true);
                                         rows[i].addComponents([button]);
                                     }
                                 } else if (!CustomID) {

commands.yml

@@ -26,6 +26,17 @@ General:
             Data:
                 Name: ping
                 Description: "Displays Bot Pings"
+    Uptime:
+        Description: "View Your Bot's Current Uptime"
+        Usage: "uptime"
+        Aliases: []
+        Permission:
+            - "@everyone"
+        SlashCommand:
+            Enabled: true
+            Data:
+                Name: uptime
+                Description: "View Your Bot's Current Uptime"
     ServerInfo:
         Description: "View Server's Information"
         Usage: "serverinfo"

lang.yml

@@ -23,6 +23,15 @@ General:
               Footer: "{user-tag}"
               FooterIcon: "{user-pfp}"
               Timestamp: true
+    Uptime:
+        Embeds:
+            - Author: "{bot-tag}'s Uptime"
+              AuthorIcon: "{bot-pfp}"
+              Description: |-
+                  > **Current Uptime**: {uptime}
+              Footer: "{user-tag}"
+              FooterIcon: "{user-pfp}"
+              Timestamp: true
     ServerInfo:
         Embeds:
             - Title: "💭 Server Info - {guild-name} [1/2]"