updated lang strings

.gitignore

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

README.md

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

dist/api.js

@@ -204,7 +204,7 @@ async function getPlayerInteraction(interaction) {
     await interaction.deferReply();
     let data = await getPlayer(username);
     if (data === null)
-        throw (0, util_1.emsg)('Unable to find user');
+        throw (0, util_1.emsg)('api.noUser');
     else
         sendPlayerEmbed(interaction, data);
 }

dist/discord.js

@@ -6,18 +6,26 @@ const v9_1 = require("discord-api-types/v9");
 // list of commands to register with discord
 const commands = [
     {
-        name: 'queue',
-        description: 'create a queue',
+        name: 'open',
+        description: 'open a queue for this channel',
         options: [
             {
                 type: 4,
                 name: 'teamsize',
                 description: 'size of each team',
-                required: true,
-                min_value: 1
+                min_value: 1,
+                required: true
             }
         ]
     },
+    {
+        name: 'close',
+        description: 'close the queue for this channel'
+    },
+    {
+        name: 'queue',
+        description: 'view queue info'
+    },
     {
         name: 'join',
         description: 'join the active queue'
@@ -26,14 +34,6 @@ 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,7 +46,7 @@ const commands = [
             }
         ]
     }
-];
+], commandNames = commands.map(c => c.name);
 /**
  * register/reload commands on guild(s)
  * @param token discord bot token
@@ -60,7 +60,6 @@ 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,39 +23,57 @@ const discord_js_1 = require("discord.js");
 const fs = __importStar(require("fs"));
 const api_1 = require("./api");
 const discord_1 = require("./discord");
+const lang_1 = 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')) {
-    fs.writeFileSync('./token', '');
-    console.error('Missing Discord Token, please enter the bot token into the token file');
+if (!fs.existsSync('./token.txt')) {
+    fs.writeFileSync('./token.txt', '');
+    console.error(lang_1.Lang.get('error.main.missingToken'));
     process.exit(1);
 }
-const TOKEN = fs.readFileSync('./token').toString();
+const TOKEN = fs.readFileSync('./token.txt').toString();
 //discord connections
 CLIENT.on('ready', client => {
-    console.log(`Logged in as ${client.user.tag}`);
+    console.log(lang_1.Lang.get('main.login', {
+        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 {
-        if (interaction.commandName === 'queue')
-            await (0, queue_1.createQueue)(interaction);
-        else if (interaction.commandName === 'join')
-            await (0, queue_1.joinQueue)(interaction);
-        else if (interaction.commandName === 'leave')
-            await (0, queue_1.leaveQueue)(interaction);
-        else if (interaction.commandName === 'ready')
-            await (0, queue_1.readyQueue)(interaction);
-        else if (interaction.commandName === 'cancel')
-            await (0, queue_1.cancelQueue)(interaction);
-        else if (interaction.commandName === 'player')
+        switch (interaction.commandName) {
+            //mod commands
+            case 'open':
+                await queue_1.QueueCommands.open(interaction);
+                break;
+            case 'close':
+                await queue_1.QueueCommands.close(interaction);
+                break;
+            //general commands
+            case 'queue':
+                await queue_1.QueueCommands.queue(interaction);
+                break;
+            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

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Lang = 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'
+            }
+        }
+    }
+};
+var Lang;
+(function (Lang) {
+    var 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';
+    }
+    Lang.setLang = setLang;
+    /**
+     * reads language json
+     * @param id ex: discord.error.noActiveQueue
+     * @returns language value, defaults to `id` parameter
+     */
+    function get(id, args = {}) {
+        let keySpl = id.split('.').map(k => k.trim()).filter(k => k);
+        let finding = LANG[LANGID];
+        for (let key of keySpl) {
+            if (key in finding) {
+                let found = finding[key];
+                if (typeof found === 'string')
+                    return found;
+                finding = found;
+            }
+            else
+                break;
+        }
+        return id;
+    }
+    Lang.get = get;
+})(Lang = exports.Lang || (exports.Lang = {}));

dist/queue.js

@@ -1,189 +1,232 @@
 "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.cancelQueue = exports.readyQueue = exports.leaveQueue = exports.joinQueue = exports.createQueue = exports.queueContains = exports.getAll = exports.getInfo = void 0;
+exports.QueueCommands = exports.discordInit = void 0;
 const discord_js_1 = require("discord.js");
+const fs = __importStar(require("fs"));
 const util_1 = require("./util");
-//maps ChannelID to QueueInfo
-const QUEUE = new Map();
-/**
+const lang_1 = require("./lang");
+//load queues from file
+if (!fs.existsSync('./queues.json'))
+    fs.writeFileSync('./queues.json', '{}');
+const _QUEUE = fs.readFileSync('./queues.json').toString(), QUEUE = new Map();
+try {
+    let queueJson = JSON.parse(_QUEUE);
+    for (let channelId in queueJson) {
+        let { teamsize } = queueJson[channelId];
+        if (teamsize)
+            QUEUE.set(channelId, { teamsize, players: [] });
+    }
+}
+catch (e) { }
+function SaveQueue() {
+    let queueJson = Object.fromEntries(QUEUE), queueFileJson = {};
+    for (let channelId of QUEUE.keys())
+        queueFileJson[channelId] = { teamsize: queueJson[channelId].teamsize };
+    fs.writeFileSync('./queues.json', JSON.stringify(queueFileJson, null, 2));
+}
+async function checkQueue(channel) {
+    let info = QUEUE.get(channel.id);
+    if (!info)
+        return;
+    if (info.players.length >= info.teamsize) {
+        let team = info.players.splice(0, info.teamsize).map(m => m.toString());
+        //TODO add embeds to lang.ts
+        let embed = new discord_js_1.MessageEmbed()
+            .setTitle('Team')
+            .setDescription(team.join('\n'));
+        await channel.send({ embeds: [embed] });
+    }
+}
+var Queue;
+(function (Queue) {
+    function create(channelId, teamsize) {
+        if (!QUEUE.has(channelId)) {
+            QUEUE.set(channelId, { teamsize, players: [] });
+            SaveQueue();
+        }
+    }
+    Queue.create = create;
+    function remove(channelId) {
+        if (QUEUE.has(channelId)) {
+            QUEUE.delete(channelId);
+            SaveQueue();
+        }
+    }
+    Queue.remove = remove;
+    function addPlayer(channelId, member) {
+        if (QUEUE.has(channelId)) {
+            QUEUE.delete(channelId);
+        }
+    }
+    Queue.addPlayer = addPlayer;
+    function removePlayer(channelId, member) {
+        if (QUEUE.has(channelId)) {
+            QUEUE.delete(channelId);
+        }
+    }
+    Queue.removePlayer = removePlayer;
+})(Queue || (Queue = {}));
+SaveQueue();
+async function discordInit(client) {
+    for (let channelId of QUEUE.keys()) {
+        let info = QUEUE.get(channelId), channel = await client.channels.fetch(channelId);
+        if (!info) { //no idea what could cause this but TS complains
+            Queue.remove(channelId);
+            continue;
+        }
+        if (!channel || !(channel instanceof discord_js_1.TextChannel)) {
+            console.error(lang_1.Lang.get('error.discord.noChannel'), {
+                channelId,
+                teamsize: info.teamsize
+            });
+            Queue.remove(channelId);
+            continue;
+        }
+        channel.send(lang_1.Lang.get('discord.botRestart'));
+    }
+}
+exports.discordInit = discordInit;
+var QueueCommands;
+(function (QueueCommands) {
+    /**
      * get the queueInfo of an interaction
      * @param interaction
      * @throws errorMessage class if it does not exist
      * @returns queue info
      */
-function getInfo(interaction) {
+    function getInfo(interaction) {
         let info = QUEUE.get(interaction.channelId);
         if (!info)
-        throw (0, util_1.emsg)('There is not an active queue in this channel, type `/queue` to create one');
+            throw (0, util_1.emsg)('discord.noQueue');
         return info;
-}
-exports.getInfo = getInfo;
-/**
+    }
+    /**
      * compiles all the get functions above
      * @param interaction
      * @throws if another get function throws
      * @returns object containing each
      */
-const getAll = (interaction) => ({
+    const getAll = (interaction) => ({
         member: (0, util_1.getMember)(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) {
-    let { member, info } = (0, exports.getAll)(interaction);
+    function queueContains(interaction) {
+        let { member, info } = getAll(interaction);
         if (info.players.map(m => m.id).includes(member.id))
             return true;
         return false;
-}
-exports.queueContains = queueContains;
-/**
- * creates the timeout for the queue
- * @param interaction
- * @returns time timeout identifier
- */
-function setQueueTimeout(interaction) {
-    let channel = (0, util_1.getChannel)(interaction);
-    return setTimeout(() => {
-        clearQueue(interaction);
-        channel.send('Queue has been reset due to inactivity');
-    }, 5 * 60 * 1000); //5 minutes
-}
-/**
- * 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);
-}
-/**
+    }
+    QueueCommands.queueContains = queueContains;
+    /**
      * 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 joinQueue(interaction) {
-    let { member, info } = (0, exports.getAll)(interaction);
-    if (queueContains(interaction))
-        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;
-/**
- * leaves a queue from an interaction
- * @param interaction
      * @throws errorMessage class if it cannot be left
      */
-async function leaveQueue(interaction) {
-    let { member, info } = (0, exports.getAll)(interaction);
-    if (!queueContains(interaction))
-        throw (0, util_1.emsg)('You aren\'t in the active queue');
-    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');
-}
-exports.leaveQueue = leaveQueue;
-/**
- * readys a queue from an interaction
+    function queueCreate(interaction) {
+        (0, util_1.memberIsModThrow)(interaction);
+        let { channelId } = interaction, teamsize = interaction.options.getInteger('teamsize', true);
+        let existing = QUEUE.get(channelId);
+        if (existing)
+            throw (0, util_1.emsg)(lang_1.Lang.get('error.discord.noCreate', {
+                teamsize: existing.teamsize.toString()
+            }));
+        Queue.create(channelId, teamsize);
+        interaction.reply(lang_1.Lang.get('discord.create', {
+            teamsize: teamsize.toString()
+        }));
+    }
+    QueueCommands.queueCreate = queueCreate;
+    /**
+     * opens a queue
+     * @param interaction
+     * @throws errorMessage class if it cannot be left
+     */
+    async function open(interaction) {
+        queueCreate(interaction);
+    }
+    QueueCommands.open = open;
+    /**
+     * closes a queue
+     * @param interaction
+     * @throws errorMessage class if it cannot be joined
+     */
+    async function close(interaction) {
+        (0, util_1.memberIsModThrow)(interaction);
+        QUEUE.delete(interaction.channelId);
+        await interaction.reply(lang_1.Lang.get('discord.close'));
+    }
+    QueueCommands.close = close;
+    /**
+     * gives info about the queue
+     * @param interaction
+     * @throws errorMessage class if it cannot be left
+     */
+    async function queue(interaction) {
+        let info = getInfo(interaction);
+        let embed = new discord_js_1.MessageEmbed()
+            .setTitle('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 });
+    }
+    QueueCommands.queue = queue;
+    /**
+     * joins a queue
      * @param interaction
      * @throws errorMessage class if it cannot be readied
      */
-async function readyQueue(interaction) {
-    let { member, info } = (0, exports.getAll)(interaction), { initiator } = info;
-    if (member.id !== initiator.member.id)
-        throw (0, util_1.emsg)('Only the queue initiator can ready the queue');
-    clearQueue(interaction);
-    if (info.players.filter(m => m.id !== initiator.member.id).length === 0)
-        throw (0, util_1.emsg)('Nobody signed up for the queue, the queue has been reset');
-    //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;
-/**
- * readys a queue from an interaction
+    async function join(interaction) {
+        let { member, info, channel } = getAll(interaction);
+        if (queueContains(interaction))
+            throw (0, util_1.emsg)('discord.inQueue');
+        info.players.push(member);
+        QUEUE.set(interaction.channelId, info);
+        await interaction.reply(lang_1.Lang.get('discord.join'));
+        checkQueue(channel);
+    }
+    QueueCommands.join = join;
+    /**
+     * leaves a queue
      * @param interaction
      * @throws errorMessage class if it cannot be reset
      */
-async function cancelQueue(interaction) {
-    let { info, member, channel } = (0, exports.getAll)(interaction);
-    if (!member.permissionsIn(channel).has('MANAGE_MESSAGES'))
-        throw (0, util_1.emsg)('You do not have permission to run this command');
-    clearQueue(interaction);
-    await interaction.reply('Queue has been reset');
-}
-exports.cancelQueue = cancelQueue;
+    async function leave(interaction) {
+        let { member, info } = getAll(interaction);
+        if (!queueContains(interaction))
+            throw (0, util_1.emsg)('discord.notInQueue');
+        info.players.splice(info.players.indexOf(member), 1);
+        QUEUE.set(interaction.channelId, info);
+        await interaction.reply(lang_1.Lang.get('discord.leave'));
+    }
+    QueueCommands.leave = leave;
+})(QueueCommands = exports.QueueCommands || (exports.QueueCommands = {}));

dist/util.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getChannel = exports.getMember = exports.emsg = exports.errorMessage = exports.shuffle = void 0;
+exports.memberIsModThrow = exports.memberIsMod = exports.getChannel = exports.getMember = exports.emsg = exports.errorMessage = exports.shuffle = void 0;
 const discord_js_1 = require("discord.js");
+const lang_1 = require("./lang");
 /**
  * shuffles an array
  * https://stackoverflow.com/a/2450976/2856416
@@ -36,7 +37,7 @@ exports.errorMessage = errorMessage;
  * @param ephemeral (default=true)
  * @returns new errorMessage
  */
-const emsg = (msg, ephemeral = true) => new errorMessage(msg, ephemeral);
+const emsg = (msg, ephemeral = true) => new errorMessage(lang_1.Lang.get(`error.${msg}`), ephemeral);
 exports.emsg = emsg;
 /**
  * get the GuildMember of an interaction
@@ -47,7 +48,7 @@ exports.emsg = emsg;
 function getMember(interaction) {
     let member = interaction.member;
     if (!(member instanceof discord_js_1.GuildMember))
-        throw (0, exports.emsg)('Unable to retrieve guild member information, please try again');
+        throw (0, exports.emsg)('general.noMember');
     return member;
 }
 exports.getMember = getMember;
@@ -60,7 +61,17 @@ exports.getMember = getMember;
 function getChannel(interaction) {
     let channel = interaction.channel;
     if (!(channel instanceof discord_js_1.TextChannel))
-        throw (0, exports.emsg)('Unable to retrieve text channel information, please try again');
+        throw (0, exports.emsg)('general.noChannel');
     return channel;
 }
 exports.getChannel = getChannel;
+function memberIsMod(interaction) {
+    let 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-lock.json

@@ -1,21 +1,21 @@
 {
-    "name": "1800queue-alt",
+    "name": "1800queue",
     "version": "1.0.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
-            "name": "1800queue-alt",
+            "name": "1800queue",
             "version": "1.0.0",
             "license": "MIT",
             "dependencies": {
                 "@discordjs/rest": "^0.3.0",
                 "cheerio": "^1.0.0-rc.10",
-                "discord-api-types": "^0.26.1",
                 "discord.js": "^13.6.0"
             },
             "devDependencies": {
                 "@types/node": "^17.0.13",
+                "discord-api-types": "^0.26.1",
                 "npm-watch": "^0.11.0",
                 "ts-node": "^10.4.0",
                 "typescript": "^4.5.5"
@@ -150,9 +150,9 @@
             "dev": true
         },
         "node_modules/@types/node": {
-            "version": "17.0.13",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.13.tgz",
-            "integrity": "sha512-Y86MAxASe25hNzlDbsviXl8jQHb0RDvKt4c40ZJQ1Don0AAL0STLZSs4N+6gLEO55pedy7r2cLwS+ZDxPm/2Bw=="
+            "version": "17.0.17",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.17.tgz",
+            "integrity": "sha512-e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw=="
         },
         "node_modules/@types/node-fetch": {
             "version": "2.5.12",
@@ -662,6 +662,7 @@
             "version": "0.26.1",
             "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.26.1.tgz",
             "integrity": "sha512-T5PdMQ+Y1MEECYMV5wmyi9VEYPagEDEi4S0amgsszpWY0VB9JJ/hEvM6BgLhbdnKky4gfmZEXtEEtojN8ZKJQQ==",
+            "deprecated": "No longer supported. Install the latest release!",
             "engines": {
                 "node": ">=12"
             }
@@ -1211,9 +1212,9 @@
             }
         },
         "node_modules/minimatch": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.1.tgz",
+            "integrity": "sha512-reLxBcKUPNBnc/sVtAbxgRVFSegoGeLaSjmphNhcwcolhYLRgtJscn5mRl6YRZNQv40Y7P6JM2YhSIsbL9OB5A==",
             "dev": true,
             "dependencies": {
                 "brace-expansion": "^1.1.7"
@@ -1574,9 +1575,9 @@
             }
         },
         "node_modules/signal-exit": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
-            "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
+            "version": "3.0.7",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
             "dev": true
         },
         "node_modules/string_decoder": {
@@ -1688,9 +1689,9 @@
             "integrity": "sha512-nXIb1fvdY5CBSrDIblLn73NW0qRDk5yJ0Sk1qPBF560OdJfQp9jhl+0tzcY09OZ9U+6GpeoI9RjwoIKFIoB9MQ=="
         },
         "node_modules/ts-node": {
-            "version": "10.4.0",
-            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.4.0.tgz",
-            "integrity": "sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==",
+            "version": "10.5.0",
+            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.5.0.tgz",
+            "integrity": "sha512-6kEJKwVxAJ35W4akuiysfKwKmjkbYxwQMTBaAxo9KKAx/Yd26mPUyhGz3ji+EsJoAgrLqVsYHNuuYwQe22lbtw==",
             "dev": true,
             "dependencies": {
                 "@cspotcode/source-map-support": "0.7.0",
@@ -1704,6 +1705,7 @@
                 "create-require": "^1.1.0",
                 "diff": "^4.0.1",
                 "make-error": "^1.1.1",
+                "v8-compile-cache-lib": "^3.0.0",
                 "yn": "3.1.1"
             },
             "bin": {
@@ -1846,6 +1848,12 @@
             "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
             "dev": true
         },
+        "node_modules/v8-compile-cache-lib": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz",
+            "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==",
+            "dev": true
+        },
         "node_modules/webidl-conversions": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
@@ -1908,9 +1916,9 @@
             }
         },
         "node_modules/ws": {
-            "version": "8.4.2",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz",
-            "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==",
+            "version": "8.5.0",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+            "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
             "engines": {
                 "node": ">=10.0.0"
             },
@@ -2056,9 +2064,9 @@
             "dev": true
         },
         "@types/node": {
-            "version": "17.0.13",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.13.tgz",
-            "integrity": "sha512-Y86MAxASe25hNzlDbsviXl8jQHb0RDvKt4c40ZJQ1Don0AAL0STLZSs4N+6gLEO55pedy7r2cLwS+ZDxPm/2Bw=="
+            "version": "17.0.17",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.17.tgz",
+            "integrity": "sha512-e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw=="
         },
         "@types/node-fetch": {
             "version": "2.5.12",
@@ -2852,9 +2860,9 @@
             "dev": true
         },
         "minimatch": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.1.tgz",
+            "integrity": "sha512-reLxBcKUPNBnc/sVtAbxgRVFSegoGeLaSjmphNhcwcolhYLRgtJscn5mRl6YRZNQv40Y7P6JM2YhSIsbL9OB5A==",
             "dev": true,
             "requires": {
                 "brace-expansion": "^1.1.7"
@@ -3119,9 +3127,9 @@
             }
         },
         "signal-exit": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
-            "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
+            "version": "3.0.7",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
             "dev": true
         },
         "string_decoder": {
@@ -3212,9 +3220,9 @@
             "integrity": "sha512-nXIb1fvdY5CBSrDIblLn73NW0qRDk5yJ0Sk1qPBF560OdJfQp9jhl+0tzcY09OZ9U+6GpeoI9RjwoIKFIoB9MQ=="
         },
         "ts-node": {
-            "version": "10.4.0",
-            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.4.0.tgz",
-            "integrity": "sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==",
+            "version": "10.5.0",
+            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.5.0.tgz",
+            "integrity": "sha512-6kEJKwVxAJ35W4akuiysfKwKmjkbYxwQMTBaAxo9KKAx/Yd26mPUyhGz3ji+EsJoAgrLqVsYHNuuYwQe22lbtw==",
             "dev": true,
             "requires": {
                 "@cspotcode/source-map-support": "0.7.0",
@@ -3228,6 +3236,7 @@
                 "create-require": "^1.1.0",
                 "diff": "^4.0.1",
                 "make-error": "^1.1.1",
+                "v8-compile-cache-lib": "^3.0.0",
                 "yn": "3.1.1"
             }
         },
@@ -3320,6 +3329,12 @@
             "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
             "dev": true
         },
+        "v8-compile-cache-lib": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz",
+            "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==",
+            "dev": true
+        },
         "webidl-conversions": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
@@ -3373,9 +3388,9 @@
             }
         },
         "ws": {
-            "version": "8.4.2",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz",
-            "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==",
+            "version": "8.5.0",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+            "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
             "requires": {}
         },
         "xdg-basedir": {

package.json

@@ -1,5 +1,5 @@
 {
-    "name": "1800queue-alt",
+    "name": "1800queue",
     "version": "1.0.0",
     "description": "",
     "main": "dist/index.js",
@@ -31,6 +31,7 @@
     "license": "MIT",
     "devDependencies": {
         "@types/node": "^17.0.13",
+        "discord-api-types": "^0.26.1",
         "npm-watch": "^0.11.0",
         "ts-node": "^10.4.0",
         "typescript": "^4.5.5"
@@ -38,7 +39,6 @@
     "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" ] && touch "token"
+[ ! -f "token.txt" ] && touch "token.txt"
 
-if [ ! -s "token" ]
+if [ ! -s "token.txt" ]
 then
     printf "Enter your discord bot token: "
     read token
-    printf $token > "token"
+    printf $token > "token.txt"
 fi

scripts/windows/install.bat

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

src/api.ts

@@ -245,7 +245,7 @@ export async function getPlayerInteraction(interaction: CommandInteraction) {
     
     let data = await getPlayer(username);
     if (data === null)
-        throw emsg('Unable to find user');
+        throw emsg('api.noUser');
     else
         sendPlayerEmbed(interaction, data);
 }

src/discord.ts

@@ -4,18 +4,27 @@ import { Routes } from 'discord-api-types/v9';
 // list of commands to register with discord
 const commands = [
     {
-        name: 'queue',
-        description: 'create a queue',
+        name: 'open',
+        description: 'open a queue for this channel',
         options: [
             {
                 type: 4, //INTEGER
                 name: 'teamsize',
                 description: 'size of each team',
-                required: true,
-                min_value: 1
+                min_value: 1,
+                required: true
             }
         ]
     },
+    {
+        name: 'close',
+        description: 'close the queue for this channel'
+    },
+    
+    {
+        name: 'queue',
+        description: 'view queue info'
+    },
     {
         name: 'join',
         description: 'join the active queue'
@@ -24,14 +33,6 @@ 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',
@@ -44,7 +45,8 @@ const commands = [
             }
         ]
     }
-]; 
+],
+    commandNames = commands.map(c => c.name); 
 
 /**
  * register/reload commands on guild(s)
@@ -65,7 +67,6 @@ 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,7 +3,8 @@ import { Client, Intents } from 'discord.js';
 import * as fs from 'fs';
 import { getPlayerInteraction } from './api';
 import { registerCommands } from './discord';
-import { cancelQueue, createQueue, joinQueue, leaveQueue, readyQueue } from './queue';
+import { Lang } from './lang';
+import { discordInit, QueueCommands } from './queue';
 import { errorMessage } from './util';
 const CLIENT = new Client({ intents: [Intents.FLAGS.GUILDS] });
 
@@ -11,18 +12,26 @@ const CLIENT = new Client({ intents: [Intents.FLAGS.GUILDS] });
 console.log(new Date().toISOString()+'\n\n');
 
 //get token
-if (!fs.existsSync('./token')) {
-    fs.writeFileSync('./token', '');
-    console.error('Missing Discord Token, please enter the bot token into the token file');
+if (!fs.existsSync('./token.txt')) {
+    fs.writeFileSync('./token.txt', '');
+    console.error(Lang.get('error.main.missingToken'));
     process.exit(1);
 }
-const TOKEN = fs.readFileSync('./token').toString();
+const TOKEN = fs.readFileSync('./token.txt').toString();
 
 //discord connections
 CLIENT.on('ready', client => {
-    console.log(`Logged in as ${client.user.tag}`);
+    console.log(Lang.get('main.login', {
+        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 => {
@@ -30,18 +39,31 @@ CLIENT.on('interactionCreate', async interaction => {
 
     try {
 
-        if (interaction.commandName === 'queue')
-            await createQueue(interaction);
-        else if (interaction.commandName === 'join')
-            await joinQueue(interaction);
-        else if (interaction.commandName === 'leave')
-            await leaveQueue(interaction);
-        else if (interaction.commandName === 'ready')
-            await readyQueue(interaction);
-        else if (interaction.commandName === 'cancel')
-            await cancelQueue(interaction);
-        else if (interaction.commandName === 'player')
+        switch (interaction.commandName) {
+
+            //mod commands
+            case 'open':
+                await QueueCommands.open(interaction);
+                break;
+            case 'close':
+                await QueueCommands.close(interaction);
+                break;
+
+            //general commands
+            case 'queue':
+                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

@@ -0,0 +1,82 @@
+type LangObj = { [keys:string]: LangObj | string }
+type LangObjWhold = { [langid:string]: LangObj }
+
+const LANG: LangObjWhold = {
+    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'
+            }
+        }
+    }
+}
+
+export namespace Lang {
+
+    var 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';
+    }
+
+    /**
+     * 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
+        
+        let keySpl = id.split('.').map(k => k.trim()).filter(k => k);
+
+        let finding = LANG[LANGID];
+
+        for (let key of keySpl) {
+
+            if (key in finding) {
+
+                let found = finding[key];
+
+                if (typeof found === 'string')
+                    return found;
+
+                finding = found;
+
+            } else
+                break;
+            
+        }
+
+        return id;
+    }
+        
+}

src/queue.ts

@@ -1,42 +1,157 @@
-import { CommandInteraction, GuildMember, MessageEmbed } from "discord.js";
-import { emsg, getChannel, getMember, queueInfo, shuffle } from "./util";
+/* TODO
 
-//maps ChannelID to QueueInfo
-const QUEUE = new Map<string, queueInfo>();
+join message should contain your current position in the queue, editing it to keep it current
+*/
 
-/**
+import { Client, CommandInteraction, GuildMember, MessageEmbed, TextChannel } from "discord.js";
+import * as fs from 'fs';
+import { emsg, getChannel, getMember, memberIsModThrow, queueInfo, queueInfoBase } from "./util";
+import { 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 {
+
+    let queueJson = JSON.parse(_QUEUE);
+
+    for (let channelId in queueJson) {
+        let {teamsize} = queueJson[channelId] as queueInfoBase;
+        if (teamsize)
+            QUEUE.set(channelId, { teamsize, players: [] })
+    }
+
+} catch(e) {}
+
+function SaveQueue() {
+
+    let queueJson = Object.fromEntries(QUEUE),
+        queueFileJson: {[keys: string]: queueInfoBase} = {};
+
+    for (let channelId of QUEUE.keys())
+        queueFileJson[channelId] = { teamsize: queueJson[channelId].teamsize };
+    
+    fs.writeFileSync('./queues.json', JSON.stringify(queueFileJson, null, 2));
+
+}
+
+async function checkQueue(channel: TextChannel) {
+    let info = QUEUE.get(channel.id);
+
+    if (!info)
+        return;
+    
+    if (info.players.length >= info.teamsize) {
+
+        let team = info.players.splice(0, info.teamsize).map(m => m.toString());
+
+        //TODO add embeds to lang.ts
+        let embed = new MessageEmbed()
+            .setTitle('Team')
+            .setDescription(team.join('\n'));
+
+        await channel.send({embeds: [embed]});
+
+    }
+    
+}
+namespace Queue {
+
+    export function create(channelId: string, teamsize: number) {
+        if (!QUEUE.has(channelId)) {
+            QUEUE.set(channelId, {teamsize, players: []});
+            SaveQueue();
+        }
+    }
+
+    export function remove(channelId: string) {
+        if (QUEUE.has(channelId)) {
+            QUEUE.delete(channelId);
+            SaveQueue();
+        }
+    }
+
+    export function addPlayer(channelId: string, member: GuildMember) {
+        if (QUEUE.has(channelId)) {
+            QUEUE.delete(channelId);
+        }
+    }
+
+    export function removePlayer(channelId: string, member: GuildMember) {
+        if (QUEUE.has(channelId)) {
+            QUEUE.delete(channelId);
+        }
+    }
+
+}
+
+SaveQueue();
+
+export async function discordInit(client: Client) {
+
+    for (let channelId of QUEUE.keys()) {
+
+        let info = QUEUE.get(channelId),
+            channel = await client.channels.fetch(channelId);
+
+        if (!info) { //no idea what could cause this but TS complains
+            Queue.remove(channelId);
+            continue;
+        }
+
+        if (!channel || !(channel instanceof TextChannel)) {
+            console.error(Lang.get('error.discord.noChannel'), {
+                channelId,
+                teamsize: info.teamsize
+            });
+            Queue.remove(channelId);
+            continue;
+        }
+
+        channel.send(Lang.get('discord.botRestart'));
+
+    }
+        
+}
+export namespace QueueCommands {
+
+    /**
      * get the queueInfo of an interaction
      * @param interaction 
      * @throws errorMessage class if it does not exist
      * @returns queue info
      */
-export function getInfo(interaction: CommandInteraction): queueInfo {
+    function getInfo(interaction: CommandInteraction): queueInfo {
         let info = QUEUE.get(interaction.channelId);
 
         if (!info)
-        throw emsg('There is not an active queue in this channel, type `/queue` to create one');
+            throw emsg('discord.noQueue');
 
         return info;
-}
+    }
 
-/**
+    /**
      * compiles all the get functions above
      * @param interaction 
      * @throws if another get function throws
      * @returns object containing each
      */
-export const getAll = (interaction: CommandInteraction) => ({
+    const getAll = (interaction: CommandInteraction) => ({
             member: getMember(interaction),
             channel: getChannel(interaction),
             info: getInfo(interaction)
         });
 
-/**
+    /**
      * checks if the interaction data is already in the queue
      * @param interaction 
      * @returns boolean
      */
-export function queueContains(interaction: CommandInteraction): boolean {
+    export function queueContains(interaction: CommandInteraction): boolean {
 
         let {member, info} = getAll(interaction);
 
@@ -45,192 +160,117 @@ export function queueContains(interaction: CommandInteraction): boolean {
 
         return false;
 
-}
+    }
 
-/**
- * creates the timeout for the queue
- * @param interaction 
- * @returns time timeout identifier
- */
-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
-}
-
-/**
- * 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'});
-
-    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);
-
-    if (QUEUE.has(channelId))
-        throw 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);
-
-}
-
-/**
- * joins a queue from an interaction
- * @param interaction 
- * @throws errorMessage class if it cannot be joined
- */
-export async function joinQueue(interaction: CommandInteraction) {
-
-    let {member, info} = getAll(interaction);
-
-    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');
-
-}
-
-/**
- * leaves a queue from an interaction
- * @param interaction 
      * @throws errorMessage class if it cannot be left
      */
-export async function leaveQueue(interaction: CommandInteraction) {
+    export function queueCreate(interaction: CommandInteraction) {
+        memberIsModThrow(interaction);
+
+        let {channelId} = interaction,
+            teamsize = interaction.options.getInteger('teamsize', true);
+
+        let existing = QUEUE.get(channelId)
+        if (existing)
+            throw emsg(Lang.get('error.discord.noCreate', {
+                teamsize: existing.teamsize.toString()
+            }));
+
+        Queue.create(channelId, teamsize);
+
+        interaction.reply(Lang.get('discord.create', {
+            teamsize: teamsize.toString()
+        }))
+
+    }
+
+    /**
+     * opens a queue
+     * @param interaction 
+     * @throws errorMessage class if it cannot be left
+     */
+    export async function open(interaction: CommandInteraction) {
+
+        queueCreate(interaction);
+
+    }
+
+    /**
+     * closes a queue
+     * @param interaction 
+     * @throws errorMessage class if it cannot be joined
+     */
+    export async function close(interaction: CommandInteraction) {
+        memberIsModThrow(interaction);
+
+        QUEUE.delete(interaction.channelId);
+
+        await interaction.reply(Lang.get('discord.close'));
+
+    }
+
+    /**
+     * gives info about the queue
+     * @param interaction 
+     * @throws errorMessage class if it cannot be left
+     */
+    export async function queue(interaction: CommandInteraction) {
+
+        let info = getInfo(interaction);
+
+        let embed = new MessageEmbed()
+            .setTitle('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});
+
+    }
+
+    /**
+     * joins a queue
+     * @param interaction 
+     * @throws errorMessage class if it cannot be readied
+     */
+    export async function join(interaction: CommandInteraction) {
+
+        let {member, info, channel} = getAll(interaction);
+
+        if (queueContains(interaction))
+            throw emsg('discord.inQueue');
+
+        info.players.push(member);
+
+        QUEUE.set(interaction.channelId, info);
+
+        await interaction.reply(Lang.get('discord.join'));
+
+        checkQueue(channel);
+
+    }
+
+    /**
+     * leaves a queue
+     * @param interaction 
+     * @throws errorMessage class if it cannot be reset
+     */
+    export async function leave(interaction: CommandInteraction) {
 
         let {member, info} = getAll(interaction);
 
         if (!queueContains(interaction))
-        throw emsg('You aren\'t in the active queue');
+            throw emsg('discord.notInQueue');
 
         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');
-
-}
-
-/**
- * readys a queue from an interaction
- * @param interaction 
- * @throws errorMessage class if it cannot be readied
- */
-export async function readyQueue(interaction: CommandInteraction) {
-
-    let {member, info} = getAll(interaction),
-        {initiator} = info;
-
-    if (member.id !== initiator.member.id)
-        throw emsg('Only the queue initiator can ready the queue');
-
-    clearQueue(interaction);
-
-    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');
-
-    //team data
-    let playerlist: GuildMember[] = shuffle(info.players),
-        teams: GuildMember[][] = [];
-
-    //fill team data
-    for (let i = 0; i < playerlist.length; i+= info.teamsize)
-        teams.push(playerlist.slice(i, i+info.teamsize));
-
-    sendTeamsEmbed(interaction, teams);
-
-}
-
-/**
- * readys a queue from an interaction
- * @param interaction 
- * @throws errorMessage class if it cannot be reset
- */
-export async function cancelQueue(interaction: CommandInteraction) {
-
-    let {info, member, channel} = getAll(interaction);
-
-    if (!member.permissionsIn(channel).has('MANAGE_MESSAGES'))
-        throw emsg('You do not have permission to run this command');
-
-    clearQueue(interaction);
-
-    await interaction.reply('Queue has been reset');
+        await interaction.reply(Lang.get('discord.leave'));
+        
+    }
 
 }

src/util.ts

@@ -1,4 +1,5 @@
 import { CommandInteraction, GuildMember, TextChannel } from "discord.js";
+import { Lang } from "./lang";
 
 /**
  * shuffles an array
@@ -42,18 +43,15 @@ export class errorMessage {
  * @param ephemeral (default=true)
  * @returns new errorMessage
  */
-export const emsg = (msg: string, ephemeral: boolean = true) => new errorMessage(msg, ephemeral);
+export const emsg = (msg: string, ephemeral: boolean = true) => new errorMessage(Lang.get(`error.${msg}`), ephemeral);
 
 
 
-export type queueInfo = {
-    players: GuildMember[],
-    initiator: {
-        interaction: CommandInteraction,
-        member: GuildMember
-    },
-    teamsize: number,
-    timeout: NodeJS.Timeout
+export interface queueInfoBase {
+    teamsize: number
+}
+export interface queueInfo extends queueInfoBase{
+    players: GuildMember[]
 }
 
 /**
@@ -66,7 +64,7 @@ export function getMember(interaction: CommandInteraction): GuildMember {
     let member = interaction.member;
 
     if (!(member instanceof GuildMember))
-        throw emsg('Unable to retrieve guild member information, please try again');
+        throw emsg('general.noMember');
 
     return member;
 }
@@ -81,7 +79,18 @@ export function getChannel(interaction: CommandInteraction): TextChannel {
     let channel = interaction.channel;
 
     if (!(channel instanceof TextChannel))
-        throw emsg('Unable to retrieve text channel information, please try again');
+        throw emsg('general.noChannel');
 
     return channel;
 }
+
+
+export function memberIsMod(interaction: CommandInteraction): boolean {
+    let member = getMember(interaction);
+    return member.permissionsIn(interaction.channelId).has('MANAGE_MESSAGES');
+}
+
+export function memberIsModThrow(interaction: CommandInteraction) {
+    if (!memberIsMod(interaction))
+        throw emsg('discord.notMod');
+}