Compare commits

...

5 Commits

Author SHA1 Message Date
4b14e5e050 queue create/join 2022-01-27 18:49:52 -06:00
2a3e1e3efa link commands 2022-01-27 18:49:08 -06:00
83d1af3bef add commands 2022-01-27 18:48:51 -06:00
a461fad0c1 function to receive interaction 2022-01-27 18:48:37 -06:00
0a9918a508 dev packages 2022-01-27 18:46:54 -06:00
10 changed files with 519 additions and 15 deletions

14
dist/api.js vendored
View File

@@ -31,7 +31,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.getPlayer = void 0;
exports.getPlayerInteraction = exports.getPlayer = void 0;
const cheerio = __importStar(require("cheerio"));
const https_1 = __importDefault(require("https"));
//making long regex rather than splitting the string at ":" because regex would be easier to debug than logic in the case the website changes
@@ -149,4 +149,16 @@ function getPlayer(name) {
});
}
exports.getPlayer = getPlayer;
function getPlayerInteraction(interaction) {
return __awaiter(this, void 0, void 0, function* () {
let username = interaction.options.getString('username', true);
interaction.deferReply();
let data = yield getPlayer(username);
if (data === null)
yield interaction.reply('Unable to find user');
else
yield interaction.reply('```\n' + JSON.stringify(data, null, 2) + '\n```');
});
}
exports.getPlayerInteraction = getPlayerInteraction;
//await getPlayer('IanWhysp')

40
dist/discord.js vendored
View File

@@ -12,10 +12,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.registerCommands = void 0;
const rest_1 = require("@discordjs/rest");
const v9_1 = require("discord-api-types/v9");
const commands = [{
const commands = [
{
name: 'queue',
description: 'creates a queue'
}];
description: 'creates a queue',
options: [
{
type: 4,
name: 'teamsize',
description: 'size of each team',
required: true
}
]
},
{
name: 'join',
description: 'joins the active queue'
},
{
name: 'ready',
description: 'readys the queue and displays team info'
},
{
name: 'queueinfo',
description: 'gets info of the current queue'
},
{
name: 'elo',
description: 'displays your elo information',
options: [
{
type: 3,
name: 'username',
description: 'your in game name',
required: true
}
]
}
];
/**
* register/reload commands on guild(s)
* @param token discord bot token

11
dist/index.js vendored
View File

@@ -30,6 +30,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
Object.defineProperty(exports, "__esModule", { value: true });
const discord_js_1 = require("discord.js");
const fs = __importStar(require("fs"));
const api_1 = require("./api");
const discord_1 = require("./discord");
const queue_1 = require("./queue");
const CLIENT = new discord_js_1.Client({ intents: [discord_js_1.Intents.FLAGS.GUILDS] });
@@ -47,6 +48,14 @@ CLIENT.on('interactionCreate', (interaction) => __awaiter(void 0, void 0, void 0
if (!interaction.isCommand())
return;
if (interaction.commandName === 'queue')
(0, queue_1.createQueue)(interaction);
yield (0, queue_1.createQueue)(interaction);
else if (interaction.commandName === 'join')
yield (0, queue_1.joinQueue)(interaction);
//else if (interaction.commandName === 'ready')
// await readyQueue(interaction);
else if (interaction.commandName === 'queueinfo')
yield (0, queue_1.queueInfo)(interaction);
else if (interaction.commandName === 'elo')
yield (0, api_1.getPlayerInteraction)(interaction);
}));
CLIENT.login(TOKEN);

69
dist/queue.js vendored
View File

@@ -1,6 +1,73 @@
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.createQueue = void 0;
exports.queueInfo = exports.joinQueue = exports.createQueue = void 0;
const discord_js_1 = require("discord.js");
//maps ChannelID to QueueInfo
const QUEUE = new Map();
function createQueue(interaction) {
return __awaiter(this, void 0, void 0, function* () {
console.log('COMMAND createQueue');
let member = interaction.member;
if (!(member instanceof discord_js_1.GuildMember)) {
yield interaction.reply('Unable to retrieve guild member information, please try again');
return;
}
let channelId = interaction.channelId;
if (QUEUE.has(channelId)) {
yield interaction.reply('There is already an active queue in this channel, type `/join` to join');
return;
}
QUEUE.set(channelId, {
players: [],
initiator: member,
teamsize: interaction.options.getInteger('teamsize', true)
});
yield interaction.reply('Queue has been created, type `/join` to join');
});
}
exports.createQueue = createQueue;
function joinQueue(interaction) {
return __awaiter(this, void 0, void 0, function* () {
console.log('COMMAND joinQueue');
let member = interaction.member;
if (!(member instanceof discord_js_1.GuildMember)) {
yield interaction.reply('Unable to retrieve guild member information, please try again');
return;
}
let channelId = interaction.channelId;
let info = QUEUE.get(channelId);
if (!info) {
yield interaction.reply('There is not an active queue in this channel, type `/queue` to create one');
return;
}
info.players.push(member);
QUEUE.set(channelId, info);
yield interaction.reply('Joined the queue');
});
}
exports.joinQueue = joinQueue;
function queueInfo(interaction) {
return __awaiter(this, void 0, void 0, function* () {
console.log('COMMAND queueInfo');
let channelId = interaction.channelId, info = QUEUE.get(channelId);
if (!info) {
yield interaction.reply('There is not an active queue in this channel, type `/queue` to create one');
return;
}
yield interaction.reply('```' + `
players: ${info.players.map(p => p.user.tag).join('\n ')}
initiator: ${info.initiator.user.tag}
teamsize: ${info.teamsize}
` + '```');
});
}
exports.queueInfo = queueInfo;

245
package-lock.json generated
View File

@@ -17,9 +17,31 @@
"devDependencies": {
"@types/node": "^17.0.13",
"npm-watch": "^0.11.0",
"ts-node": "^10.4.0",
"typescript": "^4.5.5"
}
},
"node_modules/@cspotcode/source-map-consumer": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz",
"integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==",
"dev": true,
"engines": {
"node": ">= 12"
}
},
"node_modules/@cspotcode/source-map-support": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz",
"integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==",
"dev": true,
"dependencies": {
"@cspotcode/source-map-consumer": "0.8.0"
},
"engines": {
"node": ">=12"
}
},
"node_modules/@discordjs/builders": {
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.11.0.tgz",
@@ -112,6 +134,30 @@
"node": ">=6"
}
},
"node_modules/@tsconfig/node10": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
"integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
"dev": true
},
"node_modules/@tsconfig/node12": {
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
"integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
"dev": true
},
"node_modules/@tsconfig/node14": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
"integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
"dev": true
},
"node_modules/@tsconfig/node16": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
"integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
"dev": true
},
"node_modules/@types/node": {
"version": "17.0.13",
"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.13.tgz",
@@ -153,6 +199,27 @@
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
"dev": true
},
"node_modules/acorn": {
"version": "8.7.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
"dev": true,
"bin": {
"acorn": "bin/acorn"
},
"engines": {
"node": ">=0.4.0"
}
},
"node_modules/acorn-walk": {
"version": "8.2.0",
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
"dev": true,
"engines": {
"node": ">=0.4.0"
}
},
"node_modules/ansi-align": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
@@ -199,6 +266,12 @@
"node": ">= 8"
}
},
"node_modules/arg": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
"dev": true
},
"node_modules/asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -500,6 +573,12 @@
"node": ">=8"
}
},
"node_modules/create-require": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
"integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
"dev": true
},
"node_modules/crypto-random-string": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
@@ -579,6 +658,15 @@
"node": ">=0.4.0"
}
},
"node_modules/diff": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
"dev": true,
"engines": {
"node": ">=0.3.1"
}
},
"node_modules/discord-api-types": {
"version": "0.26.1",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.26.1.tgz",
@@ -1088,6 +1176,12 @@
"semver": "bin/semver.js"
}
},
"node_modules/make-error": {
"version": "1.3.6",
"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
"dev": true
},
"node_modules/mime-db": {
"version": "1.51.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
@@ -1593,6 +1687,47 @@
"resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.0.tgz",
"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==",
"dev": true,
"dependencies": {
"@cspotcode/source-map-support": "0.7.0",
"@tsconfig/node10": "^1.0.7",
"@tsconfig/node12": "^1.0.7",
"@tsconfig/node14": "^1.0.0",
"@tsconfig/node16": "^1.0.2",
"acorn": "^8.4.1",
"acorn-walk": "^8.1.1",
"arg": "^4.1.0",
"create-require": "^1.1.0",
"diff": "^4.0.1",
"make-error": "^1.1.1",
"yn": "3.1.1"
},
"bin": {
"ts-node": "dist/bin.js",
"ts-node-cwd": "dist/bin-cwd.js",
"ts-node-script": "dist/bin-script.js",
"ts-node-transpile-only": "dist/bin-transpile.js",
"ts-script": "dist/bin-script-deprecated.js"
},
"peerDependencies": {
"@swc/core": ">=1.2.50",
"@swc/wasm": ">=1.2.50",
"@types/node": "*",
"typescript": ">=2.7"
},
"peerDependenciesMeta": {
"@swc/core": {
"optional": true
},
"@swc/wasm": {
"optional": true
}
}
},
"node_modules/tslib": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
@@ -1807,6 +1942,15 @@
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
"dev": true
},
"node_modules/yn": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
"dev": true,
"engines": {
"node": ">=6"
}
},
"node_modules/zod": {
"version": "3.11.6",
"resolved": "https://registry.npmjs.org/zod/-/zod-3.11.6.tgz",
@@ -1817,6 +1961,21 @@
}
},
"dependencies": {
"@cspotcode/source-map-consumer": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz",
"integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==",
"dev": true
},
"@cspotcode/source-map-support": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz",
"integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==",
"dev": true,
"requires": {
"@cspotcode/source-map-consumer": "0.8.0"
}
},
"@discordjs/builders": {
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.11.0.tgz",
@@ -1880,6 +2039,30 @@
"defer-to-connect": "^1.0.1"
}
},
"@tsconfig/node10": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
"integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
"dev": true
},
"@tsconfig/node12": {
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
"integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
"dev": true
},
"@tsconfig/node14": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
"integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
"dev": true
},
"@tsconfig/node16": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
"integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
"dev": true
},
"@types/node": {
"version": "17.0.13",
"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.13.tgz",
@@ -1920,6 +2103,18 @@
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
"dev": true
},
"acorn": {
"version": "8.7.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
"dev": true
},
"acorn-walk": {
"version": "8.2.0",
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
"dev": true
},
"ansi-align": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
@@ -1954,6 +2149,12 @@
"picomatch": "^2.0.4"
}
},
"arg": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
"dev": true
},
"asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -2182,6 +2383,12 @@
"xdg-basedir": "^4.0.0"
}
},
"create-require": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
"integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
"dev": true
},
"crypto-random-string": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
@@ -2240,6 +2447,12 @@
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
},
"diff": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
"dev": true
},
"discord-api-types": {
"version": "0.26.1",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.26.1.tgz",
@@ -2613,6 +2826,12 @@
}
}
},
"make-error": {
"version": "1.3.6",
"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
"dev": true
},
"mime-db": {
"version": "1.51.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
@@ -2992,6 +3211,26 @@
"resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.0.tgz",
"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==",
"dev": true,
"requires": {
"@cspotcode/source-map-support": "0.7.0",
"@tsconfig/node10": "^1.0.7",
"@tsconfig/node12": "^1.0.7",
"@tsconfig/node14": "^1.0.0",
"@tsconfig/node16": "^1.0.2",
"acorn": "^8.4.1",
"acorn-walk": "^8.1.1",
"arg": "^4.1.0",
"create-require": "^1.1.0",
"diff": "^4.0.1",
"make-error": "^1.1.1",
"yn": "3.1.1"
}
},
"tslib": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
@@ -3151,6 +3390,12 @@
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
"dev": true
},
"yn": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
"dev": true
},
"zod": {
"version": "3.11.6",
"resolved": "https://registry.npmjs.org/zod/-/zod-3.11.6.tgz",

View File

@@ -31,6 +31,7 @@
"devDependencies": {
"@types/node": "^17.0.13",
"npm-watch": "^0.11.0",
"ts-node": "^10.4.0",
"typescript": "^4.5.5"
},
"dependencies": {

View File

@@ -1,4 +1,5 @@
import * as cheerio from 'cheerio';
import { CommandInteraction } from 'discord.js';
import { IncomingMessage } from 'http';
import http from 'https';
@@ -148,4 +149,15 @@ export async function getPlayer(name: string): Promise<uniteApiData|null> {
return null;
}
export async function getPlayerInteraction(interaction: CommandInteraction): Promise<void> {
let username = interaction.options.getString('username', true);
interaction.deferReply();
let data = await getPlayer(username);
if (data === null)
await interaction.reply('Unable to find user');
else
await interaction.reply('```\n'+JSON.stringify(data, null, 2)+'\n```');
}
//await getPlayer('IanWhysp')

View File

@@ -1,10 +1,44 @@
import { REST } from '@discordjs/rest';
import { Routes } from 'discord-api-types/v9';
const commands = [{
name: 'queue',
description: 'creates a queue'
}];
const commands = [
{
name: 'queue',
description: 'creates a queue',
options: [
{
type: 4, //INTEGER
name: 'teamsize',
description: 'size of each team',
required: true
}
]
},
{
name: 'join',
description: 'joins the active queue'
},
{
name: 'ready',
description: 'readys the queue and displays team info'
},
{
name: 'queueinfo',
description: 'gets info of the current queue'
},
{
name: 'elo',
description: 'displays your elo information',
options: [
{
type: 3, //STRING
name: 'username',
description: 'your in game name',
required: true
}
]
}
];
/**
* register/reload commands on guild(s)

View File

@@ -1,8 +1,9 @@
import { Client, Intents } from 'discord.js';
import * as fs from 'fs';
import { getPlayerInteraction } from './api';
import { registerCommands } from './discord';
import { createQueue } from './queue';
import { createQueue, joinQueue, queueInfo } from './queue';
const CLIENT = new Client({ intents: [Intents.FLAGS.GUILDS] });
if (!fs.existsSync('./token')) {
@@ -22,7 +23,15 @@ CLIENT.on('interactionCreate', async interaction => {
if (!interaction.isCommand()) return;
if (interaction.commandName === 'queue')
createQueue(interaction);
await createQueue(interaction);
else if (interaction.commandName === 'join')
await joinQueue(interaction);
//else if (interaction.commandName === 'ready')
// await readyQueue(interaction);
else if (interaction.commandName === 'queueinfo')
await queueInfo(interaction);
else if (interaction.commandName === 'elo')
await getPlayerInteraction(interaction);
});
CLIENT.login(TOKEN);
CLIENT.login(TOKEN);

View File

@@ -1,5 +1,86 @@
import { CommandInteraction } from "discord.js";
import { CommandInteraction, GuildMember } from "discord.js";
export function createQueue(interaction: CommandInteraction) {
type queueInfo = {
players: GuildMember[],
initiator: GuildMember,
teamsize: number
}
//maps ChannelID to QueueInfo
const QUEUE = new Map<string, queueInfo>();
export async function createQueue(interaction: CommandInteraction) {
console.log('COMMAND createQueue')
let member = interaction.member;
if (!(member instanceof GuildMember)) {
await interaction.reply('Unable to retrieve guild member information, please try again');
return;
}
let channelId = interaction.channelId;
if (QUEUE.has(channelId)) {
await interaction.reply('There is already an active queue in this channel, type `/join` to join');
return;
}
QUEUE.set(channelId, {
players: [],
initiator: member,
teamsize: interaction.options.getInteger('teamsize', true)
});
await interaction.reply('Queue has been created, type `/join` to join');
}
export async function joinQueue(interaction: CommandInteraction) {
console.log('COMMAND joinQueue')
let member = interaction.member;
if (!(member instanceof GuildMember)) {
await interaction.reply('Unable to retrieve guild member information, please try again');
return;
}
let channelId = interaction.channelId;
let info = QUEUE.get(channelId);
if (!info) {
await interaction.reply('There is not an active queue in this channel, type `/queue` to create one');
return;
}
info.players.push(member);
QUEUE.set(channelId, info);
await interaction.reply('Joined the queue');
}
export async function queueInfo(interaction: CommandInteraction) {
console.log('COMMAND queueInfo')
let channelId = interaction.channelId,
info = QUEUE.get(channelId);
if (!info) {
await interaction.reply('There is not an active queue in this channel, type `/queue` to create one');
return;
}
await interaction.reply('```'+`
players: ${info.players.map(p => p.user.tag).join('\n ')}
initiator: ${info.initiator.user.tag}
teamsize: ${info.teamsize}
`+'```')
}