Merge pull request 'add flytrials' (#4) from staging into master

Reviewed-on: #4
Reviewed-by: fiveman1 <fiveman1@noreply@itzana.me>

commands/submissions.js

@@ -1,15 +1,13 @@
 const { SlashCommandBuilder } = require('@discordjs/builders');
 const { MessageAttachment } = require("discord.js");
 const fs = require('node:fs');
+const { submissions, commands } = require("../config/config.js");
 
 async function execute(interaction) {
     const game = interaction.options.getString("game");
 
-    let fname;
+    const fname = submissions[game];
-    if (game === "bhop") fname = "files/bhop_submissions.csv";
+    if (fname === undefined) {
-    else if (game === "surf") fname = "files/surf_submissions.csv";
-    else if (game === "deathrun") fname = "files/deathrun_submissions.csv";
-    else {
         await interaction.reply({content: "Invalid game specified!", ephemeral: true});
         return;
     }
@@ -33,7 +31,7 @@ module.exports = {
             option.setName("game")
             .setDescription("Select the maptest game")
             .setRequired(true)
-            .addChoices({name: "bhop", value: "bhop"}, {name: "surf", value: "surf"}, {name: "deathrun", value: "deathrun"}))
+            .addChoices(commands))
         ,
 	execute
 };

commands/submit.js

@@ -3,6 +3,7 @@ const { parse } = require("csv-parse/sync");
 const fs = require('node:fs');
 const noblox = require("noblox.js");
 const axios = require("axios").default;
+const { submissions, commands } = require("../config/config.js");
 
 async function robloxUserFromDiscord(id) {
     if (isNaN(id)) return undefined;
@@ -33,11 +34,8 @@ async function execute(interaction) {
     }
     const game = interaction.options.getString("game");
 
-    let fname;
+    const fname = submissions[game];
-    if (game === "bhop") fname = "files/bhop_submissions.csv";
+    if (fname === undefined) {
-    else if (game === "surf") fname = "files/surf_submissions.csv";
-    else if (game === "deathrun") fname = "files/deathrun_submissions.csv";
-    else {
         await interaction.reply({content: "Invalid game specified!", ephemeral: true});
         return;
     }
@@ -97,7 +95,7 @@ module.exports = {
             option.setName("game")
             .setDescription("Select the maptest game")
             .setRequired(true)
-            .addChoices({name: "bhop", value: "bhop"}, {name: "surf", value: "surf"}, {name: "deathrun", value: "deathrun"}))
+            .addChoices(commands))
         .addIntegerOption(option =>
             option.setName("asset_id")
             .setDescription("The asset ID of the model")

commands/take.js

@@ -1,14 +1,11 @@
 const { SlashCommandBuilder } = require('@discordjs/builders');
 const noblox = require("noblox.js");
-const { bhopCookie, surfCookie, deathrunCookie } = require("../config/config.json");
+const { cookies, commands } = require("../config/config.js");
 
 async function execute(interaction) {
     const game = interaction.options.getString("game");
-    let cookie;
+    const cookie = cookies[game];
-    if (game === "bhop") cookie = bhopCookie;
+    if (cookie === undefined) {
-    else if (game === "surf") cookie = surfCookie;
-    else if (game === "deathrun") cookie = deathrunCookie;
-    else {
         await interaction.reply({content: "Invalid game specified!", ephemeral: true});
         return;
     }
@@ -59,7 +56,7 @@ module.exports = {
             option.setName("game")
             .setDescription("Select the maptest game")
             .setRequired(true)
-            .addChoices({name: "bhop", value: "bhop"}, {name: "surf", value: "surf"}, {name: "deathrun", value: "deathrun"}))
+            .addChoices(commands))
         .addIntegerOption(option =>
             option.setName("asset_id")
             .setDescription("The asset ID of the model")

config/.gitignore

@@ -1,3 +1,4 @@
 *
+!config.js
 !example_config.json
 !.gitignore

config/config.js

@@ -0,0 +1,14 @@
+const { bhopCookie, surfCookie, deathrunCookie, flytrialsCookie } = require("config.json");
+const cookies = {
+    bhop: bhopCookie,
+    surf: surfCookie,
+    deathrun: deathrunCookie,
+    flytrials: flytrialsCookie,
+};
+const submissions = {};
+const commands = [];
+for (const game in cookies) {
+    submissions[game] = "files/" + game + "_submissions.csv";
+    commands.push({name: game, value: game});
+}
+export { cookies, submissions, commands };

config/example_config.json

@@ -3,5 +3,6 @@
     "clientId": "",
     "bhopCookie": "",
     "surfCookie": "",
-    "deathrunCookie": ""
+    "deathrunCookie": "",
+    "flytrialsCookie": ""
 }