From 6d5b33bed47b1a5bb4f510557f62b118778c73e2 Mon Sep 17 00:00:00 2001 From: Flummi Date: Mon, 4 Dec 2017 12:22:53 +0100 Subject: [PATCH] es6 native --- .gitlab-ci.yml | 27 ------------------- package.json | 11 +------- src/{bot.js => bot.mjs} | 17 ++++++++---- src/inc/{admin.js => admin.mjs} | 2 +- src/inc/{cfg.js => cfg.mjs} | 2 +- src/inc/clients/{irc.js => irc.mjs} | 23 ++++++++-------- src/inc/clients/irc/{cap.js => cap.mjs} | 2 +- src/inc/clients/irc/{invite.js => invite.mjs} | 2 +- src/inc/clients/irc/{join.js => join.mjs} | 2 +- src/inc/clients/irc/main.mjs | 19 +++++++++++++ src/inc/clients/irc/{motd.js => motd.mjs} | 2 +- src/inc/clients/irc/{msg.js => msg.mjs} | 2 +- src/inc/clients/irc/{nick.js => nick.mjs} | 2 +- src/inc/clients/irc/{part.js => part.mjs} | 2 +- src/inc/clients/irc/{ping.js => ping.mjs} | 2 +- src/inc/clients/irc/{pwdreq.js => pwdreq.mjs} | 2 +- .../clients/irc/{welcome.js => welcome.mjs} | 2 +- src/inc/clients/irc/{who.js => who.mjs} | 2 +- src/inc/clients/irc/{whois.js => whois.mjs} | 4 +-- src/inc/clients/{tg.js => tg.mjs} | 10 +++---- src/inc/{log.js => log.mjs} | 11 ++++---- src/inc/{spurdo.js => spurdo.mjs} | 0 src/inc/sql.js | 4 --- src/inc/sql.mjs | 7 +++++ src/inc/trigger/{cfg.js => cfg.mjs} | 4 +-- src/inc/trigger/{coins.js => coins.mjs} | 4 +-- src/inc/trigger/{core.js => core.mjs} | 6 ++--- src/inc/trigger/{debug.js => debug.mjs} | 6 ++--- src/inc/trigger/{drugs.js => drugs.mjs} | 4 +-- src/inc/trigger/{kernel.js => kernel.mjs} | 4 +-- .../trigger/lib/{sandbox.js => sandbox.mjs} | 4 +-- src/inc/trigger/main.mjs | 22 +++++++++++++++ src/inc/trigger/{mcmaniac.js => mcmaniac.mjs} | 4 +-- src/inc/trigger/{parser.js => parser.mjs} | 6 ++--- src/inc/trigger/{quotes.js => quotes.mjs} | 4 +-- src/inc/trigger/{rape.js => rape.mjs} | 4 +-- src/inc/trigger/{sandbox.js => sandbox.mjs} | 12 ++++----- src/inc/trigger/{urban.js => urban.mjs} | 4 +-- .../{useless_nxy.js => useless_nxy.mjs} | 7 +++-- .../{useless_uwe.js => useless_uwe.mjs} | 9 ++++--- src/inc/trigger/{wttr.js => wttr.mjs} | 4 +-- src/inc/{wrapper.js => wrapper.mjs} | 13 ++++----- 42 files changed, 149 insertions(+), 131 deletions(-) delete mode 100644 .gitlab-ci.yml rename src/{bot.js => bot.mjs} (83%) rename src/inc/{admin.js => admin.mjs} (97%) rename src/inc/{cfg.js => cfg.mjs} (98%) rename src/inc/clients/{irc.js => irc.mjs} (93%) rename src/inc/clients/irc/{cap.js => cap.mjs} (95%) rename src/inc/clients/irc/{invite.js => invite.mjs} (92%) rename src/inc/clients/irc/{join.js => join.mjs} (79%) create mode 100644 src/inc/clients/irc/main.mjs rename src/inc/clients/irc/{motd.js => motd.mjs} (93%) rename src/inc/clients/irc/{msg.js => msg.mjs} (92%) rename src/inc/clients/irc/{nick.js => nick.mjs} (89%) rename src/inc/clients/irc/{part.js => part.mjs} (80%) rename src/inc/clients/irc/{ping.js => ping.mjs} (80%) rename src/inc/clients/irc/{pwdreq.js => pwdreq.mjs} (86%) rename src/inc/clients/irc/{welcome.js => welcome.mjs} (85%) rename src/inc/clients/irc/{who.js => who.mjs} (93%) rename src/inc/clients/irc/{whois.js => whois.mjs} (97%) rename src/inc/clients/{tg.js => tg.mjs} (95%) rename src/inc/{log.js => log.mjs} (57%) rename src/inc/{spurdo.js => spurdo.mjs} (100%) delete mode 100644 src/inc/sql.js create mode 100644 src/inc/sql.mjs rename src/inc/trigger/{cfg.js => cfg.mjs} (97%) rename src/inc/trigger/{coins.js => coins.mjs} (96%) rename src/inc/trigger/{core.js => core.mjs} (97%) rename src/inc/trigger/{debug.js => debug.mjs} (89%) rename src/inc/trigger/{drugs.js => drugs.mjs} (95%) rename src/inc/trigger/{kernel.js => kernel.mjs} (85%) rename src/inc/trigger/lib/{sandbox.js => sandbox.mjs} (97%) create mode 100644 src/inc/trigger/main.mjs rename src/inc/trigger/{mcmaniac.js => mcmaniac.mjs} (96%) rename src/inc/trigger/{parser.js => parser.mjs} (91%) rename src/inc/trigger/{quotes.js => quotes.mjs} (98%) rename src/inc/trigger/{rape.js => rape.mjs} (96%) rename src/inc/trigger/{sandbox.js => sandbox.mjs} (93%) rename src/inc/trigger/{urban.js => urban.mjs} (92%) rename src/inc/trigger/{useless_nxy.js => useless_nxy.mjs} (98%) rename src/inc/trigger/{useless_uwe.js => useless_uwe.mjs} (98%) rename src/inc/trigger/{wttr.js => wttr.mjs} (98%) rename src/inc/{wrapper.js => wrapper.mjs} (73%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 14269ca..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,27 +0,0 @@ -image: node:latest - -stages: - - build - - babel - -cache: - paths: - - node_modules/ - - dist/ - -install_dependencies: - stage: build - script: - - npm install - artifacts: - paths: - - node_modules/ - expire_in: 1 hour - -babel_compile: - stage: babel - script: npm run build - artifacts: - paths: - - dist/ - expire_in: 1 week \ No newline at end of file diff --git a/package.json b/package.json index 5e5bff7..312cdb0 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,7 @@ "description": "Bot, kennste?", "main": "bot.js", "scripts": { - "build": "./node_modules/.bin/babel src --presets=env --plugins=add-module-exports --out-dir dist", - "debug": "npm run rmlog && npm run build && node --inspect=9229 dist/bot.js", - "start": "npm run build && node dist/bot.js", + "start": "npm run rmlog && node --experimental-modules src/bot.mjs", "rmlog": "rm logs/*.log || true" }, "author": "Flummi & jkhsjdhjs", @@ -18,13 +16,6 @@ "request-promise": "^4.2.2", "stringify-object": "^3.2.1", "winston": "^2.4.0", - "youtube-dl": "^1.12.2", "ytdl-core": "^0.18.2" - }, - "devDependencies": { - "babel-cli": "^6.26.0", - "babel-core": "^6.26.0", - "babel-plugin-add-module-exports": "^0.2.1", - "babel-preset-env": "^1.6.1" } } diff --git a/src/bot.js b/src/bot.mjs similarity index 83% rename from src/bot.js rename to src/bot.mjs index 5841ba1..9b06afa 100644 --- a/src/bot.js +++ b/src/bot.mjs @@ -1,7 +1,9 @@ -import { logger } from "./inc/log.js"; -import { read, cfg } from "./inc/cfg.js"; -import { wrapper } from "./inc/wrapper.js"; -const fs = require("fs"); +import { logger } from "./inc/log"; +import { read, cfg } from "./inc/cfg"; +import { wrapper } from "./inc/wrapper"; +import fs from "fs"; + +import triggers from "./inc/trigger/main"; read().then(() => { let bot = new wrapper(); @@ -11,11 +13,16 @@ read().then(() => { trigger: trigger }; - fs.readdirSync(`${__dirname}/inc/trigger/`).forEach(file => { + /*fs.readdirSync(`${__dirname}/inc/trigger/`).forEach(file => { if(file.substr(-3, 3) === ".js") { logger.info(`(main) loading trigger: ${file}`); require(`${__dirname}/inc/trigger/${file}`)(self); } + });*/ + + triggers.forEach((mod, i) => { + logger.info(`(main) loading trigger: ${i}`) + mod(self); }); bot.on("message", e => { // Todo: eventhandler diff --git a/src/inc/admin.js b/src/inc/admin.mjs similarity index 97% rename from src/inc/admin.js rename to src/inc/admin.mjs index 9ed1415..2d7bf40 100644 --- a/src/inc/admin.js +++ b/src/inc/admin.mjs @@ -1,4 +1,4 @@ -import sql from "./sql.js"; +import sql from "./sql"; export let admins = []; export const loadAdmins = () => { diff --git a/src/inc/cfg.js b/src/inc/cfg.mjs similarity index 98% rename from src/inc/cfg.js rename to src/inc/cfg.mjs index e3b7f51..0dc4284 100644 --- a/src/inc/cfg.js +++ b/src/inc/cfg.mjs @@ -1,4 +1,4 @@ -import sql from "./sql.js"; +import sql from "./sql"; let cfg = { client: {}, diff --git a/src/inc/clients/irc.js b/src/inc/clients/irc.mjs similarity index 93% rename from src/inc/clients/irc.js rename to src/inc/clients/irc.mjs index 7235863..7d8bef6 100644 --- a/src/inc/clients/irc.js +++ b/src/inc/clients/irc.mjs @@ -1,5 +1,13 @@ -import { logger } from "../log.js"; -import { getLevel } from "../admin.js"; +import { logger } from "../log"; +import { getLevel } from "../admin"; + +import modules from "./irc/main"; + +import net from "net"; +import tls from "tls"; +import EventEmitter from "events"; +import util from "util"; +import fs from "fs"; const colors = { red: "\x0304$1\x0304", @@ -13,12 +21,6 @@ const replaceColor = (match, color, text) => { return text; }; -const net = require("net") - , tls = require("tls") - , EventEmitter = require("events").EventEmitter - , util = require("util") - , fs = require("fs"); - export class irc { constructor(options) { EventEmitter.call(this); @@ -37,9 +39,8 @@ export class irc { this._recachetime = 60 * 30; // 30 minutes this._cmd = new Map(); - fs.readdirSync(`${__dirname}/irc/`).forEach(file => { - logger.debug(`(${this.network}) loading cmd: ${file}`); - require(`${__dirname}/irc/${file}`)(this); + modules.forEach(mod => { + mod(this); }); this.server = { diff --git a/src/inc/clients/irc/cap.js b/src/inc/clients/irc/cap.mjs similarity index 95% rename from src/inc/clients/irc/cap.js rename to src/inc/clients/irc/cap.mjs index b41999e..b29ca52 100644 --- a/src/inc/clients/irc/cap.js +++ b/src/inc/clients/irc/cap.mjs @@ -1,4 +1,4 @@ -module.exports = client => { +export default client => { client._cmd.set("CAP", function (msg) { // capkram switch (msg.params[1]) { case "LS": // list diff --git a/src/inc/clients/irc/invite.js b/src/inc/clients/irc/invite.mjs similarity index 92% rename from src/inc/clients/irc/invite.js rename to src/inc/clients/irc/invite.mjs index 6a2cf28..e42db27 100644 --- a/src/inc/clients/irc/invite.js +++ b/src/inc/clients/irc/invite.mjs @@ -1,4 +1,4 @@ -module.exports = client => { +export default client => { client._cmd.set("INVITE", function (msg) { // invite const user = this.parsePrefix(msg.prefix); const channel = msg.params[1]; diff --git a/src/inc/clients/irc/join.js b/src/inc/clients/irc/join.mjs similarity index 79% rename from src/inc/clients/irc/join.js rename to src/inc/clients/irc/join.mjs index 5ec6d7d..592098e 100644 --- a/src/inc/clients/irc/join.js +++ b/src/inc/clients/irc/join.mjs @@ -1,4 +1,4 @@ -module.exports = client => { +export default client => { client._cmd.set("JOIN", function (msg) { // join this.send(`WHO ${msg.params[0]}`); }.bind(client)); diff --git a/src/inc/clients/irc/main.mjs b/src/inc/clients/irc/main.mjs new file mode 100644 index 0000000..cf38e7a --- /dev/null +++ b/src/inc/clients/irc/main.mjs @@ -0,0 +1,19 @@ +import cap from "./cap"; +import invite from "./invite"; +import join from "./join"; +import motd from "./motd"; +import msg from "./msg"; +import nick from "./nick"; +import part from "./part"; +import ping from "./ping"; +import pwdreq from "./pwdreq"; +import welcome from "./welcome"; +import who from "./who"; +import whois from "./whois"; + +export default [ + cap, invite, join, + motd, msg, nick, + part, ping, pwdreq, + welcome, who, whois +]; \ No newline at end of file diff --git a/src/inc/clients/irc/motd.js b/src/inc/clients/irc/motd.mjs similarity index 93% rename from src/inc/clients/irc/motd.js rename to src/inc/clients/irc/motd.mjs index 0a462fd..ac1232d 100644 --- a/src/inc/clients/irc/motd.js +++ b/src/inc/clients/irc/motd.mjs @@ -1,4 +1,4 @@ -module.exports = client => { +export default client => { client._cmd.set("372", function (msg) { // motd_entry this.server.motd += `${msg.params[1]}\n`; }.bind(client)); diff --git a/src/inc/clients/irc/msg.js b/src/inc/clients/irc/msg.mjs similarity index 92% rename from src/inc/clients/irc/msg.js rename to src/inc/clients/irc/msg.mjs index c05ef34..8fcd0ca 100644 --- a/src/inc/clients/irc/msg.js +++ b/src/inc/clients/irc/msg.mjs @@ -1,4 +1,4 @@ -module.exports = client => { +export default client => { client._cmd.set("PRIVMSG", function (msg) { // privmsg this.emit("data", msg.params[1] === "\u0001VERSION\u0001" ? ["ctcp:version", this.reply(msg)] : ["message", this.reply(msg)]); }.bind(client)); diff --git a/src/inc/clients/irc/nick.js b/src/inc/clients/irc/nick.mjs similarity index 89% rename from src/inc/clients/irc/nick.js rename to src/inc/clients/irc/nick.mjs index 1b29d12..70e4fbb 100644 --- a/src/inc/clients/irc/nick.js +++ b/src/inc/clients/irc/nick.mjs @@ -1,4 +1,4 @@ -module.exports = client => { +export default client => { client._cmd.set("NICK", function (msg) { // nickchange let prefix = this.parsePrefix(msg.prefix); if (this.server.user.hasi(prefix.nick)) diff --git a/src/inc/clients/irc/part.js b/src/inc/clients/irc/part.mjs similarity index 80% rename from src/inc/clients/irc/part.js rename to src/inc/clients/irc/part.mjs index 82d586b..f4745a9 100644 --- a/src/inc/clients/irc/part.js +++ b/src/inc/clients/irc/part.mjs @@ -1,4 +1,4 @@ -module.exports = client => { +export default client => { client._cmd.set("PART", function (msg) { // part //delete this.server.user[msg.params[0]]; }.bind(client)); diff --git a/src/inc/clients/irc/ping.js b/src/inc/clients/irc/ping.mjs similarity index 80% rename from src/inc/clients/irc/ping.js rename to src/inc/clients/irc/ping.mjs index 7221778..0d0608d 100644 --- a/src/inc/clients/irc/ping.js +++ b/src/inc/clients/irc/ping.mjs @@ -1,4 +1,4 @@ -module.exports = client => { +export default client => { client._cmd.set("PING", function (msg) { // ping this.send(`PONG ${msg.params.join``}`); }.bind(client)); diff --git a/src/inc/clients/irc/pwdreq.js b/src/inc/clients/irc/pwdreq.mjs similarity index 86% rename from src/inc/clients/irc/pwdreq.js rename to src/inc/clients/irc/pwdreq.mjs index 216961f..2a28108 100644 --- a/src/inc/clients/irc/pwdreq.js +++ b/src/inc/clients/irc/pwdreq.mjs @@ -1,4 +1,4 @@ -module.exports = client => { +export default client => { client._cmd.set("464", function (msg) { // motd_entry if (this.options.password.length > 0 && !this.options.sasl) this.send(`PASS ${this.options.password}`); diff --git a/src/inc/clients/irc/welcome.js b/src/inc/clients/irc/welcome.mjs similarity index 85% rename from src/inc/clients/irc/welcome.js rename to src/inc/clients/irc/welcome.mjs index f644b28..800cc65 100644 --- a/src/inc/clients/irc/welcome.js +++ b/src/inc/clients/irc/welcome.mjs @@ -1,4 +1,4 @@ -module.exports = client => { +export default client => { client._cmd.set("001", function (msg) { // welcome this.join(this.options.channels); this.emit("data", ["connected", msg.params[1]]); diff --git a/src/inc/clients/irc/who.js b/src/inc/clients/irc/who.mjs similarity index 93% rename from src/inc/clients/irc/who.js rename to src/inc/clients/irc/who.mjs index 3616827..c3a3f09 100644 --- a/src/inc/clients/irc/who.js +++ b/src/inc/clients/irc/who.mjs @@ -1,4 +1,4 @@ -module.exports = client => { +export default client => { client._cmd.set("352", function (msg) { // who_entry if (!this.server.channel[msg.params[1]]) this.server.channel[msg.params[1]] = new Map(); diff --git a/src/inc/clients/irc/whois.js b/src/inc/clients/irc/whois.mjs similarity index 97% rename from src/inc/clients/irc/whois.js rename to src/inc/clients/irc/whois.mjs index bd6d3a9..4ea1cb5 100644 --- a/src/inc/clients/irc/whois.js +++ b/src/inc/clients/irc/whois.mjs @@ -1,6 +1,6 @@ -import { getLevel } from "../../admin.js"; +import { getLevel } from "../../admin"; -module.exports = client => { +export default client => { client._cmd.set("307", function (msg) { // whois_identified (ircd-hybrid) let tmpuser = {}; if (this.server.user.hasi(msg.params[1])) diff --git a/src/inc/clients/tg.js b/src/inc/clients/tg.mjs similarity index 95% rename from src/inc/clients/tg.js rename to src/inc/clients/tg.mjs index 29fdec7..5e26f5f 100644 --- a/src/inc/clients/tg.js +++ b/src/inc/clients/tg.mjs @@ -1,9 +1,9 @@ -import { logger } from "../log.js"; -import { getLevel } from "../admin.js"; -import { spurdo } from "../spurdo.js"; +import { logger } from "../log.mjs"; +import { getLevel } from "../admin.mjs"; +import { spurdo } from "../spurdo.mjs"; -const rp = require("request-promise") - , EventEmitter = require("events").EventEmitter; +import rp from "request-promise"; +import EventEmitter from "events"; export class tg extends EventEmitter { constructor(options) { diff --git a/src/inc/log.js b/src/inc/log.mjs similarity index 57% rename from src/inc/log.js rename to src/inc/log.mjs index a0c9fae..62a47f4 100644 --- a/src/inc/log.js +++ b/src/inc/log.mjs @@ -1,20 +1,21 @@ -const winston = require("winston"); +//const winston = require("winston"); +import winston from "winston"; const logger = new (winston.Logger)({ transports: [ new (winston.transports.File)({ name: "debug-file", - filename: `${__dirname}/../../logs/${~~(Date.now() / 1000)}_debug.log`, + filename: `./logs/${~~(Date.now() / 1000)}_debug.log`, level: "debug" }), new (winston.transports.File)({ name: "info-file", - filename: `${__dirname}/../../logs/${~~(Date.now() / 1000)}_info.log`, + filename: `./logs/${~~(Date.now() / 1000)}_info.log`, level: "info" }), new (winston.transports.File)({ name: "error-file", - filename: `${__dirname}/../../logs/${~~(Date.now() / 1000)}_error.log`, + filename: `./logs/${~~(Date.now() / 1000)}_error.log`, level: "error" }), new (winston.transports.Console)({ @@ -23,4 +24,4 @@ const logger = new (winston.Logger)({ ] }); -export default { logger }; \ No newline at end of file +export { logger }; \ No newline at end of file diff --git a/src/inc/spurdo.js b/src/inc/spurdo.mjs similarity index 100% rename from src/inc/spurdo.js rename to src/inc/spurdo.mjs diff --git a/src/inc/sql.js b/src/inc/sql.js deleted file mode 100644 index 4443bc7..0000000 --- a/src/inc/sql.js +++ /dev/null @@ -1,4 +0,0 @@ -const pgp = require("pg-promise")(); -const sql = pgp(require(`${__dirname}/../../cfg/sql.json`)); -//const sql = mysql.getInstance( require(`${__dirname}/../../cfg/mysql.json`) ); -export default sql; \ No newline at end of file diff --git a/src/inc/sql.mjs b/src/inc/sql.mjs new file mode 100644 index 0000000..4c11db4 --- /dev/null +++ b/src/inc/sql.mjs @@ -0,0 +1,7 @@ +import PG from "pg-promise"; +import { default as cfg } from "../../cfg/sql.json"; + +//const pgp = new PG(); +const sql = (new PG())(cfg); + +export default sql; \ No newline at end of file diff --git a/src/inc/trigger/cfg.js b/src/inc/trigger/cfg.mjs similarity index 97% rename from src/inc/trigger/cfg.js rename to src/inc/trigger/cfg.mjs index 1b331f9..5b597d3 100644 --- a/src/inc/trigger/cfg.js +++ b/src/inc/trigger/cfg.mjs @@ -1,4 +1,4 @@ -import { read, write, cfg } from "../cfg.js"; +import { read, write, cfg } from "../cfg"; const _modes = ["get", "set", "rm", "add", "opts"]; const _opts = { @@ -7,7 +7,7 @@ const _opts = { }; const _debug = false; -module.exports = bot => { +export default bot => { bot._trigger.set("cfg", new bot.trigger({ call: /^\!cfg/i, level: 100, diff --git a/src/inc/trigger/coins.js b/src/inc/trigger/coins.mjs similarity index 96% rename from src/inc/trigger/coins.js rename to src/inc/trigger/coins.mjs index 9397ed5..cf77d5e 100644 --- a/src/inc/trigger/coins.js +++ b/src/inc/trigger/coins.mjs @@ -1,4 +1,4 @@ -const rp = require("request-promise"); +import rp from "request-promise"; const api_url = ({ market, crypto, currency }) => `https://api.cryptowat.ch/markets/${market}/${crypto}${currency}/summary`; const currencies = { @@ -14,7 +14,7 @@ const markets = { xmr: "bitfinex" }; -module.exports = bot => { +export default bot => { bot._trigger.set("coins", new bot.trigger({ call: /^(\.|\/)(btc|eth|xmr)/i, f: e => { diff --git a/src/inc/trigger/core.js b/src/inc/trigger/core.mjs similarity index 97% rename from src/inc/trigger/core.js rename to src/inc/trigger/core.mjs index af92920..4e482f2 100644 --- a/src/inc/trigger/core.js +++ b/src/inc/trigger/core.mjs @@ -1,7 +1,7 @@ -import sql from "../sql.js"; -import { getLevel, loadAdmins } from "../admin.js"; +import sql from "../sql"; +import { getLevel, loadAdmins } from "../admin"; -module.exports = bot => { +export default bot => { bot._trigger.set("join", new bot.trigger({ call: /^\!join .*/i, level: 100, diff --git a/src/inc/trigger/debug.js b/src/inc/trigger/debug.mjs similarity index 89% rename from src/inc/trigger/debug.js rename to src/inc/trigger/debug.mjs index ebdad8b..916bbeb 100644 --- a/src/inc/trigger/debug.js +++ b/src/inc/trigger/debug.mjs @@ -1,6 +1,6 @@ -import { admins, getLevel } from "../admin.js"; +import { admins, getLevel } from "../admin"; -const vm = require("vm"); +import vm from "vm"; let maxoutput = 750; let context = vm.createContext({ @@ -8,7 +8,7 @@ let context = vm.createContext({ bot: null, admins: null, }); -module.exports = bot => { +export default bot => { bot._trigger.set("sandbox_debug", new bot.trigger({ call: /^\!debug (.*)/i, level: 100, diff --git a/src/inc/trigger/drugs.js b/src/inc/trigger/drugs.mjs similarity index 95% rename from src/inc/trigger/drugs.js rename to src/inc/trigger/drugs.mjs index 6c473ab..6823112 100644 --- a/src/inc/trigger/drugs.js +++ b/src/inc/trigger/drugs.mjs @@ -1,4 +1,4 @@ -import sql from "../sql.js"; +import sql from "../sql"; const data = { dope_actions: {}, @@ -12,7 +12,7 @@ Object.keys(data).forEach(cur => { }); }); -module.exports = bot => { +export default bot => { bot._trigger.set("dope", new bot.trigger({ call: /^(\.|\/)dope/i, f: e => { diff --git a/src/inc/trigger/kernel.js b/src/inc/trigger/kernel.mjs similarity index 85% rename from src/inc/trigger/kernel.js rename to src/inc/trigger/kernel.mjs index 105a610..fe84402 100644 --- a/src/inc/trigger/kernel.js +++ b/src/inc/trigger/kernel.mjs @@ -1,8 +1,8 @@ -const rp = require("request-promise"); +import rp from "request-promise"; const feed = "https://www.kernel.org/releases.json"; -module.exports = bot => { +export default bot => { bot._trigger.set("kernel", new bot.trigger({ call: /^(\.|\/)kernel/i, f: e => { diff --git a/src/inc/trigger/lib/sandbox.js b/src/inc/trigger/lib/sandbox.mjs similarity index 97% rename from src/inc/trigger/lib/sandbox.js rename to src/inc/trigger/lib/sandbox.mjs index cf19a0d..9538e12 100644 --- a/src/inc/trigger/lib/sandbox.js +++ b/src/inc/trigger/lib/sandbox.mjs @@ -1,5 +1,5 @@ -const rp = require("request-promise") - , fs = require("fs"); +import rp from "request-promise"; +import fs from "fs"; const maxoutput = 500; diff --git a/src/inc/trigger/main.mjs b/src/inc/trigger/main.mjs new file mode 100644 index 0000000..c7ffc1d --- /dev/null +++ b/src/inc/trigger/main.mjs @@ -0,0 +1,22 @@ +import cfg from "./cfg"; +import coins from "./coins"; +import core from "./core"; +import debug from "./debug"; +import drugs from "./drugs"; +import kernel from "./kernel"; +import mcmaniac from "./mcmaniac"; +import parser from "./parser"; +import quotes from "./quotes"; +import rape from "./rape"; +import sandbox from "./sandbox"; +import urban from "./urban"; +import nxy from "./useless_nxy"; +import uwe from "./useless_uwe"; +import wttr from "./wttr"; + +export default [ + cfg, coins, core, debug, + drugs, kernel, mcmaniac, + parser, quotes, rape, sandbox, + urban, nxy, uwe, wttr +]; \ No newline at end of file diff --git a/src/inc/trigger/mcmaniac.js b/src/inc/trigger/mcmaniac.mjs similarity index 96% rename from src/inc/trigger/mcmaniac.js rename to src/inc/trigger/mcmaniac.mjs index 77e375b..c0b7d8b 100644 --- a/src/inc/trigger/mcmaniac.js +++ b/src/inc/trigger/mcmaniac.mjs @@ -1,4 +1,4 @@ -import sql from "../sql.js"; +import sql from "../sql"; let _query_get = ` select item, @@ -12,7 +12,7 @@ let _query_add = ` insert into mcmaniacs (item) values ($1) on conflict do nothing `; -module.exports = bot => { +export default bot => { bot._trigger.set("mcmaniac_add", new bot.trigger({ call: /Mc.*iaC/, active: true, diff --git a/src/inc/trigger/parser.js b/src/inc/trigger/parser.mjs similarity index 91% rename from src/inc/trigger/parser.js rename to src/inc/trigger/parser.mjs index 0310ef3..362e476 100644 --- a/src/inc/trigger/parser.js +++ b/src/inc/trigger/parser.mjs @@ -1,5 +1,5 @@ -const fs = require("fs") - , ytdl = require("ytdl-core"); +import fs from "fs"; +import ytdl from "ytdl-core"; const _args = [ "--no-progress", @@ -11,7 +11,7 @@ const _args = [ ]; -module.exports = bot => { +export default bot => { bot._trigger.set("parser", new bot.trigger({ call: /https?:\/\/[\w-]+(\.[\w-]+)+\.?(:\d+)?(\/\S*)?/gi, active: false, diff --git a/src/inc/trigger/quotes.js b/src/inc/trigger/quotes.mjs similarity index 98% rename from src/inc/trigger/quotes.js rename to src/inc/trigger/quotes.mjs index ce809c4..33e6993 100644 --- a/src/inc/trigger/quotes.js +++ b/src/inc/trigger/quotes.mjs @@ -1,4 +1,4 @@ -import sql from "../sql.js"; +import sql from "../sql"; let _query_get = ` with ranked_quotes as ( @@ -22,7 +22,7 @@ insert into nxy_quotes ($1, $2, $3, $4); `; -module.exports = bot => { +export default bot => { bot._trigger.set("quotes", new bot.trigger({ call: /^(\.|\/)q .*/i, active: true, diff --git a/src/inc/trigger/rape.js b/src/inc/trigger/rape.mjs similarity index 96% rename from src/inc/trigger/rape.js rename to src/inc/trigger/rape.mjs index 7bffdf0..ba762d9 100644 --- a/src/inc/trigger/rape.js +++ b/src/inc/trigger/rape.mjs @@ -1,6 +1,6 @@ -import sql from "../sql.js"; +import sql from "../sql"; -module.exports = bot => { +export default bot => { bot._trigger.set("rape", new bot.trigger({ call: /^(\.|\/)rape/i, f: e => { diff --git a/src/inc/trigger/sandbox.js b/src/inc/trigger/sandbox.mjs similarity index 93% rename from src/inc/trigger/sandbox.js rename to src/inc/trigger/sandbox.mjs index 94f3fc2..985eb3e 100644 --- a/src/inc/trigger/sandbox.js +++ b/src/inc/trigger/sandbox.mjs @@ -1,9 +1,9 @@ -import sql from "../sql.js"; -import { maxoutput, sandbox, bfgen } from "./lib/sandbox.js"; +import sql from "../sql"; +import { maxoutput, sandbox, bfgen } from "./lib/sandbox"; -const vm = require("vm") - , rp = require("request-promise") - , stringify = require("stringify-object"); +import vm from "vm"; +import rp from "request-promise"; +import stringify from "stringify-object"; let _contexts = new Map(); sql.any("select data from useless where trigger = 'sandbox_js'") @@ -14,7 +14,7 @@ sql.any("select data from useless where trigger = 'sandbox_js'") console.log("nichts vorhanden lol", err); }); -module.exports = bot => { +export default bot => { bot._trigger.set("sandbox_js", new bot.trigger({ call: /^\!js (.*)/i, f: e => { diff --git a/src/inc/trigger/urban.js b/src/inc/trigger/urban.mjs similarity index 92% rename from src/inc/trigger/urban.js rename to src/inc/trigger/urban.mjs index 99f6b24..831cfd8 100644 --- a/src/inc/trigger/urban.js +++ b/src/inc/trigger/urban.mjs @@ -1,8 +1,8 @@ -const rp = require("request-promise"); +import rp from "request-promise"; const url = "https://api.urbandictionary.com/v0/define" -module.exports = bot => { +export default bot => { bot._trigger.set("urbandict", new bot.trigger({ call: /^(\.|\/)ud .*/i, f: e => { diff --git a/src/inc/trigger/useless_nxy.js b/src/inc/trigger/useless_nxy.mjs similarity index 98% rename from src/inc/trigger/useless_nxy.js rename to src/inc/trigger/useless_nxy.mjs index 55fbb03..1846784 100644 --- a/src/inc/trigger/useless_nxy.js +++ b/src/inc/trigger/useless_nxy.mjs @@ -1,6 +1,5 @@ -import sql from "../sql.js"; - -const rp = require("request-promise"); +import sql from "../sql"; +import rp from "request-promise"; const data = { yiff: [], @@ -21,7 +20,7 @@ Object.keys(data).forEach(cur => { }); }); -module.exports = bot => { +export default bot => { bot._trigger.set("kiss", new bot.trigger({ call: /^(\.|\/)kiss/i, f: e => { diff --git a/src/inc/trigger/useless_uwe.js b/src/inc/trigger/useless_uwe.mjs similarity index 98% rename from src/inc/trigger/useless_uwe.js rename to src/inc/trigger/useless_uwe.mjs index 9222360..abe8d35 100644 --- a/src/inc/trigger/useless_uwe.js +++ b/src/inc/trigger/useless_uwe.mjs @@ -1,6 +1,7 @@ -import sql from "../sql.js"; -const rp = require("request-promise") - , jsdom = require("jsdom").JSDOM; +import sql from "../sql"; + +import rp from "request-promise"; +import JSDOM from "jsdom"; const data = { abschieben: [], @@ -19,7 +20,7 @@ Object.keys(data).forEach(cur => { }); }); -module.exports = bot => { +export default bot => { bot._trigger.set("abschieben", new bot.trigger({ call: /^(\.|\/)abschieben/i, f: e => { diff --git a/src/inc/trigger/wttr.js b/src/inc/trigger/wttr.mjs similarity index 98% rename from src/inc/trigger/wttr.js rename to src/inc/trigger/wttr.mjs index 3d2a05a..cf291f1 100644 --- a/src/inc/trigger/wttr.js +++ b/src/inc/trigger/wttr.mjs @@ -1,6 +1,6 @@ -const rp = require("request-promise"); +import rp from "request-promise"; -module.exports = bot => { +export default bot => { bot._trigger.set("wttr", new bot.trigger({ call: /^\.wttr .*/i, clients: ["irc"], diff --git a/src/inc/wrapper.js b/src/inc/wrapper.mjs similarity index 73% rename from src/inc/wrapper.js rename to src/inc/wrapper.mjs index 75a8809..757b0f4 100644 --- a/src/inc/wrapper.js +++ b/src/inc/wrapper.mjs @@ -1,9 +1,10 @@ -import { cfg } from "./cfg.js"; -import { irc as irclib } from "./clients/irc.js"; -import { tg as tglib } from "./clients/tg.js"; +import { cfg } from "./cfg"; +import { irc as irclib } from "./clients/irc"; +import { tg as tglib } from "./clients/tg"; + +import util from "util"; +import EventEmitter from "events"; -const util = require("util"); -const EventEmitter = require("events").EventEmitter; const clients = []; const wrapper = function () { @@ -36,4 +37,4 @@ const wrapper = function () { }; util.inherits(wrapper, EventEmitter); -export default { wrapper, clients }; \ No newline at end of file +export { wrapper, clients }; \ No newline at end of file