I'm so random and quirky lol (#121)

Author: Sv443

.gitignore

@@ -1,12 +1,13 @@
 node_modules/
 out/
-.env
+dump.rdb
+
 src/test.ts
 src/test.js
-data.json
-application.yml
 logs/
-dump.rdb
-
-# directory to store git patches
 .patches
+
+.env
+data.json
+application.yml
+.command_hash

.vscode/settings.json

@@ -45,6 +45,7 @@
     },
     "files.exclude": {
         "out/**": true,
+        ".command_hash": true,
     },
     "git.branchPrefix": "feat/",
     "git.branchProtection": [ "main" ],

src/bot.ts

@@ -56,17 +56,16 @@ async function init()
         console.log(`• Registered ${k.green(evts.length)} client ${autoPlural("event", evts)}`);
         printDbgItmList(evts.map(e => e.constructor.name ?? e.names.join("&")));
 
-        await registerCommands(cl);
-
         user.setPresence({
             status: "online",
             activities: [{ type: ActivityType.Watching, name: "ur mom" }],
         });
 
+        await Promise.all([ registerCommands(cl), doContestStuff(cl) ]);
+
         console.log(`• Active in ${k.green(guilds.cache.size)} guild${guilds.cache.size != 1 ? "s" : ""}`);
         printDbgItmList(guilds.cache.map(g => g.name), 4);
 
-        await doContestStuff(cl);
 
         clientReadyInitLava(cl);
 
@@ -186,7 +185,7 @@ async function registerCommands(client: Client)
  * Prints a styled list of items to the console
  * @param limit Max amount of items per line
  */
-function printDbgItmList(list: string[] | Stringifiable[], limit = 6)
+function printDbgItmList(list: string[] | Stringifiable[], limit = 10)
 {
     let msg = "";
 

src/commands/fun/Coinflip.ts

@@ -2,13 +2,15 @@ import { ApplicationCommandOptionType, CommandInteraction, EmbedBuilder } from "
 import { randRange } from "svcorelib";
 import { Command } from "@src/Command";
 import { settings } from "@src/settings";
-
-// idx 0: heads, idx 1: tails - TODO: make some sexy emoji for this specifically maybe?
-const coins = ["🇭","🇹"];
+import { autoPlural } from "@src/utils";
 
 export class Coinflip extends Command {
-    constructor()
-    {
+    readonly COINS = [
+        { name: "Heads", emoji: "🇭" },
+        { name: "Tails", emoji: "🇹" },
+    ];
+
+    constructor() {
         super({
             name: "coinflip",
             desc: "Flips one or multiple coins",
@@ -20,7 +22,6 @@ export class Coinflip extends Command {
                     desc: "How many coins to flip.",
                     type: ApplicationCommandOptionType.Integer,
                     min: 1,
-                    max: 50,
                 }
             ]
         });
@@ -31,16 +32,21 @@ export class Coinflip extends Command {
 
         let replyText = "";
 
-        if(amount > 1)
-        {
+        if(amount > 1) {
             const flips = [];
             for(let i = 0; i < amount; i++)
-                flips.push(coins[randRange(0, 1)]);
+                flips.push(randRange(0, 1));
 
-            replyText = `Flipped ${amount} coin${amount != 1 ? "s" : ""}. Result:\n\n${flips.join(" ")}`;
+            replyText = [
+                `Flipped ${amount} ${autoPlural("coin", amount)}. Result:`,
+                `> ${this.COINS[0].emoji} Heads: **${flips.filter(f => f === 0)}**`,
+                `> ${this.COINS[1].emoji} Tails: **${flips.filter(f => f === 1)}**`
+            ].join("\n");
+        }
+        else {
+            const coin = this.COINS[randRange(0, 1)];
+            replyText = `You flipped a coin.\nIt landed on **${coin.emoji} ${coin.name}**`;
         }
-        else
-            replyText = `You flipped a coin: ${coins[randRange(0, 1)]}`;
 
         const embed = new EmbedBuilder()
             .setColor(settings.embedColors.default)

src/commands/fun/Contest/Contest.ts

@@ -26,7 +26,7 @@ export class Contest extends Command
                 },
                 {
                     name: "current",
-                    desc: "Get the currently active contest in the server",
+                    desc: "Shows the currently active contest of the server",
                 },
                 {
                     name: "list",
@@ -55,7 +55,7 @@ export class Contest extends Command
                             required: true
                         }
                     ],
-                    perms: ["ADMINISTRATOR"]
+                    perms: ["MANAGE_CHANNELS"]
                 },
                 {
                     name: "set_role",
@@ -68,7 +68,7 @@ export class Contest extends Command
                             required: true,
                         }
                     ],
-                    perms: ["ADMINISTRATOR"]
+                    perms: ["MANAGE_ROLES"]
                 },
                 {
                     name: "submit",
@@ -94,13 +94,13 @@ export class Contest extends Command
                     args: [
                         {
                             name: "contest_id",
-                            desc: "ID of contest you want to vote on",
+                            desc: "The ID of the contest you want to submit your vote to",
                             type: ApplicationCommandOptionType.Number,
                             required: true,
                         },
                         {
                             name: "contestant",
-                            desc: "Contestant you want to vote for",
+                            desc: "The contestant you want to vote for",
                             type: ApplicationCommandOptionType.User,
                             required: true,
                         }
@@ -112,13 +112,13 @@ export class Contest extends Command
                     args: [
                         {
                             name: "contest_id",
-                            desc: "ID of contest you want to remove the vote from",
+                            desc: "The ID of the contest you want to remove your vote from",
                             type: ApplicationCommandOptionType.Number,
                             required: true,
                         },
                         {
                             name: "contestant",
-                            desc: "Contestant you want to remove the vote from",
+                            desc: "The contestant you want to remove the vote from",
                             type: ApplicationCommandOptionType.User,
                             required: true,
                         }
@@ -142,13 +142,13 @@ export class Contest extends Command
                     args: [
                         {
                             name: "contest_id",
-                            desc: "ID of contest you want your submissions removed from",
+                            desc: "The ID of the contest you want the submission removed from",
                             type: ApplicationCommandOptionType.Number,
                             required: true,
                         },
                         {
                             name: "user",
-                            desc: "User you want to delete the submission of",
+                            desc: "The contestant you want to delete the submission of",
                             type: ApplicationCommandOptionType.User,
                             required: true,
                         },
@@ -207,7 +207,7 @@ export class Contest extends Command
             return await this.editReply(int, embedify("There's no currently active contest"));
         }
 
-        const embedDesc = `${contest.description}\n\nuse \`/contest submit ${contest.id}\` to submit your entry\n\n24 hour voting period will start after the deadline`;
+        const embedDesc = `${contest.description}\n\nuse \`/contest submit contest_id:${contest.id}\` to submit your entry\n\n24 hour voting period will start after the deadline`;
 
         const embed = new EmbedBuilder()
             .setTitle(contest.name)
@@ -269,7 +269,7 @@ export class Contest extends Command
         const field1Name = didContestEnd ? "Started" : "Start";
         const field2Name = didContestEnd ? "Ended" : "End";
 
-        const embedDesc = didContestEnd ? contest.description : `${contest.description}\n\nuse \`/contest submit ${contest.id}\` to submit your entry\n\n24 hour voting period will start after the deadline`;
+        const embedDesc = didContestEnd ? contest.description : `${contest.description}\n\nuse \`/contest submit contest_id:${contest.id}\` to submit your entry\n\n24 hour voting period will start after the deadline`;
 
         const embed = new EmbedBuilder()
             .setTitle(contest.name)

src/commands/fun/Contest/functions.ts

@@ -41,7 +41,7 @@ function runStartingContestsJobs(cl: Client, starting: (StartingContest & { guil
     starting.forEach(contest => {
         const timeTillStart = contest.startDate.getTime() - new Date().getTime();
 
-        const description = `${contest.description}\n\n\n\nuse \`/contest submit ${contest.id}\` to submit your entry\n\n24 hour voting period will start after the deadline`;
+        const description = `${contest.description}\n\n\n\nuse \`/contest submit contest_id:${contest.id}\` to submit your entry\n\n24 hour voting period will start after the deadline`;
 
         const embed = new EmbedBuilder()
             .setAuthor({ name: "Contest Started!" })

src/commands/util/Reminder.ts

@@ -11,6 +11,8 @@ import { Tuple } from "@src/types";
 /** Max reminders per user (global) */
 const reminderLimit = 10;
 const reminderCheckInterval = 2000;
+/** To not exceed the embed limits */
+const maxNameLength = 250;
 
 export class Reminder extends Command
 {
@@ -98,7 +100,7 @@ export class Reminder extends Command
                         },
                         {
                             name: "expiry",
-                            desc: "UTC, 24 hours. Format: YYYY-MM-DD hh:mm:ss",
+                            desc: "UTC, 24 hours. Format: YYYY-MM-DD hh:mm:ss (or) YYYY-MM-DD hh:mm",
                             type: ApplicationCommandOptionType.String,
                             required: true,
                         },
@@ -121,7 +123,7 @@ export class Reminder extends Command
                         },
                         {
                             name: "expiry",
-                            desc: "UTC, 24 hours. Format: hh:mm:ss OR hh:mm",
+                            desc: "UTC, 24 hours. Format: hh:mm:ss (or) hh:mm",
                             type: ApplicationCommandOptionType.String,
                             required: true,
                         },
@@ -178,6 +180,9 @@ export class Reminder extends Command
             const tooSoon = () => this.reply(int, embedify("Please enter an expiry that's at least five seconds from now.", settings.embedColors.error), true);
 
             const setNewReminder = async (name: string, dueTimestamp: Date, ephemeral: boolean) => {
+                if(name.length > maxNameLength)
+                    return this.reply(int, embedify(`Please enter a name that's not longer than ${maxNameLength} characters`, settings.embedColors.error));
+
                 await this.deferReply(int, ephemeral);
 
                 const reminders = await getReminders(user.id);
@@ -202,7 +207,7 @@ export class Reminder extends Command
                     private: guild?.id ? ephemeral : true,
                 });
 
-                return await this.editReply(int, embedify(`I've set a reminder with the name \`${name}\` (ID \`${reminderId}\`)\nDue: ${time(toUnix10(dueTimestamp), "f")}\n\nTo list your reminders, use \`/reminder list\``, settings.embedColors.success));
+                return await this.editReply(int, embedify(`I've set the following reminder:\n> ${name}\n> Due: ${time(toUnix10(dueTimestamp), "f")}\n\nID: \`${reminderId}\` • To list your reminders use \`/reminder list\``, settings.embedColors.success));
             };
 
             switch(opt.name)
@@ -243,15 +248,17 @@ export class Reminder extends Command
                     expiry = (int.options.get("expiry", true).value as string).trim(),
                     ephemeral = int.options.get("private")?.value as boolean ?? false;
 
-                const expiryRegex = /^(\d{4})[-/](\d{1,2})[-/](\d{1,2})[\s,]+(\d{1,2})[:](\d{1,2})[:](\d{1,2})$/;
+                const expiryRegex = /^(\d{4})[-/](\d{1,2})[-/](\d{1,2})[\s,]+(\d{1,2})[:](\d{1,2})([:](\d{1,2}))?$/;
 
                 if(!expiry.match(expiryRegex))
-                    return this.reply(int, embedify("Please enter the expiry date and time in the following format (24 hours, UTC):\n`YYYY-MM-DD hh:mm:ss`", settings.embedColors.error), true);
+                    return this.reply(int, embedify("Please enter the expiry date and time in one of the following formats (24 hours, UTC):\n`YYYY-MM-DD hh:mm:ss` **or** `YYYY-MM-DD hh:mm`", settings.embedColors.error), true);
 
                 // match() above makes sure this exec() can't return null
                 const [, ...timeComponents] = expiryRegex.exec(expiry) as unknown as Tuple<string, 7>;
 
-                const [year, month, day, hour, minute, second] = timeComponents.slice(0, 6).map(c => Number(c));
+                const [year, month, day, hour, minute, second] = timeComponents
+                    .slice(0, 6)
+                    .map(c => !c ? 0 : (c.includes(":") ? Number(c.substring(1)) : Number(c)));
 
                 const dueTimestamp = Date.UTC(year, month - 1, day, hour, minute, second);
 
@@ -272,7 +279,7 @@ export class Reminder extends Command
                 const expiryRegex = /^(\d{1,2})[:](\d{1,2})([:](\d{1,2}))?$/;
 
                 if(!expiry.match(expiryRegex))
-                    return this.reply(int, embedify("Please enter the expiry time in one of the following formats (24 hours, UTC):\n`hh:mm:ss` or `hh:mm`", settings.embedColors.error), true);
+                    return this.reply(int, embedify("Please enter the expiry time in one of the following formats (24 hours, UTC):\n`hh:mm:ss` **or** `hh:mm`", settings.embedColors.error), true);
 
                 // match() above makes sure this exec() can't return null
                 const [, ...timeComponents] = expiryRegex.exec(expiry) as unknown as Tuple<string, 7>;
@@ -302,25 +309,23 @@ export class Reminder extends Command
                 if(!reminders || reminders.length === 0)
                     return await this.editReply(int, embedify("You don't have any active reminders.\nCreate a new one with `/reminder set`", settings.embedColors.error));
 
-                const getReminderStr = (reminders: ReminderObj[]) => reminders.reduce((acc, cur, i) => acc + `> \`${cur.reminderId}\` : ${cur.name}\n> ${time(toUnix10(cur.dueTimestamp), "f")}${i !== reminders.length - 1 ? "\n\n" : ""}`, "");
-                const getReminderEbd = (remStr: string, curPage?: number, maxPage?: number) =>
-                {
+                const iconURL = user.avatarURL({ extension: "png", size: 512 }) ?? undefined;
+
+                const getReminderStr = (reminders: ReminderObj[]) => reminders.reduce((acc, cur, i) =>
+                    acc + `> ${cur.name.replace(/\n/gm, "\n> ")}\n> ID: \`${cur.reminderId}\` • ${time(toUnix10(cur.dueTimestamp), "f")}${i !== reminders.length - 1 ? "\n\n" : ""}`
+                , "");
+                const getReminderEbd = (remStr: string, curPage?: number, maxPage?: number) => {
                     const ebd = new EmbedBuilder()
                         .setTitle("Your reminders:")
                         .setDescription(remStr + "\n\nTo delete a reminder, use `/reminder delete`")
-                        .setAuthor({
-                            name: user.username,
-                            iconURL: avatar ?? undefined,
-                        })
+                        .setAuthor({ name: user.username, iconURL })
                         .setColor(settings.embedColors.default);
 
                     curPage && maxPage && ebd.setFooter({ text: `Page ${curPage}/${maxPage}` });
 
                     return ebd;
                 };
 
-                const avatar = user.avatarURL({ extension: "png", size: 512 });
-
                 const remStr = getReminderStr(reminders);
 
                 const remindersPerPage = 8;
@@ -459,11 +464,13 @@ export class Reminder extends Command
 
         const promises: Promise<void>[] = [];
 
+        // TODO: add buttons to reinstate the reminder and add more time to it
+        // e.g.: [+5m] [+10m] [+1h] [+3h] [+12h]
         const getExpiredEbd = ({ name }: ReminderObj) => new EmbedBuilder()
-            .setTitle("Reminder")
-            .setColor(settings.embedColors.default)
-            .setDescription(`The following reminder has expired:\n>>> ${name}`);
+            .setDescription(`Your reminder has expired:\n> ${name.replace(/\n/gm, "\n> ")}`)
+            .setColor(settings.embedColors.default);
 
+        // TODO: add logger
         const reminderError = (err: Error) => console.error(k.red("Error while checking expired reminders:\n"), err);
 
         /** Sends the expiry reminder in the guild and channel it was created in, but only if it is not private */
@@ -478,7 +485,7 @@ export class Reminder extends Command
                 if(chan && [ChannelType.GuildText, ChannelType.GuildPublicThread, ChannelType.GuildPrivateThread, ChannelType.GuildForum].includes(chan.type))
                 {
                     const c = chan as TextBasedChannel;
-                    c.send({ content: `<@${rem.userId}>`, embeds: [ getExpiredEbd(rem) ] });
+                    c.send({ content: `Reminder! <@${rem.userId}>`, embeds: [ getExpiredEbd(rem) ] });
                 }
             }
             catch(err) {