diff --git a/package.json b/package.json index 7d055d2..2079ecf 100644 --- a/package.json +++ b/package.json @@ -11,10 +11,10 @@ "license": "WTFPL", "dependencies": { "discord.js": "^11.3.0", - "jsdom": "^11.4.0", + "jsdom": "^11.12.0", "long-timeout": "^0.1.1", "pg-promise": "^7.3.2", - "request": "^2.83.0", + "request": "^2.87.0", "request-promise": "^4.2.2", "stringify-object": "^3.2.1", "winston": "^2.4.0", diff --git a/src/inc/trigger/irpg.mjs b/src/inc/trigger/irpg.mjs new file mode 100644 index 0000000..a7bf905 --- /dev/null +++ b/src/inc/trigger/irpg.mjs @@ -0,0 +1,33 @@ +import jsdom from "jsdom"; + +export default bot => { + bot._trigger.set("irpg", new bot.trigger({ + call: /^(\.|\/)irpg/i, + set: "uwe", + active: false, + f: e => { + const user = e.args[0] || e.user.nick; + rp("https://irpg.zneb.org/players.php").then(top => { + let prank = 0 + , i = 1; + const dom = new jsdom.JSDOM(top); + let playerlist = dom.window.document.querySelectorAll("ol > li"); + let player = null; + for(let p of playerlist) { + if (p.innerHTML.includes(`player=${user}">`)) { + prank = i; + player = p; + break; + } + i++; + } + if(player !== null) { + const [, plevel, pclass, puntil] = player.innerHTML.match(/.*, the level (.*?) (.*?)\. Next level in (.*?)\./); + e.reply(`([i]${prank} / ${playerlist.length}[/i]) [b]${user}[/b], the [b]${pclass}[/b]: level: ${plevel}, next level in ${puntil}.`); + } + else + e.reply(`player [b]${user}[/b] was not found`); + }); + } + })); +}; \ No newline at end of file diff --git a/src/inc/trigger/useless_uwe.mjs b/src/inc/trigger/useless_uwe.mjs index 8202555..adb1b1e 100644 --- a/src/inc/trigger/useless_uwe.mjs +++ b/src/inc/trigger/useless_uwe.mjs @@ -1,7 +1,6 @@ import sql from "../sql"; import rp from "request-promise"; -import jsdom from "jsdom"; const data = { abschieben: [], @@ -258,36 +257,6 @@ export default bot => { } })); - bot._trigger.set("irpg", new bot.trigger({ - call: /^(\.|\/)irpg/i, - set: "uwe", - f: e => { - const user = e.args[0] || e.user.nick; - rp("https://v6.zneb.org/players.php").then(top => { - let prank = 0 - , i = 1; - const dom = new jsdom.JSDOM(top); - let playerlist = dom.window.document.querySelectorAll("ol > li"); - let player = null; - for(let p of playerlist) { - if (p.innerHTML.includes(`player=${user}">`)) { - prank = i; - player = p; - break; - } - i++; - } - if(player !== null) { - const [, plevel, pclass, puntil] = player.innerHTML.match(/.*, the level (.*?) (.*?)\. Next level in (.*?)\./); - e.reply(`([i]${prank} / ${playerlist.length}[/i]) [b]${user}[/b], the [b]${pclass}[/b]: level: ${plevel}, next level in ${puntil}.`); - } - else - e.reply(`player [b]${user}[/b] was not found`); - }); - - } - })); - bot._trigger.set("blah", new bot.trigger({ call: /^[A-ZÄÖÜẞ](?: [A-ZÄÖÜẞ]){1,5}$/, set: "uwe",