updated package info

.eslintrc.json

@@ -1,55 +0,0 @@
-{
-    "root": true,
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": { "project": ["./tsconfig.json"] },
-    "plugins": [
-        "@typescript-eslint"
-    ],
-    "rules": {
-        "@typescript-eslint/strict-boolean-expressions": [
-            2,
-            {
-                "allowString" : false,
-                "allowNumber" : false
-            }
-        ],
-        /* important */
-        "prefer-const": "error",
-        "quotes": ["error", "single"],
-
-        "block-scoped-var": "error",
-        "camelcase": "error",
-        "consistent-this": ["error", "that"],
-        "no-else-return": "error",
-        "no-eq-null": "error",
-        "no-floating-decimal": "error",
-        "no-implicit-coercion": "error",
-        "no-implied-eval": "error",
-        "no-invalid-this": "error",
-        "require-await": "error",
-        "yoda": "error",
-
-        "semi": ["error", "always"],
-        "semi-style": ["error", "last"],
-
-        /* less important */
-        "no-unreachable-loop": "error",
-        "no-unused-private-class-members": "error",
-        "no-use-before-define": "error",
-        "no-unmodified-loop-condition": "error",
-        "no-duplicate-imports": "error",
-        "no-promise-executor-return": "error",
-        "no-self-compare": "error",
-        "no-constructor-return": "error",
-        "no-template-curly-in-string": "error",
-        "array-callback-return": "error",
-        "no-eval": "error",
-        "no-extend-native": "error",
-        "no-extra-bind": "error"
-    },
-    "ignorePatterns": ["src/**/*.test.ts", "src/frontend/generated/*"]
-}

.gitignore

@@ -1,6 +1,4 @@
-.DS_Store
-.vscode
-log
 node_modules
-queues.json
+token
-token.txt
+.DS_Store
+log

README.md

@@ -1,10 +1,8 @@
 <!-- markdownlint-disable MD033 -->
 
-# 1800queue
+# 1800queue alt
 
-## Invite info
+This version does not run continuously, and requires each tourney to be started with a command
-
-needs: create commands/send messages
 
 ## Prerequirements
 

dist/api.js

@@ -23,7 +23,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPlayerInteraction = exports.getPlayer = void 0;
-/*eslint prefer-const: "error"*/
 const cheerio = __importStar(require("cheerio"));
 const discord_js_1 = require("discord.js");
 const https_1 = __importDefault(require("https"));
@@ -74,25 +73,25 @@ function getHTML(name) {
  * @throws errorMessage class if the request fails
  */
 function readHTML(html) {
-    const $ = cheerio.load(html), foundData = {
+    let $ = cheerio.load(html);
-        name: '',
+    let metaElems = $('meta').toArray(), foundData = {
-        id: '',
+        name: "",
-        avatar: '',
+        id: "",
-        level: '',
+        avatar: "",
-        rank: '',
+        level: "",
+        rank: "",
         elo: null,
         class: null,
-        battles: '',
+        battles: "",
-        wins: '',
+        wins: "",
-        winrate: ''
+        winrate: ""
     };
-    let metaElems = $('meta').toArray();
     //filter down to just ones named "og:..."
     metaElems = metaElems.filter(el => el.attribs.property?.startsWith('og:'));
     metaElems.forEach(el => {
-        const attr = el.attribs;
+        let attr = el.attribs;
         if (attr.property === 'og:title') {
-            const data = uniteApiRegex.ogtitle.exec(attr.content);
+            let data = uniteApiRegex.ogtitle.exec(attr.content);
             if (data !== null && data.length >= 3) {
                 foundData.name = data[1];
                 foundData.id = data[2];
@@ -100,15 +99,14 @@ function readHTML(html) {
         }
         else if (attr.property === 'og:description') {
             //all lines
-            let lines = attr.content.split('\n').map(l => l.trim());
+            let lines = attr.content.split('\n').map(l => l.trim()), extraLines = [];
-            const extraLines = [];
             //ensure first line is correct
-            while ((lines.length > 0) && !/pok.mon unite/i.test(lines[0])) {
+            while (lines.length && !/pok.mon unite/i.test(lines[0])) {
-                const line = lines.shift();
+                let line = lines.shift();
-                if (line !== undefined)
+                if (line)
                     extraLines.push(line);
             }
-            if (lines.length === 0)
+            if (!lines.length)
                 throw (0, util_1.emsg)('Unable to read data, please try again');
             //bring the first lines removed back into the data
             lines = [
@@ -118,9 +116,10 @@ function readHTML(html) {
             //first line
             {
                 //will be only text after "pokemon unite:"
-                const line = lines[0].split(':').slice(1).join(':').trim(), regex = uniteApiRegex.ogdescription;
+                let line = lines[0].split(':').slice(1).join(':').trim();
+                let regex = uniteApiRegex.ogdescription;
                 if (regex[0].test(line)) { //is master/has elo
-                    const regexData = line.match(regex[0]);
+                    let regexData = line.match(regex[0]);
                     if (!regexData || regexData.length < 4)
                         throw (0, util_1.emsg)('Unable to read data, please try again');
                     foundData.level = regexData[1];
@@ -128,7 +127,7 @@ function readHTML(html) {
                     foundData.elo = regexData[3];
                 }
                 else { //is not master/has a class
-                    const regexData = line.match(regex[1]);
+                    let regexData = line.match(regex[1]);
                     if (!regexData || regexData.length < 4)
                         throw (0, util_1.emsg)('Unable to read data, please try again');
                     foundData.level = regexData[1];
@@ -139,7 +138,7 @@ function readHTML(html) {
             lines.shift();
             //rest of lines
             lines.forEach(line => {
-                const split = line.split(':').map(l => l.trim()), key = split[0].toLowerCase().replace(/[^\w]/g, ''), value = split[1];
+                let split = line.split(':').map(l => l.trim()), key = split[0].toLowerCase().replace(/[^\w]/g, ''), value = split[1];
                 switch (key) {
                     case 'battles':
                         foundData.battles = value;
@@ -154,8 +153,7 @@ function readHTML(html) {
             });
         }
     });
-    const imgSrc = $('.player-card-image img').attr('src');
+    foundData.avatar = $('.player-card-image img').attr('src') || "";
-    foundData.avatar = imgSrc !== undefined ? imgSrc : '';
     foundData.avatar = foundData.avatar.replace('../', 'https://uniteapi.dev/');
     return foundData;
 }
@@ -165,7 +163,7 @@ function readHTML(html) {
  * @returns boolean, valid or invalid
  */
 function verifyData(data) {
-    if (data.id.length > 0)
+    if (data.id.length)
         return true;
     return false;
 }
@@ -175,25 +173,21 @@ function verifyData(data) {
  * @returns player data
  */
 async function getPlayer(name) {
-    const html = await getHTML(name), data = readHTML(html);
+    let html = await getHTML(name);
+    let data = readHTML(html);
     if (verifyData(data))
         return data;
     return null;
 }
 exports.getPlayer = getPlayer;
 async function sendPlayerEmbed(interaction, data) {
-    let eloStr;
+    let embed = new discord_js_1.MessageEmbed()
-    if (data.elo !== null)
-        eloStr = `(${data.elo})`;
-    else
-        eloStr = `Class ${data.class}`;
-    const embed = new discord_js_1.MessageEmbed()
         .setTitle(`${data.name} (${data.id})`)
         .setURL(`https://uniteapi.dev/p/${encodeURIComponent(data.name)}`)
         .setTimestamp()
         .setThumbnail(data.avatar)
         .setDescription(`Level ${data.level}
-${data.rank} ${eloStr}
+${data.rank} ${data.elo ? `(${data.elo})` : `Class ${data.class}`}
 
 **Battles** ${data.battles}
 **Wins** ${data.wins}
@@ -206,11 +200,11 @@ ${data.rank} ${eloStr}
  * @throws errorMessage class if the user cannot be found
  */
 async function getPlayerInteraction(interaction) {
-    const username = interaction.options.getString('username', true);
+    let username = interaction.options.getString('username', true);
     await interaction.deferReply();
-    const data = await getPlayer(username);
+    let data = await getPlayer(username);
     if (data === null)
-        throw (0, util_1.emsg)('api.noUser');
+        throw (0, util_1.emsg)('Unable to find user');
     else
         sendPlayerEmbed(interaction, data);
 }

dist/discord.js

@@ -1,32 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerCommands = void 0;
-/* eslint-disable camelcase */
 const rest_1 = require("@discordjs/rest");
 const v9_1 = require("discord-api-types/v9");
 // list of commands to register with discord
 const commands = [
     {
-        name: 'open',
+        name: 'queue',
-        description: 'open a queue for this channel',
+        description: 'create a queue',
         options: [
             {
                 type: 4,
                 name: 'teamsize',
                 description: 'size of each team',
-                min_value: 1,
+                required: true,
-                required: true
+                min_value: 1
             }
         ]
     },
-    {
-        name: 'close',
-        description: 'close the queue for this channel'
-    },
-    {
-        name: 'queue',
-        description: 'view queue info'
-    },
     {
         name: 'join',
         description: 'join the active queue'
@@ -35,6 +26,14 @@ const commands = [
         name: 'leave',
         description: 'leave the active queue'
     },
+    {
+        name: 'ready',
+        description: 'ready the queue and display team info'
+    },
+    {
+        name: 'cancel',
+        description: 'cancels the current queue (must have the Manage Messages permission)'
+    },
     {
         name: 'player',
         description: 'display player information',
@@ -48,7 +47,6 @@ const commands = [
         ]
     }
 ];
-/*commandNames = commands.map(c => c.name);*/
 /**
  * register/reload commands on guild(s)
  * @param token discord bot token
@@ -62,6 +60,7 @@ async function registerCommands(token, clientId, guildIds) {
     for (let i = 0; i < guildIds.length; i++) {
         try {
             await rest.put(v9_1.Routes.applicationGuildCommands(clientId, guildIds[i]), { body: commands });
+            console.log(`[${guildIds[i]}] registered command`);
         }
         catch (error) {
             console.error(error);

dist/index.js

@@ -23,57 +23,39 @@ const discord_js_1 = require("discord.js");
 const fs = __importStar(require("fs"));
 const api_1 = require("./api");
 const discord_1 = require("./discord");
-const Lang = __importStar(require("./lang"));
 const queue_1 = require("./queue");
 const util_1 = require("./util");
 const CLIENT = new discord_js_1.Client({ intents: [discord_js_1.Intents.FLAGS.GUILDS] });
 //init logs with a timestamp
 console.log(new Date().toISOString() + '\n\n');
 //get token
-if (!fs.existsSync('./token.txt')) {
+if (!fs.existsSync('./token')) {
-    fs.writeFileSync('./token.txt', '');
+    fs.writeFileSync('./token', '');
-    console.error(Lang.get('error.main.missingToken'));
+    console.error('Missing Discord Token, please enter the bot token into the token file');
     process.exit(1);
 }
-const TOKEN = fs.readFileSync('./token.txt').toString();
+const TOKEN = fs.readFileSync('./token').toString();
 //discord connections
 CLIENT.on('ready', client => {
-    console.log(Lang.get('main.login', {
+    console.log(`Logged in as ${client.user.tag}`);
-        user: client.user.tag
-    }));
     client.guilds.fetch().then(guilds => (0, discord_1.registerCommands)(TOKEN, client.user.id, guilds.map(g => g.id)));
-    (0, queue_1.discordInit)(client);
-});
-CLIENT.on('guildCreate', guild => {
-    if (guild.client.user)
-        (0, discord_1.registerCommands)(TOKEN, guild.client.user.id, guild.id);
 });
 CLIENT.on('interactionCreate', async (interaction) => {
     if (!interaction.isCommand())
         return;
     try {
-        switch (interaction.commandName) {
+        if (interaction.commandName === 'queue')
-            //mod commands
+            await (0, queue_1.createQueue)(interaction);
-            case 'open':
+        else if (interaction.commandName === 'join')
-                await queue_1.QueueCommands.open(interaction);
+            await (0, queue_1.joinQueue)(interaction);
-                break;
+        else if (interaction.commandName === 'leave')
-            case 'close':
+            await (0, queue_1.leaveQueue)(interaction);
-                await queue_1.QueueCommands.close(interaction);
+        else if (interaction.commandName === 'ready')
-                break;
+            await (0, queue_1.readyQueue)(interaction);
-            //general commands
+        else if (interaction.commandName === 'cancel')
-            case 'queue':
+            await (0, queue_1.cancelQueue)(interaction);
-                await queue_1.QueueCommands.queue(interaction);
+        else if (interaction.commandName === 'player')
-                break;
+            await (0, api_1.getPlayerInteraction)(interaction);
-            case 'join':
-                await queue_1.QueueCommands.join(interaction);
-                break;
-            case 'leave':
-                await queue_1.QueueCommands.leave(interaction);
-                break;
-            case 'player':
-                await (0, api_1.getPlayerInteraction)(interaction);
-                break;
-        }
     }
     catch (e) {
         if (e instanceof util_1.errorMessage) {

dist/lang.js

@@ -1,76 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.get = exports.setLang = void 0;
-const LANG = {
-    en: {
-        main: {
-            login: 'Logged in as {user}'
-        },
-        discord: {
-            botRestart: 'The bot has just restarted, anybody previously in the queue has been reset',
-            create: 'A queue for teams of {teamsize} has been created',
-            close: 'Queue has been closed',
-            join: 'Joined the queue',
-            leave: 'Left the queue'
-        },
-        error: {
-            main: {
-                missingToken: 'Missing Discord Token, please enter the bot token into the token file'
-            },
-            discord: {
-                noQueue: 'There is not an active queue in this channel, type `/open` to create one',
-                noChannel: 'Unable to find channel {channelId} for teams of {teamsize}',
-                noCreate: 'There is already an active queue in this channel for teams of {teamsize}',
-                inQueue: 'You are already in the queue',
-                notInQueue: 'You aren\'t in the queue',
-                notMod: 'Member is not a moderator'
-            },
-            general: {
-                noMember: 'Unable to retrieve guild member information, please try again',
-                noChannel: 'Unable to retrieve text channel information, please try again'
-            },
-            api: {
-                noUser: 'Unable to find user'
-            }
-        }
-    }
-};
-let LANGID = 'en';
-if (!(LANGID in LANG))
-    throw 'language id does not exist';
-function setLang(langid) {
-    if (langid in LANG)
-        LANGID = langid;
-    else
-        throw 'language id does not exist';
-}
-exports.setLang = setLang;
-function template(str, args) {
-    return str.replace(/{\w+}/g, str => {
-        const key = str.substring(1, str.length - 1);
-        if (key in args)
-            return args[key];
-        return key;
-    });
-}
-/**
- * reads language json
- * @param id ex: discord.error.noActiveQueue
- * @returns language value, defaults to `id` parameter
- */
-function get(id, args = {}) {
-    const keySpl = id.split('.').map(k => k.trim()).filter(k => k);
-    let finding = LANG[LANGID];
-    for (const key of keySpl) {
-        if (key in finding) {
-            const found = finding[key];
-            if (typeof found === 'string')
-                return template(found, args);
-            finding = found;
-        }
-        else
-            break;
-    }
-    return id;
-}
-exports.get = get;

dist/queue.js

@@ -1,101 +1,10 @@
 "use strict";
-/* TODO
-
-join message should contain your current position in the queue, editing it to keep it current
-*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueueCommands = exports.queueContains = exports.discordInit = exports.queueRemove = exports.queueCreate = void 0;
+exports.cancelQueue = exports.readyQueue = exports.leaveQueue = exports.joinQueue = exports.createQueue = exports.queueContains = exports.getAll = exports.getInfo = void 0;
 const discord_js_1 = require("discord.js");
-const fs = __importStar(require("fs"));
 const util_1 = require("./util");
-const Lang = __importStar(require("./lang"));
+//maps ChannelID to QueueInfo
-//load queues from file
+const QUEUE = new Map();
-if (!fs.existsSync('./queues.json'))
-    fs.writeFileSync('./queues.json', '{}');
-const _QUEUE = fs.readFileSync('./queues.json').toString(), QUEUE = new Map();
-try {
-    const queueJson = JSON.parse(_QUEUE);
-    for (const channelId in queueJson) {
-        const { teamsize } = queueJson[channelId];
-        if (teamsize !== 0)
-            QUEUE.set(channelId, { teamsize, players: [] });
-    }
-}
-catch (e) {
-    //do nothing
-}
-function SaveQueue() {
-    const queueJson = Object.fromEntries(QUEUE), queueFileJson = {};
-    for (const channelId of QUEUE.keys())
-        queueFileJson[channelId] = { teamsize: queueJson[channelId].teamsize };
-    fs.writeFileSync('./queues.json', JSON.stringify(queueFileJson, null, 2));
-}
-async function checkQueue(channel) {
-    const info = QUEUE.get(channel.id);
-    if (!info)
-        return;
-    if (info.players.length >= info.teamsize) {
-        const team = info.players.splice(0, info.teamsize).map(m => m.toString());
-        //TODO add embeds to lang.ts
-        const embed = new discord_js_1.MessageEmbed()
-            .setTitle('Team')
-            .setDescription(team.join('\n'));
-        await channel.send({ embeds: [embed] });
-    }
-}
-function queueCreate(channelId, teamsize) {
-    if (!QUEUE.has(channelId)) {
-        QUEUE.set(channelId, { teamsize, players: [] });
-        SaveQueue();
-    }
-}
-exports.queueCreate = queueCreate;
-function queueRemove(channelId) {
-    if (QUEUE.has(channelId)) {
-        QUEUE.delete(channelId);
-        SaveQueue();
-    }
-}
-exports.queueRemove = queueRemove;
-SaveQueue();
-async function discordInit(client) {
-    for (const channelId of QUEUE.keys()) {
-        const info = QUEUE.get(channelId), channel = await client.channels.fetch(channelId);
-        if (!info) { //no idea what could cause this but TS complains
-            queueRemove(channelId);
-            continue;
-        }
-        if (!channel || !(channel instanceof discord_js_1.TextChannel)) {
-            console.error(Lang.get('error.discord.noChannel'), {
-                channelId,
-                teamsize: info.teamsize
-            });
-            queueRemove(channelId);
-            continue;
-        }
-        channel.send(Lang.get('discord.botRestart'));
-    }
-}
-exports.discordInit = discordInit;
 /**
  * get the queueInfo of an interaction
  * @param interaction
@@ -103,11 +12,12 @@ exports.discordInit = discordInit;
  * @returns queue info
  */
 function getInfo(interaction) {
-    const info = QUEUE.get(interaction.channelId);
+    let info = QUEUE.get(interaction.channelId);
     if (!info)
-        throw (0, util_1.emsg)('discord.noQueue');
+        throw (0, util_1.emsg)('There is not an active queue in this channel, type `/queue` to create one');
     return info;
 }
+exports.getInfo = getInfo;
 /**
  * compiles all the get functions above
  * @param interaction
@@ -119,91 +29,161 @@ const getAll = (interaction) => ({
     channel: (0, util_1.getChannel)(interaction),
     info: getInfo(interaction)
 });
+exports.getAll = getAll;
 /**
  * checks if the interaction data is already in the queue
  * @param interaction
  * @returns boolean
  */
 function queueContains(interaction) {
-    const { member, info } = getAll(interaction);
+    let { member, info } = (0, exports.getAll)(interaction);
     if (info.players.map(m => m.id).includes(member.id))
         return true;
     return false;
 }
 exports.queueContains = queueContains;
 /**
- * opens a queue
+ * creates the timeout for the queue
  * @param interaction
- * @throws errorMessage class if it cannot be left
+ * @returns time timeout identifier
  */
-function open(interaction) {
+function setQueueTimeout(interaction) {
-    (0, util_1.memberIsModThrow)(interaction);
+    let channel = (0, util_1.getChannel)(interaction);
-    const { channelId } = interaction, teamsize = interaction.options.getInteger('teamsize', true);
+    return setTimeout(() => {
-    const existing = QUEUE.get(channelId);
+        clearQueue(interaction);
-    if (existing)
+        channel.send('Queue has been reset due to inactivity');
-        throw (0, util_1.emsg)(Lang.get('error.discord.noCreate', {
+    }, 5 * 60 * 1000); //5 minutes
-            teamsize: existing.teamsize.toString()
-        }));
-    queueCreate(channelId, teamsize);
-    interaction.reply(Lang.get('discord.create', {
-        teamsize: teamsize.toString()
-    }));
 }
 /**
- * closes a queue
+ * updates the rich embed for the current queue
+ * @param interaction
+ */
+async function sendQueueEmbed(interaction, closed = false) {
+    let info = getInfo(interaction), origInteraction = info.initiator.interaction;
+    let embed = new discord_js_1.MessageEmbed()
+        .setTitle('Queue')
+        .setAuthor({
+        name: info.initiator.member.displayName,
+        iconURL: info.initiator.member.displayAvatarURL({ dynamic: true })
+    })
+        .addField('Team Size', info.teamsize.toString(), true)
+        .addField('Players Joined', info.players.length.toString(), true)
+        .setFooter({ text: closed ? 'queue is finished' : 'type /join' });
+    if (origInteraction.deferred || origInteraction.replied)
+        await origInteraction.editReply({ embeds: [embed] });
+    else
+        await origInteraction.reply({ embeds: [embed] });
+}
+/**
+ * sends the list of teams
+ * @param interaction
+ */
+async function sendTeamsEmbed(interaction, teams) {
+    let embed = new discord_js_1.MessageEmbed()
+        .setTitle('Teams');
+    teams.forEach((team, i) => {
+        team.map(m => m.user.tag);
+        embed.addField(`Title ${i + 1}`, team.join('\n'));
+    });
+    interaction.reply({ embeds: [embed] });
+}
+/**
+ * sends the list of teams
+ * @param interaction
+ */
+async function clearQueue(interaction) {
+    let info = getInfo(interaction);
+    sendQueueEmbed(interaction, true);
+    clearTimeout(info.timeout);
+    QUEUE.delete(interaction.channelId);
+}
+/**
+ * creates a queue from an interaction
+ * @param interaction
+ * @throws errorMessage class if it cannot be created
+ */
+async function createQueue(interaction) {
+    let member = (0, util_1.getMember)(interaction), { channelId } = interaction, teamsize = interaction.options.getInteger('teamsize', true);
+    if (QUEUE.has(channelId))
+        throw (0, util_1.emsg)('There is already an active queue in this channel, ' + (queueContains(interaction) ? 'and you are already in it' : 'type `/join` to join'));
+    QUEUE.set(channelId, {
+        players: [
+            member
+        ],
+        initiator: {
+            interaction,
+            member
+        },
+        teamsize: teamsize,
+        timeout: setQueueTimeout(interaction)
+    });
+    sendQueueEmbed(interaction);
+}
+exports.createQueue = createQueue;
+/**
+ * joins a queue from an interaction
  * @param interaction
  * @throws errorMessage class if it cannot be joined
  */
-async function close(interaction) {
+async function joinQueue(interaction) {
-    (0, util_1.memberIsModThrow)(interaction);
+    let { member, info } = (0, exports.getAll)(interaction);
-    QUEUE.delete(interaction.channelId);
+    if (queueContains(interaction))
-    await interaction.reply(Lang.get('discord.close'));
+        throw (0, util_1.emsg)('You are already in the active queue');
+    info.players.push(member);
+    clearTimeout(info.timeout);
+    info.timeout = setQueueTimeout(interaction);
+    QUEUE.set(interaction.channelId, info);
+    sendQueueEmbed(interaction);
+    await interaction.reply('Joined the queue');
 }
+exports.joinQueue = joinQueue;
 /**
- * gives info about the queue
+ * leaves a queue from an interaction
  * @param interaction
  * @throws errorMessage class if it cannot be left
  */
-async function queue(interaction) {
+async function leaveQueue(interaction) {
-    const info = getInfo(interaction);
+    let { member, info } = (0, exports.getAll)(interaction);
-    const embed = new discord_js_1.MessageEmbed()
+    if (!queueContains(interaction))
-        .setTitle('Active Queue')
+        throw (0, util_1.emsg)('You aren\'t in the active queue');
-        .addField('Team Size', info.teamsize.toString(), true)
+    info.players.splice(info.players.indexOf(member), 1);
-        .addField('Players Joined', info.players.length.toString(), true)
+    clearTimeout(info.timeout);
-        .setFooter({ text: 'type /join' }); //TODO
+    info.timeout = setQueueTimeout(interaction);
-    await interaction.reply({ embeds: [embed], ephemeral: true });
+    QUEUE.set(interaction.channelId, info);
+    sendQueueEmbed(interaction);
+    await interaction.reply('Left the queue');
 }
+exports.leaveQueue = leaveQueue;
 /**
- * joins a queue
+ * readys a queue from an interaction
  * @param interaction
  * @throws errorMessage class if it cannot be readied
  */
-async function join(interaction) {
+async function readyQueue(interaction) {
-    const { member, info, channel } = getAll(interaction);
+    let { member, info } = (0, exports.getAll)(interaction), { initiator } = info;
-    if (queueContains(interaction))
+    if (member.id !== initiator.member.id)
-        throw (0, util_1.emsg)('discord.inQueue');
+        throw (0, util_1.emsg)('Only the queue initiator can ready the queue');
-    info.players.push(member);
+    clearQueue(interaction);
-    QUEUE.set(interaction.channelId, info);
+    if (info.players.filter(m => m.id !== initiator.member.id).length === 0)
-    await interaction.reply(Lang.get('discord.join'));
+        throw (0, util_1.emsg)('Nobody signed up for the queue, the queue has been reset');
-    checkQueue(channel);
+    //team data
+    let playerlist = (0, util_1.shuffle)(info.players), teams = [];
+    //fill team data
+    for (let i = 0; i < playerlist.length; i += info.teamsize)
+        teams.push(playerlist.slice(i, i + info.teamsize));
+    sendTeamsEmbed(interaction, teams);
 }
+exports.readyQueue = readyQueue;
 /**
- * leaves a queue
+ * readys a queue from an interaction
  * @param interaction
  * @throws errorMessage class if it cannot be reset
  */
-async function leave(interaction) {
+async function cancelQueue(interaction) {
-    const { member, info } = getAll(interaction);
+    let { info, member, channel } = (0, exports.getAll)(interaction);
-    if (!queueContains(interaction))
+    if (!member.permissionsIn(channel).has('MANAGE_MESSAGES'))
-        throw (0, util_1.emsg)('discord.notInQueue');
+        throw (0, util_1.emsg)('You do not have permission to run this command');
-    info.players.splice(info.players.indexOf(member), 1);
+    clearQueue(interaction);
-    QUEUE.set(interaction.channelId, info);
+    await interaction.reply('Queue has been reset');
-    await interaction.reply(Lang.get('discord.leave'));
 }
-exports.QueueCommands = {
+exports.cancelQueue = cancelQueue;
-    open,
-    close,
-    queue,
-    join,
-    leave
-};

dist/queueCommands.js

@@ -1 +0,0 @@
-"use strict";

dist/util.js

@@ -1,34 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.memberIsModThrow = exports.memberIsMod = exports.getChannel = exports.getMember = exports.emsg = exports.errorMessage = exports.shuffle = void 0;
+exports.getChannel = exports.getMember = exports.emsg = exports.errorMessage = exports.shuffle = void 0;
 const discord_js_1 = require("discord.js");
-const Lang = __importStar(require("./lang"));
 /**
  * shuffles an array
  * https://stackoverflow.com/a/2450976/2856416
  * @param array an array
  * @returns an array but shuffled
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function shuffle(array) {
     let currentIndex = array.length, randomIndex;
     // While there remain elements to shuffle...
@@ -57,7 +36,7 @@ exports.errorMessage = errorMessage;
  * @param ephemeral (default=true)
  * @returns new errorMessage
  */
-const emsg = (msg, ephemeral = true) => new errorMessage(Lang.get(`error.${msg}`), ephemeral);
+const emsg = (msg, ephemeral = true) => new errorMessage(msg, ephemeral);
 exports.emsg = emsg;
 /**
  * get the GuildMember of an interaction
@@ -66,9 +45,9 @@ exports.emsg = emsg;
  * @returns member
  */
 function getMember(interaction) {
-    const member = interaction.member;
+    let member = interaction.member;
     if (!(member instanceof discord_js_1.GuildMember))
-        throw (0, exports.emsg)('general.noMember');
+        throw (0, exports.emsg)('Unable to retrieve guild member information, please try again');
     return member;
 }
 exports.getMember = getMember;
@@ -79,19 +58,9 @@ exports.getMember = getMember;
  * @returns member
  */
 function getChannel(interaction) {
-    const channel = interaction.channel;
+    let channel = interaction.channel;
     if (!(channel instanceof discord_js_1.TextChannel))
-        throw (0, exports.emsg)('general.noChannel');
+        throw (0, exports.emsg)('Unable to retrieve text channel information, please try again');
     return channel;
 }
 exports.getChannel = getChannel;
-function memberIsMod(interaction) {
-    const member = getMember(interaction);
-    return member.permissionsIn(interaction.channelId).has('MANAGE_MESSAGES');
-}
-exports.memberIsMod = memberIsMod;
-function memberIsModThrow(interaction) {
-    if (!memberIsMod(interaction))
-        throw (0, exports.emsg)('discord.notMod');
-}
-exports.memberIsModThrow = memberIsModThrow;

package.json

@@ -1,5 +1,5 @@
 {
-    "name": "1800queue",
+    "name": "1800queue-alt",
     "version": "1.0.0",
     "description": "",
     "main": "dist/index.js",
@@ -30,9 +30,7 @@
     "author": "",
     "license": "MIT",
     "devDependencies": {
-        "@types/node": "^17.0.17",
+        "@types/node": "^17.0.13",
-        "@typescript-eslint/eslint-plugin": "^5.11.0",
-        "discord-api-types": "^0.26.1",
         "npm-watch": "^0.11.0",
         "ts-node": "^10.4.0",
         "typescript": "^4.5.5"
@@ -40,6 +38,7 @@
     "dependencies": {
         "@discordjs/rest": "^0.3.0",
         "cheerio": "^1.0.0-rc.10",
+        "discord-api-types": "^0.26.1",
         "discord.js": "^13.6.0"
     }
 }

scripts/mac-linux/install

@@ -8,11 +8,11 @@ cd ../..
 npm install
 
 #discord token
-[ ! -f "token.txt" ] && touch "token.txt"
+[ ! -f "token" ] && touch "token"
 
-if [ ! -s "token.txt" ]
+if [ ! -s "token" ]
 then
     printf "Enter your discord bot token: "
     read token
-    printf $token > "token.txt"
+    printf $token > "token"
 fi

scripts/windows/install.bat

@@ -4,12 +4,12 @@
 cd %~f0\..\..\..\
 
 @REM discord token
-if not exist "token.txt" copy NUL "token.txt"
+if not exist "token" copy NUL "token"
 
-for /f %%i in ("token.txt") do set size=%%~zi
+for /f %%i in ("token") do set size=%%~zi
 if %size% equ 0 (
     set /p token="Enter your discord bot token: "
-    echo | set /p=%id% > "token.txt"
+    echo | set /p=%id% > "token"
 )
 
 @REM run

src/api.ts

@@ -1,4 +1,3 @@
-/*eslint prefer-const: "error"*/
 import * as cheerio from 'cheerio';
 import { CommandInteraction, MessageEmbed } from 'discord.js';
 import { IncomingMessage } from 'http';
@@ -13,7 +12,7 @@ const uniteApiRegex = {
         /lv\.(\d+) (\w+) \((\d+)\)/i,   //master
         /lv\.(\d+) (\w+): class (\d+)/i //other
     ]
-};
+}
 
 type uniteApiData = {
     name: string,
@@ -77,30 +76,30 @@ function getHTML(name: string): Promise<string> {
  * @throws errorMessage class if the request fails
  */
 function readHTML(html: string): uniteApiData {
-    const $ = cheerio.load(html),
+    let $ = cheerio.load(html)
+    let metaElems = $('meta').toArray(),
         foundData: uniteApiData = {
-            name: '',
+            name: "",
-            id: '',
+            id: "",
-            avatar: '',
+            avatar: "",
 
-            level: '',
+            level: "",
-            rank: '',
+            rank: "",
             elo: null,
             class: null,
-            battles: '',
+            battles: "",
-            wins: '',
+            wins: "",
-            winrate: ''
+            winrate: ""
         };
-    let metaElems = $('meta').toArray();
     
     //filter down to just ones named "og:..."
     metaElems = metaElems.filter(el => el.attribs.property?.startsWith('og:'));
 
     metaElems.forEach(el => {
-        const attr = el.attribs;
+        let attr = el.attribs;
 
         if (attr.property === 'og:title') {
-            const data = uniteApiRegex.ogtitle.exec(attr.content);
+            let data = uniteApiRegex.ogtitle.exec(attr.content);
             if (data !== null && data.length >= 3) {
                 foundData.name = data[1];
                 foundData.id = data[2];
@@ -108,17 +107,17 @@ function readHTML(html: string): uniteApiData {
         } else if (attr.property === 'og:description') {
 
             //all lines
-            let lines = attr.content.split('\n').map(l => l.trim());
+            let lines = attr.content.split('\n').map(l => l.trim()),
-            const extraLines: string[] = [];
+                extraLines: string[] = [];
 
             //ensure first line is correct
-            while ((lines.length > 0) && !/pok.mon unite/i.test(lines[0])) {
+            while (lines.length && !/pok.mon unite/i.test(lines[0])) {
-                const line = lines.shift();
+                let line = lines.shift();
-                if (line !== undefined)
+                if (line)
                     extraLines.push(line);
             }
 
-            if (lines.length === 0)
+            if (!lines.length)
                 throw emsg('Unable to read data, please try again');
             
             //bring the first lines removed back into the data
@@ -130,12 +129,13 @@ function readHTML(html: string): uniteApiData {
             //first line
             {
                 //will be only text after "pokemon unite:"
-                const line = lines[0].split(':').slice(1).join(':').trim(),
+                let line = lines[0].split(':').slice(1).join(':').trim();
-                    regex = uniteApiRegex.ogdescription;
+                
+                let regex = uniteApiRegex.ogdescription;
 
                 if (regex[0].test(line)) { //is master/has elo
 
-                    const regexData = line.match(regex[0]);
+                    let regexData = line.match(regex[0]);
 
                     if (!regexData || regexData.length < 4)
                         throw emsg('Unable to read data, please try again');
@@ -146,7 +146,7 @@ function readHTML(html: string): uniteApiData {
 
                 } else { //is not master/has a class
 
-                    const regexData = line.match(regex[1]);
+                    let regexData = line.match(regex[1]);
 
                     if (!regexData || regexData.length < 4)
                         throw emsg('Unable to read data, please try again');
@@ -164,7 +164,7 @@ function readHTML(html: string): uniteApiData {
             //rest of lines
             lines.forEach(line => {
 
-                const split = line.split(':').map(l => l.trim()),
+                let split = line.split(':').map(l => l.trim()),
                     key = split[0].toLowerCase().replace(/[^\w]/g, ''),
                     value = split[1];
 
@@ -186,9 +186,7 @@ function readHTML(html: string): uniteApiData {
 
     });
 
-    const imgSrc = $('.player-card-image img').attr('src');
+    foundData.avatar = $('.player-card-image img').attr('src') || "";
-
-    foundData.avatar = imgSrc !== undefined ? imgSrc : '';
     foundData.avatar = foundData.avatar.replace('../', 'https://uniteapi.dev/');
 
     return foundData;
@@ -201,7 +199,7 @@ function readHTML(html: string): uniteApiData {
  * @returns boolean, valid or invalid
  */
 function verifyData(data: uniteApiData): boolean {
-    if (data.id.length > 0)
+    if (data.id.length)
         return true;
     return false;
 }
@@ -212,8 +210,8 @@ function verifyData(data: uniteApiData): boolean {
  * @returns player data
  */
 export async function getPlayer(name: string): Promise<uniteApiData|null> {
-    const html = await getHTML(name),
+    let html = await getHTML(name);
-        data = readHTML(html);
+    let data = readHTML(html);
     if (verifyData(data))
         return data;
     return null;
@@ -221,19 +219,13 @@ export async function getPlayer(name: string): Promise<uniteApiData|null> {
 
 async function sendPlayerEmbed(interaction: CommandInteraction, data: uniteApiData) {
 
-    let eloStr: string;
+    let embed = new MessageEmbed()
-    if (data.elo !== null)
-        eloStr = `(${data.elo})`;
-    else
-        eloStr = `Class ${data.class}`;
-
-    const embed = new MessageEmbed()
         .setTitle(`${data.name} (${data.id})`)
         .setURL(`https://uniteapi.dev/p/${encodeURIComponent(data.name)}`)
         .setTimestamp()
         .setThumbnail(data.avatar)
         .setDescription(`Level ${data.level}
-${data.rank} ${eloStr}
+${data.rank} ${data.elo ? `(${data.elo})` : `Class ${data.class}`}
 
 **Battles** ${data.battles}
 **Wins** ${data.wins}
@@ -248,12 +240,12 @@ ${data.rank} ${eloStr}
  * @throws errorMessage class if the user cannot be found
  */
 export async function getPlayerInteraction(interaction: CommandInteraction) {
-    const username = interaction.options.getString('username', true);
+    let username = interaction.options.getString('username', true);
     await interaction.deferReply();
     
-    const data = await getPlayer(username);
+    let data = await getPlayer(username);
     if (data === null)
-        throw emsg('api.noUser');
+        throw emsg('Unable to find user');
     else
         sendPlayerEmbed(interaction, data);
 }

src/discord.ts

@@ -1,31 +1,21 @@
-/* eslint-disable camelcase */
 import { REST } from '@discordjs/rest';
 import { Routes } from 'discord-api-types/v9';
 
 // list of commands to register with discord
 const commands = [
     {
-        name: 'open',
+        name: 'queue',
-        description: 'open a queue for this channel',
+        description: 'create a queue',
         options: [
             {
                 type: 4, //INTEGER
                 name: 'teamsize',
                 description: 'size of each team',
-                min_value: 1,
+                required: true,
-                required: true
+                min_value: 1
             }
         ]
     },
-    {
-        name: 'close',
-        description: 'close the queue for this channel'
-    },
-    
-    {
-        name: 'queue',
-        description: 'view queue info'
-    },
     {
         name: 'join',
         description: 'join the active queue'
@@ -34,6 +24,14 @@ const commands = [
         name: 'leave',
         description: 'leave the active queue'
     },
+    {
+        name: 'ready',
+        description: 'ready the queue and display team info'
+    },
+    {
+        name: 'cancel',
+        description: 'cancels the current queue (must have the Manage Messages permission)'
+    },
     {
         name: 'player',
         description: 'display player information',
@@ -46,8 +44,7 @@ const commands = [
             }
         ]
     }
-];
+]; 
-/*commandNames = commands.map(c => c.name);*/
 
 /**
  * register/reload commands on guild(s)
@@ -68,6 +65,7 @@ export async function registerCommands(token: string, clientId: string, guildIds
                 Routes.applicationGuildCommands(clientId, guildIds[i]),
                 { body: commands },
             );
+            console.log(`[${guildIds[i]}] registered command`);
         } catch (error) {
             console.error(error);
         }

src/index.ts

@@ -3,8 +3,7 @@ import { Client, Intents } from 'discord.js';
 import * as fs from 'fs';
 import { getPlayerInteraction } from './api';
 import { registerCommands } from './discord';
-import * as Lang from './lang';
+import { cancelQueue, createQueue, joinQueue, leaveQueue, readyQueue } from './queue';
-import { discordInit, QueueCommands } from './queue';
 import { errorMessage } from './util';
 const CLIENT = new Client({ intents: [Intents.FLAGS.GUILDS] });
 
@@ -12,26 +11,18 @@ const CLIENT = new Client({ intents: [Intents.FLAGS.GUILDS] });
 console.log(new Date().toISOString()+'\n\n');
 
 //get token
-if (!fs.existsSync('./token.txt')) {
+if (!fs.existsSync('./token')) {
-    fs.writeFileSync('./token.txt', '');
+    fs.writeFileSync('./token', '');
-    console.error(Lang.get('error.main.missingToken'));
+    console.error('Missing Discord Token, please enter the bot token into the token file');
     process.exit(1);
 }
-const TOKEN = fs.readFileSync('./token.txt').toString();
+const TOKEN = fs.readFileSync('./token').toString();
 
 //discord connections
 CLIENT.on('ready', client => {
-    console.log(Lang.get('main.login', {
+    console.log(`Logged in as ${client.user.tag}`);
-        user: client.user.tag
-    }));
     client.guilds.fetch().then(guilds =>
         registerCommands(TOKEN, client.user.id, guilds.map(g => g.id)));
-    discordInit(client);
-});
-
-CLIENT.on('guildCreate', guild => {
-    if (guild.client.user)
-        registerCommands(TOKEN, guild.client.user.id, guild.id);
 });
 
 CLIENT.on('interactionCreate', async interaction => {
@@ -39,31 +30,18 @@ CLIENT.on('interactionCreate', async interaction => {
 
     try {
 
-        switch (interaction.commandName) {
+        if (interaction.commandName === 'queue')
-
+            await createQueue(interaction);
-            //mod commands
+        else if (interaction.commandName === 'join')
-            case 'open':
+            await joinQueue(interaction);
-                await QueueCommands.open(interaction);
+        else if (interaction.commandName === 'leave')
-                break;
+            await leaveQueue(interaction);
-            case 'close':
+        else if (interaction.commandName === 'ready')
-                await QueueCommands.close(interaction);
+            await readyQueue(interaction);
-                break;
+        else if (interaction.commandName === 'cancel')
-
+            await cancelQueue(interaction);
-            //general commands
+        else if (interaction.commandName === 'player')
-            case 'queue':
+            await getPlayerInteraction(interaction);
-                await QueueCommands.queue(interaction);
-                break;
-            case 'join':
-                await QueueCommands.join(interaction);
-                break;
-            case 'leave':
-                await QueueCommands.leave(interaction);
-                break;
-            case 'player':
-                await getPlayerInteraction(interaction);
-                break;
-
-        }
 
     } catch (e) {
 

src/lang.ts

@@ -1,105 +0,0 @@
-type LangObj = { [keys:string]: LangObj | string }
-type LangObjWhole = { [langid:string]: LangObj }
-
-const LANG: LangObjWhole = {
-
-    en: {
-
-        main: {
-            login: 'Logged in as {user}'
-        },
-
-        discord: {
-            botRestart: 'The bot has just restarted, anybody previously in the queue has been reset',
-            create: 'A queue for teams of {teamsize} has been created',
-            close: 'Queue has been closed',
-            join: 'Joined the queue',
-            leave: 'Left the queue'
-        },
-
-        error: {
-
-            main: {
-                missingToken: 'Missing Discord Token, please enter the bot token into the token file'
-            },
-
-            discord: {
-                noQueue: 'There is not an active queue in this channel, type `/open` to create one',
-                noChannel: 'Unable to find channel {channelId} for teams of {teamsize}',
-                noCreate: 'There is already an active queue in this channel for teams of {teamsize}',
-                inQueue: 'You are already in the queue',
-                notInQueue: 'You aren\'t in the queue',
-                notMod: 'Member is not a moderator'
-            },
-
-            general: {
-                noMember: 'Unable to retrieve guild member information, please try again',
-                noChannel: 'Unable to retrieve text channel information, please try again'
-            },
-
-            api: {
-                noUser: 'Unable to find user'
-            }
-
-        }
-
-    }
-
-};
-
-
-let LANGID = 'en';
-if (!(LANGID in LANG))
-    throw 'language id does not exist';
-
-export function setLang(langid: string) {
-    if (langid in LANG)
-        LANGID = langid;
-    else
-        throw 'language id does not exist';
-}
-
-function template(str: string, args: {[keys: string]: string}): string {
-
-    return str.replace(/{\w+}/g, str => {
-
-        const key = str.substring(1, str.length-1);
-
-        if (key in args)
-            return args[key];
-
-        return key;
-
-    });
-
-}
-
-/**
- * reads language json
- * @param id ex: discord.error.noActiveQueue
- * @returns language value, defaults to `id` parameter
- */
-export function get(id: string, args: {[keys: string]: string} = {}): string {//discord.error.noActiveQueue
-    
-    const keySpl = id.split('.').map(k => k.trim()).filter(k => k);
-
-    let finding = LANG[LANGID];
-
-    for (const key of keySpl) {
-
-        if (key in finding) {
-
-            const found = finding[key];
-
-            if (typeof found === 'string')
-                return template(found, args);
-
-            finding = found;
-
-        } else
-            break;
-        
-    }
-
-    return id;
-}

src/queue.ts

@@ -1,110 +1,8 @@
-/* TODO
+import { CommandInteraction, GuildMember, MessageEmbed } from "discord.js";
+import { emsg, getChannel, getMember, queueInfo, shuffle } from "./util";
 
-join message should contain your current position in the queue, editing it to keep it current
+//maps ChannelID to QueueInfo
-*/
+const QUEUE = new Map<string, queueInfo>();
-
-import { Client, CommandInteraction, MessageEmbed, TextChannel } from 'discord.js';
-import * as fs from 'fs';
-import { emsg, getChannel, getMember, memberIsModThrow, queueInfo, queueInfoBase } from './util';
-import * as Lang from './lang';
-
-//load queues from file
-if (!fs.existsSync('./queues.json'))
-    fs.writeFileSync('./queues.json', '{}');
-
-const _QUEUE = fs.readFileSync('./queues.json').toString(),
-    QUEUE = new Map<string, queueInfo>();
-
-try {
-
-    const queueJson = JSON.parse(_QUEUE);
-
-    for (const channelId in queueJson) {
-        const {teamsize} = queueJson[channelId] as queueInfoBase;
-        if (teamsize !== 0)
-            QUEUE.set(channelId, { teamsize, players: [] });
-    }
-
-} catch(e) {
-    //do nothing
-}
-
-function SaveQueue() {
-
-    const queueJson = Object.fromEntries(QUEUE),
-        queueFileJson: {[keys: string]: queueInfoBase} = {};
-
-    for (const channelId of QUEUE.keys())
-        queueFileJson[channelId] = { teamsize: queueJson[channelId].teamsize };
-    
-    fs.writeFileSync('./queues.json', JSON.stringify(queueFileJson, null, 2));
-
-}
-
-async function checkQueue(channel: TextChannel) {
-    const info = QUEUE.get(channel.id);
-
-    if (!info)
-        return;
-    
-    if (info.players.length >= info.teamsize) {
-
-        const team = info.players.splice(0, info.teamsize).map(m => m.toString());
-
-        //TODO add embeds to lang.ts
-        const embed = new MessageEmbed()
-            .setTitle('Team')
-            .setDescription(team.join('\n'));
-
-        await channel.send({embeds: [embed]});
-
-    }
-
-}
-    
-
-export function queueCreate(channelId: string, teamsize: number) {
-    if (!QUEUE.has(channelId)) {
-        QUEUE.set(channelId, {teamsize, players: []});
-        SaveQueue();
-    }
-}
-
-export function queueRemove(channelId: string) {
-    if (QUEUE.has(channelId)) {
-        QUEUE.delete(channelId);
-        SaveQueue();
-    }
-}
-
-SaveQueue();
-
-export async function discordInit(client: Client) {
-
-    for (const channelId of QUEUE.keys()) {
-
-        const info = QUEUE.get(channelId),
-            channel = await client.channels.fetch(channelId);
-
-        if (!info) { //no idea what could cause this but TS complains
-            queueRemove(channelId);
-            continue;
-        }
-
-        if (!channel || !(channel instanceof TextChannel)) {
-            console.error(Lang.get('error.discord.noChannel'), {
-                channelId,
-                teamsize: info.teamsize
-            });
-            queueRemove(channelId);
-            continue;
-        }
-
-        channel.send(Lang.get('discord.botRestart'));
-
-    }
-        
-}
 
 /**
  * get the queueInfo of an interaction
@@ -112,11 +10,11 @@ export async function discordInit(client: Client) {
  * @throws errorMessage class if it does not exist
  * @returns queue info
  */
-function getInfo(interaction: CommandInteraction): queueInfo {
+export function getInfo(interaction: CommandInteraction): queueInfo {
-    const info = QUEUE.get(interaction.channelId);
+    let info = QUEUE.get(interaction.channelId);
 
     if (!info)
-        throw emsg('discord.noQueue');
+        throw emsg('There is not an active queue in this channel, type `/queue` to create one');
 
     return info;
 }
@@ -127,7 +25,7 @@ function getInfo(interaction: CommandInteraction): queueInfo {
  * @throws if another get function throws
  * @returns object containing each
  */
-const getAll = (interaction: CommandInteraction) => ({
+export const getAll = (interaction: CommandInteraction) => ({
         member: getMember(interaction),
         channel: getChannel(interaction),
         info: getInfo(interaction)
@@ -140,7 +38,7 @@ const getAll = (interaction: CommandInteraction) => ({
  */
 export function queueContains(interaction: CommandInteraction): boolean {
 
-    const {member, info} = getAll(interaction);
+    let {member, info} = getAll(interaction);
 
     if (info.players.map(m=>m.id).includes(member.id))
         return true;
@@ -150,110 +48,189 @@ export function queueContains(interaction: CommandInteraction): boolean {
 }
 
 /**
- * opens a queue
+ * creates the timeout for the queue
  * @param interaction 
- * @throws errorMessage class if it cannot be left
+ * @returns time timeout identifier
  */
-function open(interaction: CommandInteraction) {
+function setQueueTimeout(interaction: CommandInteraction) {
+    let channel = getChannel(interaction);
+    return setTimeout(() => {
+        clearQueue(interaction);
+        channel.send('Queue has been reset due to inactivity');
+    }, 5*60*1000) //5 minutes
+}
 
-    memberIsModThrow(interaction);
+/**
+ * updates the rich embed for the current queue
+ * @param interaction
+ */
+async function sendQueueEmbed(interaction: CommandInteraction, closed: boolean = false) {
+    let info = getInfo(interaction),
+        origInteraction = info.initiator.interaction;
+    
+    let embed = new MessageEmbed()
+        .setTitle('Queue')
+        .setAuthor({
+            name: info.initiator.member.displayName,
+            iconURL: info.initiator.member.displayAvatarURL({dynamic: true})
+        })
+        .addField('Team Size', info.teamsize.toString(), true)
+        .addField('Players Joined', info.players.length.toString(), true)
+        .setFooter({text: closed ? 'queue is finished' : 'type /join'});
 
-    const {channelId} = interaction,
+    if (origInteraction.deferred || origInteraction.replied)
+        await origInteraction.editReply({embeds: [embed]});
+    else
+        await origInteraction.reply({embeds: [embed]});
+}
+
+/**
+ * sends the list of teams
+ * @param interaction
+ */
+async function sendTeamsEmbed(interaction: CommandInteraction, teams: GuildMember[][]) {
+    let embed = new MessageEmbed()
+        .setTitle('Teams');
+
+    teams.forEach((team, i) => {
+        team.map(m => m.user.tag);
+        embed.addField(`Team ${i+1}`, team.join('\n'))
+    });
+
+    interaction.reply({embeds: [embed]});
+}
+
+/**
+ * sends the list of teams
+ * @param interaction
+ */
+async function clearQueue(interaction: CommandInteraction) {
+    let info = getInfo(interaction);
+    sendQueueEmbed(interaction, true);
+    clearTimeout(info.timeout);
+    QUEUE.delete(interaction.channelId);
+}
+
+/**
+ * creates a queue from an interaction
+ * @param interaction 
+ * @throws errorMessage class if it cannot be created
+ */
+export async function createQueue(interaction: CommandInteraction) {
+
+    let member = getMember(interaction),
+        {channelId} = interaction,
         teamsize = interaction.options.getInteger('teamsize', true);
 
-    const existing = QUEUE.get(channelId);
+    if (QUEUE.has(channelId))
-    if (existing)
+        throw emsg('There is already an active queue in this channel, ' + (queueContains(interaction) ? 'and you are already in it' : 'type `/join` to join'));
-        throw emsg(Lang.get('error.discord.noCreate', {
-            teamsize: existing.teamsize.toString()
-        }));
 
-    queueCreate(channelId, teamsize);
+    QUEUE.set(channelId, {
+        players: [
+            member
+        ],
+        initiator: {
+            interaction,
+            member
+        },
+        teamsize: teamsize,
+        timeout: setQueueTimeout(interaction)
+    });
 
-    interaction.reply(Lang.get('discord.create', {
+    sendQueueEmbed(interaction);
-        teamsize: teamsize.toString()
-    }));
 
 }
 
 /**
- * closes a queue
+ * joins a queue from an interaction
  * @param interaction 
  * @throws errorMessage class if it cannot be joined
  */
-async function close(interaction: CommandInteraction) {
+export async function joinQueue(interaction: CommandInteraction) {
-    memberIsModThrow(interaction);
 
-    QUEUE.delete(interaction.channelId);
+    let {member, info} = getAll(interaction);
 
-    await interaction.reply(Lang.get('discord.close'));
+    if (queueContains(interaction))
+        throw emsg('You are already in the active queue');
+
+    info.players.push(member);
+    clearTimeout(info.timeout);
+    info.timeout = setQueueTimeout(interaction)
+
+    QUEUE.set(interaction.channelId, info);
+
+    sendQueueEmbed(interaction);
+    await interaction.reply('Joined the queue');
 
 }
 
 /**
- * gives info about the queue
+ * leaves a queue from an interaction
  * @param interaction 
  * @throws errorMessage class if it cannot be left
  */
-async function queue(interaction: CommandInteraction) {
+export async function leaveQueue(interaction: CommandInteraction) {
 
-    const info = getInfo(interaction);
+    let {member, info} = getAll(interaction);
 
-    const embed = new MessageEmbed()
+    if (!queueContains(interaction))
-        .setTitle('Active Queue')
+        throw emsg('You aren\'t in the active queue');
-        .addField('Team Size', info.teamsize.toString(), true)
-        .addField('Players Joined', info.players.length.toString(), true)
-        .setFooter({text: 'type /join'}); //TODO
 
-    await interaction.reply({embeds: [embed], ephemeral: true});
+    info.players.splice(info.players.indexOf(member), 1);
+    clearTimeout(info.timeout);
+    info.timeout = setQueueTimeout(interaction)
+
+    QUEUE.set(interaction.channelId, info);
+
+    sendQueueEmbed(interaction);
+    await interaction.reply('Left the queue');
 
 }
 
 /**
- * joins a queue
+ * readys a queue from an interaction
  * @param interaction 
  * @throws errorMessage class if it cannot be readied
  */
-async function join(interaction: CommandInteraction) {
+export async function readyQueue(interaction: CommandInteraction) {
 
-    const {member, info, channel} = getAll(interaction);
+    let {member, info} = getAll(interaction),
+        {initiator} = info;
 
-    if (queueContains(interaction))
+    if (member.id !== initiator.member.id)
-        throw emsg('discord.inQueue');
+        throw emsg('Only the queue initiator can ready the queue');
 
-    info.players.push(member);
+    clearQueue(interaction);
 
-    QUEUE.set(interaction.channelId, info);
+    if (info.players.filter(m => m.id !== initiator.member.id).length === 0)
+        throw emsg('Nobody signed up for the queue, the queue has been reset');
 
-    await interaction.reply(Lang.get('discord.join'));
+    //team data
+    let playerlist: GuildMember[] = shuffle(info.players),
+        teams: GuildMember[][] = [];
 
-    checkQueue(channel);
+    //fill team data
+    for (let i = 0; i < playerlist.length; i+= info.teamsize)
+        teams.push(playerlist.slice(i, i+info.teamsize));
+
+    sendTeamsEmbed(interaction, teams);
 
 }
 
 /**
- * leaves a queue
+ * readys a queue from an interaction
  * @param interaction 
  * @throws errorMessage class if it cannot be reset
  */
-async function leave(interaction: CommandInteraction) {
+export async function cancelQueue(interaction: CommandInteraction) {
 
-    const {member, info} = getAll(interaction);
+    let {info, member, channel} = getAll(interaction);
 
-    if (!queueContains(interaction))
+    if (!member.permissionsIn(channel).has('MANAGE_MESSAGES'))
-        throw emsg('discord.notInQueue');
+        throw emsg('You do not have permission to run this command');
 
-    info.players.splice(info.players.indexOf(member), 1);
+    clearQueue(interaction);
 
-    QUEUE.set(interaction.channelId, info);
+    await interaction.reply('Queue has been reset');
 
-    await interaction.reply(Lang.get('discord.leave'));
-    
 }
-
-export const QueueCommands = {
-    open,
-    close,
-    queue,
-    join,
-    leave
-};

src/util.ts

@@ -1,5 +1,4 @@
-import { CommandInteraction, GuildMember, TextChannel } from 'discord.js';
+import { CommandInteraction, GuildMember, TextChannel } from "discord.js";
-import * as Lang from './lang';
 
 /**
  * shuffles an array
@@ -7,7 +6,6 @@ import * as Lang from './lang';
  * @param array an array
  * @returns an array but shuffled
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function shuffle(array: any[]) {
     let currentIndex = array.length,  randomIndex;
 
@@ -32,7 +30,7 @@ export class errorMessage {
     public msg: string;
     public ephemeral: boolean;
 
-    constructor(msg: string, ephemeral = true) {
+    constructor(msg: string, ephemeral: boolean = true) {
         this.msg = msg;
         this.ephemeral = ephemeral;
     }
@@ -44,15 +42,18 @@ export class errorMessage {
  * @param ephemeral (default=true)
  * @returns new errorMessage
  */
-export const emsg = (msg: string, ephemeral = true) => new errorMessage(Lang.get(`error.${msg}`), ephemeral);
+export const emsg = (msg: string, ephemeral: boolean = true) => new errorMessage(msg, ephemeral);
 
 
 
-export interface queueInfoBase {
+export type queueInfo = {
-    teamsize: number
+    players: GuildMember[],
-}
+    initiator: {
-export interface queueInfo extends queueInfoBase{
+        interaction: CommandInteraction,
-    players: GuildMember[]
+        member: GuildMember
+    },
+    teamsize: number,
+    timeout: NodeJS.Timeout
 }
 
 /**
@@ -62,10 +63,10 @@ export interface queueInfo extends queueInfoBase{
  * @returns member
  */
 export function getMember(interaction: CommandInteraction): GuildMember {
-    const member = interaction.member;
+    let member = interaction.member;
 
     if (!(member instanceof GuildMember))
-        throw emsg('general.noMember');
+        throw emsg('Unable to retrieve guild member information, please try again');
 
     return member;
 }
@@ -77,21 +78,10 @@ export function getMember(interaction: CommandInteraction): GuildMember {
  * @returns member
  */
 export function getChannel(interaction: CommandInteraction): TextChannel {
-    const channel = interaction.channel;
+    let channel = interaction.channel;
 
     if (!(channel instanceof TextChannel))
-        throw emsg('general.noChannel');
+        throw emsg('Unable to retrieve text channel information, please try again');
 
     return channel;
-}
+}
-
-
-export function memberIsMod(interaction: CommandInteraction): boolean {
-    const member = getMember(interaction);
-    return member.permissionsIn(interaction.channelId).has('MANAGE_MESSAGES');
-}
-
-export function memberIsModThrow(interaction: CommandInteraction) {
-    if (!memberIsMod(interaction))
-        throw emsg('discord.notMod');
-}

tsconfig.json

@@ -6,10 +6,7 @@
     "outDir": "./dist",
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
-    "skipLibCheck": true,
     "strict": true,
-    "noImplicitReturns": true,
+    "skipLibCheck": true
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
   }
 }