zomo/1800queue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improved messages and general cleanup

Browse Source
This commit is contained in:
ashley zomo
2022-01-31 19:33:39 -06:00
parent 00d04c787d
commit fe866050d5
10 changed files with 383 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dist/api.js vendored
View File

@@ -24,7 +24,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
Object.defineProperty(exports, "__esModule", { value: true });
exports.getPlayerInteraction = exports.getPlayer = void 0;
const cheerio = __importStar(require("cheerio"));
const discord_js_1 = require("discord.js");
const https_1 = __importDefault(require("https"));
const util_1 = require("./util");
const uniteApiRegex = {
//$1 = name, $2 = id
ogtitle: /unite api - (.+) \((.*)\)/i,
@@ -68,11 +70,14 @@ function getHTML(name) {
* interprets the html from getHTML()
* @param name name of player
* @returns player data from site
* @throws errorMessage class if the request fails
*/
function readHTML(html) {
let metaElems = cheerio.load(html)('meta').toArray(), foundData = {
let $ = cheerio.load(html);
let metaElems = $('meta').toArray(), foundData = {
name: "",
id: "",
avatar: "",
level: "",
rank: "",
elo: null,
@@ -102,7 +107,7 @@ function readHTML(html) {
extraLines.push(line);
}
if (!lines.length)
throw 'Unable to read data, please try again';
throw (0, util_1.emsg)('Unable to read data, please try again');
//bring the first lines removed back into the data
lines = [
...lines,
@@ -116,7 +121,7 @@ function readHTML(html) {
if (regex[0].test(line)) { //is master/has elo
let regexData = line.match(regex[0]);
if (!regexData || regexData.length < 4)
throw 'Unable to read data, please try again';
throw (0, util_1.emsg)('Unable to read data, please try again');
foundData.level = regexData[1];
foundData.rank = regexData[2];
foundData.elo = regexData[3];
@@ -124,7 +129,7 @@ function readHTML(html) {
else { //is not master/has a class
let regexData = line.match(regex[1]);
if (!regexData || regexData.length < 4)
throw 'Unable to read data, please try again';
throw (0, util_1.emsg)('Unable to read data, please try again');
foundData.level = regexData[1];
foundData.rank = regexData[2];
foundData.class = regexData[3];
@@ -148,6 +153,8 @@ function readHTML(html) {
});
}
});
foundData.avatar = $('.player-card-image img').attr('src') || "";
foundData.avatar = foundData.avatar.replace('../', 'https://uniteapi.dev/');
return foundData;
}
/**
@@ -173,17 +180,32 @@ async function getPlayer(name) {
return null;
}
exports.getPlayer = getPlayer;
async function sendPlayerEmbed(interaction, data) {
let 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} ${data.elo ? `(${data.elo})` : `Class ${data.class}`}
**Battles** ${data.battles}
**Wins** ${data.wins}
**Win Rate** ${data.winrate}`);
await interaction.editReply({ embeds: [embed] });
}
/**
* calls getPlayer() with the name from the interaction
* @param interaction discord interaction
* @throws errorMessage class if the user cannot be found
*/
async function getPlayerInteraction(interaction) {
let username = interaction.options.getString('username', true);
await interaction.deferReply();
let data = await getPlayer(username);
if (data === null)
await interaction.editReply('Unable to find user');
throw (0, util_1.emsg)('Unable to find user');
else
await interaction.editReply('```\n' + JSON.stringify(data, null, 2) + '\n```');
sendPlayerEmbed(interaction, data);
}
exports.getPlayerInteraction = getPlayerInteraction;

6
dist/discord.js vendored
View File

@@ -35,13 +35,13 @@ const commands = [
description: 'cancels the current queue (must have the Manage Messages permission)'
},
{
name: 'elo',
description: 'display elo information',
name: 'player',
description: 'display player information',
options: [
{
type: 3,
name: 'username',
description: 'in game name',
description: 'in game name or UniteApi short link',
required: true
}
]

14
dist/index.js vendored
View File

@@ -24,6 +24,7 @@ const fs = __importStar(require("fs"));
const api_1 = require("./api");
const discord_1 = require("./discord");
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');
@@ -53,17 +54,18 @@ CLIENT.on('interactionCreate', async (interaction) => {
await (0, queue_1.readyQueue)(interaction);
else if (interaction.commandName === 'cancel')
await (0, queue_1.cancelQueue)(interaction);
else if (interaction.commandName === 'queueinfo')
await (0, queue_1.queueInfo)(interaction);
else if (interaction.commandName === 'elo')
else if (interaction.commandName === 'player')
await (0, api_1.getPlayerInteraction)(interaction);
}
catch (e) {
if (typeof e === 'string') {
if (e instanceof util_1.errorMessage) {
if (interaction.deferred || interaction.replied)
interaction.editReply(e);
interaction.editReply(e.msg);
else
interaction.reply(e);
interaction.reply({
content: e.msg,
ephemeral: e.ephemeral
});
}
else
console.error(e);

181
dist/queue.js vendored
View File

@@ -1,186 +1,189 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.queueInfo = exports.cancelQueue = exports.readyQueue = exports.leaveQueue = exports.joinQueue = exports.createQueue = exports.queueContains = 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 util_1 = require("./util");
//maps ChannelID to QueueInfo
const QUEUE = new Map();
/**
* creates the timeout for the queue
* @param interaction
* @returns time timeout identifier
*/
function setQueueTimeout(interaction) {
let channel = getChannel(interaction);
return setTimeout(() => {
QUEUE.delete(channel.id);
channel.send('Queue has been reset due to inactivity');
}, 5 * 60 * 1000); //5 minutes
}
/**
* get the GuildMember of an interaction
* @param interaction
* @throws string message if it cannot be read
* @returns member
*/
function getMember(interaction) {
let member = interaction.member;
if (!(member instanceof discord_js_1.GuildMember))
throw 'Unable to retrieve guild member information, please try again';
return member;
}
/**
* get the TextChannel of an interaction
* @param interaction
* @throws string message if it cannot be read
* @returns member
*/
function getChannel(interaction) {
let channel = interaction.channel;
if (!(channel instanceof discord_js_1.TextChannel))
throw 'Unable to retrieve text channel information, please try again';
return channel;
}
/**
* get the queueInfo of an interaction
* @param interaction
* @throws string message if it does not exist
* @throws errorMessage class if it does not exist
* @returns queue info
*/
function getInfo(interaction) {
let info = QUEUE.get(interaction.channelId);
if (!info)
throw 'There is not an active queue in this channel, type `/queue` to create one';
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
* @throws string message if it does not exist
* @throws if another get function throws
* @returns object containing each
*/
const getAll = (interaction) => ({
member: getMember(interaction),
channel: getChannel(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 } = 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;
/**
* 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);
}
/**
* creates a queue from an interaction
* @param interaction
* @throws string message if it cannot be created
* @throws errorMessage class if it cannot be created
*/
async function createQueue(interaction) {
let member = getMember(interaction), { channelId } = interaction, teamsize = interaction.options.getInteger('teamsize', true);
let member = (0, util_1.getMember)(interaction), { channelId } = interaction, teamsize = interaction.options.getInteger('teamsize', true);
if (QUEUE.has(channelId))
throw 'There is already an active queue in this channel, ' + (queueContains(interaction) ? 'and you are already in it' : 'type `/join` to join'); //and you are already in it
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: member,
initiator: {
interaction,
member
},
teamsize: teamsize,
timeout: setQueueTimeout(interaction)
});
await interaction.reply(`Queue for teams of ${teamsize} has been created, and you have joined`);
sendQueueEmbed(interaction);
}
exports.createQueue = createQueue;
/**
* joins a queue from an interaction
* @param interaction
* @throws string message if it cannot be joined
* @throws errorMessage class if it cannot be joined
*/
async function joinQueue(interaction) {
let { member, info } = getAll(interaction);
let { member, info } = (0, exports.getAll)(interaction);
if (queueContains(interaction))
throw 'You are already in the active queue';
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 string message if it cannot be left
* @throws errorMessage class if it cannot be left
*/
async function leaveQueue(interaction) {
let { member, info } = getAll(interaction);
let { member, info } = (0, exports.getAll)(interaction);
if (!queueContains(interaction))
throw 'You aren\'t in the active queue';
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
* @param interaction
* @throws string message if it cannot be readied
* @throws errorMessage class if it cannot be readied
*/
async function readyQueue(interaction) {
let { member, info } = getAll(interaction), { initiator } = info;
if (member.id !== initiator.id)
throw 'Only the queue initiator can ready the queue';
//reset queue
QUEUE.delete(interaction.channelId);
if (info.players.filter(m => m.id !== initiator.id).length === 0)
throw 'Nobody signed up for the queue, the queue has been reset';
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));
//convert teams to strings
let teamsStr = [];
teams.forEach((team, i) => {
let str = [`Team ${i + 1}`];
team.forEach(m => str.push(` ${m.user.tag}`));
teamsStr.push(str.join('\n'));
});
await interaction.reply('```\n' + teamsStr.join('\n\n') + '\n```');
sendTeamsEmbed(interaction, teams);
}
exports.readyQueue = readyQueue;
/**
* readys a queue from an interaction
* @param interaction
* @throws string message if it cannot be reset
* @throws errorMessage class if it cannot be reset
*/
async function cancelQueue(interaction) {
let { member, channel } = getAll(interaction);
let { info, member, channel } = (0, exports.getAll)(interaction);
if (!member.permissionsIn(channel).has('MANAGE_MESSAGES'))
throw 'You do not have permission to run this command';
//reset queue
QUEUE.delete(interaction.channelId);
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;
/**
* sends the queue information from an interaction
* @param interaction
* @throws string message if it cannot be read
*/
async function queueInfo(interaction) {
let info = getInfo(interaction);
await interaction.reply('```' + `
players: ${info.players.map(p => p.user.tag).join('\n ')}
initiator: ${info.initiator.user.tag}
teamsize: ${info.teamsize}
` + '```');
}
exports.queueInfo = queueInfo;

44
dist/util.js vendored
View File

@@ -1,6 +1,7 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.shuffle = void 0;
exports.getChannel = exports.getMember = exports.emsg = exports.errorMessage = exports.shuffle = void 0;
const discord_js_1 = require("discord.js");
/**
* shuffles an array
* https://stackoverflow.com/a/2450976/2856416
@@ -22,3 +23,44 @@ function shuffle(array) {
return array;
}
exports.shuffle = shuffle;
class errorMessage {
constructor(msg, ephemeral = true) {
this.msg = msg;
this.ephemeral = ephemeral;
}
}
exports.errorMessage = errorMessage;
/**
* a simple class to contain an error message and related data
* @param msg error message
* @param ephemeral (default=true)
* @returns new errorMessage
*/
const emsg = (msg, ephemeral = true) => new errorMessage(msg, ephemeral);
exports.emsg = emsg;
/**
* get the GuildMember of an interaction
* @param interaction
* @throws errorMessage class if it cannot be read
* @returns member
*/
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');
return member;
}
exports.getMember = getMember;
/**
* get the TextChannel of an interaction
* @param interaction
* @throws errorMessage class if it cannot be read
* @returns member
*/
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');
return channel;
}
exports.getChannel = getChannel;