[WIP] /poll command

.env.template

@@ -10,6 +10,7 @@ SPOTIFY_CLIENT_ID=123123123 # https://developer.spotify.com/dashboard/
 SPOTIFY_CLIENT_SECRET=123123123
 
 # Settings
+COMMAND_PREFIX=""     # Set to something like an abbreviation of the client's name so all commands have that prefix and can be distinguished better - empty for none
 DEV_IDS="123,456"     # All user IDs that should have dev perms
 BELL_ON_READY=false   # Set to true to send a console bell sound when the client is ready
 EXEC_CMD_ENABLED=true # Set to false to disable the /exec command

.github/workflows/node.yml

@@ -22,14 +22,14 @@ jobs:
     - name: Install node-canvas dependencies
       run: |
         sudo apt update
-        sudo apt install build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev
-      if: matrix.node-version == '18.x'
+        sudo apt install -y build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev
 
     - name: Install npm dependencies
       run: |
-        npm install -g tsc
-        npm install
+        npm i -g tsc
+        npm ci
 
-    - run: npm run lint
+    - name: Run ESLint
+      run: npm run lint
 
 

.vscode/settings.json

@@ -44,9 +44,7 @@
         "editor.defaultFormatter": "vscode.json-language-features",
     },
     "files.exclude": {
-        "**/.env": true,
         "out/**": true,
-        "node_modules/": true
     },
     "git.branchPrefix": "feat/",
     "git.branchProtection": [ "main" ],

package.json

@@ -20,7 +20,7 @@
     "type": "git",
     "url": "git+https://github.com/codedrunks/BrewBot.git"
   },
-  "license": "UNLICENSED",
+  "license": "AGPL-3.0",
   "bugs": {
     "url": "https://github.com/codedrunks/BrewBot/issues"
   },
@@ -58,7 +58,7 @@
     "redis": "^4.2.0",
     "simple-statistics": "^7.7.5",
     "steamapi": "^2.2.0",
-    "svcorelib": "^1.16.0",
+    "svcorelib": "^1.18.1",
     "yargs": "^17.5.1"
   },
   "bin": {

prisma/schema.prisma

@@ -37,6 +37,7 @@ model Reminder {
   dueTimestamp DateTime
   guild        String?
   channel      String?
+  private      Boolean  @default(false)
   User         User     @relation(fields: [userId], references: [id], onDelete: Cascade)
 
   @@id([reminderId, userId])
@@ -82,6 +83,7 @@ model Guild {
   premium       Boolean?       @default(false)
   lastLogColor  String?
   contests      Contest[]
+  polls         Poll[]
   GuildSettings GuildSettings?
 }
 
@@ -97,6 +99,22 @@ model GuildSettings {
   Guild            Guild    @relation(fields: [guildId], references: [id], onDelete: Cascade)
 }
 
+model Poll {
+  pollId       Int
+  guildId      String
+  channel      String
+  messages     String[]
+  createdBy    String
+  headline     String?
+  topic        String?
+  voteOptions  String[]
+  votesPerUser Int
+  dueTimestamp DateTime
+  Guild        Guild    @relation(fields: [guildId], references: [id])
+
+  @@id([pollId, guildId])
+}
+
 //#MARKER contest
 model Contest {
   id          Int
@@ -136,8 +154,8 @@ model SubmissionVote {
 model TwentyFortyEightLeaderboardEntry {
   guildId  String
   userId   String
-  score    Int @default(0)
-  gamesWon Int @default(0)
+  score    Int    @default(0)
+  gamesWon Int    @default(0)
   member   Member @relation(fields: [guildId, userId], references: [guildId, userId])
 
   @@id([guildId, userId])

src/Command.ts

@@ -46,7 +46,7 @@ export abstract class Command
             this.meta = { ...fallbackMeta, ...cmdMeta };
             const { name, desc, args } = this.meta;
 
-            data.setName(name)
+            data.setName(this.getFullCmdName(name))
                 .setDescription(desc);
 
             Array.isArray(args) && args.forEach(arg => {
@@ -96,7 +96,7 @@ export abstract class Command
                         opt.setName(arg.name)
                             .setDescription(arg.desc)
                             .setRequired(arg.required ?? false)
-                            .addChannelTypes(ChannelType.GuildText, ChannelType.GuildNews, ChannelType.GuildPublicThread)
+                            .addChannelTypes(ChannelType.GuildText, ChannelType.GuildNews, ChannelType.GuildPublicThread, ChannelType.GuildPrivateThread, ChannelType.GuildVoice)
                     );
                 else if(arg.type === ApplicationCommandOptionType.Role)
                     data.addRoleOption(opt =>
@@ -121,15 +121,15 @@ export abstract class Command
                         return opt;
                     });
                 else
-                    throw new Error("Unimplemented option type");
+                    throw new Error(`Unimplemented argument type in /${cmdMeta.name}`);
             });
         }
         else
         {
             // subcommands
             this.meta = { ...fallbackMeta, ...cmdMeta };
 
-            data.setName(cmdMeta.name)
+            data.setName(this.getFullCmdName(cmdMeta.name))
                 .setDescription(cmdMeta.desc);
 
             cmdMeta.subcommands.forEach(scmd => {
@@ -187,7 +187,7 @@ export abstract class Command
                                 opt.setName(arg.name)
                                     .setDescription(arg.desc)
                                     .setRequired(arg.required ?? false)
-                                    .addChannelTypes(ChannelType.GuildText, ChannelType.GuildNews, ChannelType.GuildPublicThread)
+                                    .addChannelTypes(ChannelType.GuildText, ChannelType.GuildNews, ChannelType.GuildPublicThread, ChannelType.GuildPrivateThread, ChannelType.GuildVoice)
                             );
                         else if(arg.type === ApplicationCommandOptionType.Role)
                             sc.addRoleOption(opt =>
@@ -212,7 +212,7 @@ export abstract class Command
                                 return opt;
                             });
                         else
-                            throw new Error("Unimplemented option");
+                            throw new Error(`Unimplemented argument type in /${cmdMeta.name} ${scmd.name}`);
                     });
 
                     return sc;
@@ -226,6 +226,12 @@ export abstract class Command
 
     //#SECTION public
 
+    /** Returns the full name of the given command name, including optional prefix */
+    public getFullCmdName(cmdName: string)
+    {
+        return `${settings.client.commandPrefix ?? ""}${cmdName}`;
+    }
+
     /** Called when a user tries to run this command (if the user doesn't have perms this resolves null) */
     public async tryRun(int: CommandInteraction, opt?: CommandInteractionOption<"cached">): Promise<unknown>
     {

src/bot.ts

@@ -153,7 +153,7 @@ async function registerCommands(client: Client)
 
                 const opts = options.data && options.data.length > 0 ? options.data : undefined;
 
-                const cmd = cmds.find(({ meta }) => meta.name === commandName);
+                const cmd = cmds.find((cmd) => cmd.getFullCmdName(cmd.meta.name) === commandName);
 
                 if(!cmd || !cmd.enabled)
                     return;

src/commands/economy/Job.ts

@@ -3,7 +3,7 @@ import { Command } from "@src/Command";
 import { getTotalWorks } from "@database/economy";
 import { settings } from "@src/settings";
 import { embedify } from "@utils/embedify";
-import { Levels, totalWorksToLevel, baseAward } from "@commands/economy/Jobs";
+import { jobLevels, totalWorksToLevel, baseAward } from "@src/commands/economy/jobs";
 
 export class Job extends Command {
     constructor() {
@@ -26,7 +26,7 @@ export class Job extends Command {
         if(!totalworks || totalworks == 0) return this.reply(int, embedify("We have no job records for you, ya bum! Consider doing something using `/work`"), true);
 
         const jobidx = totalWorksToLevel(totalworks);
-        const job = Levels[jobidx as keyof typeof Levels];
+        const job = jobLevels[jobidx as keyof typeof jobLevels];
 
         const { name, multiplier } = job;
 

src/commands/economy/Work.ts

@@ -3,7 +3,7 @@ import { Command } from "@src/Command";
 import { embedify, formatSeconds, nowInSeconds } from "@utils/index";
 import { addCoins, getLastWork, getTotalWorks, incrementTotalWorks, setLastWork } from "@database/economy";
 import { createNewMember, getMember } from "@database/users";
-import { Levels, totalWorksToLevel, baseAward } from "@commands/economy/Jobs";
+import { jobLevels, totalWorksToLevel, baseAward } from "@src/commands/economy/jobs";
 import { randomItem } from "svcorelib";
 
 const secs4hours = 14400;
@@ -41,7 +41,7 @@ export class Work extends Command {
             await setLastWork(userid, guildid);
 
             const jobidx = totalWorksToLevel(totalworks);
-            const job = Levels[jobidx as keyof typeof Levels];
+            const job = jobLevels[jobidx as keyof typeof jobLevels];
 
             const payout = Math.round(job.multiplier * baseAward);
 
@@ -60,7 +60,7 @@ export class Work extends Command {
             await setLastWork(userid, guildid);
 
             const jobidx = totalWorksToLevel(totalworks);
-            const job = Levels[jobidx as keyof typeof Levels];
+            const job = jobLevels[jobidx as keyof typeof jobLevels];
 
             const payout = Math.round(job.multiplier * baseAward);
 

src/commands/economy/jobs/index.ts

@@ -0,0 +1 @@
+export * from "./jobs";