From a225922753396b0b006078fae59fdfaceeb91119 Mon Sep 17 00:00:00 2001
From: Flummi <flummi@f0ck.space>
Date: Thu, 1 Mar 2018 07:02:33 +0100
Subject: [PATCH] es6ify

---
 src/bot.mjs         | 30 ++++++++-------------
 src/inc/wrapper.mjs | 65 +++++++++++++++++++++++----------------------
 2 files changed, 44 insertions(+), 51 deletions(-)

diff --git a/src/bot.mjs b/src/bot.mjs
index 378f27f..a899223 100644
--- a/src/bot.mjs
+++ b/src/bot.mjs
@@ -6,28 +6,20 @@ import triggers from "./inc/trigger";
 import events from "./inc/events";
 
 read().then(() => {
-  let bot = new wrapper();
-
   const self = {
     _trigger: new Map(),
-    trigger: trigger,
-    bot: bot
+    trigger: function trigger(args) {
+      this.call = args.call;
+      this.help = args.help || false;
+      this.level = args.level || 0;
+      this.active = args.hasOwnProperty("active") ? args.active : true;
+      this.set = args.set || "all"; // uwe, nxy, f0ck, all
+      this.clients = args.clients || ["irc", "tg", "discord"];
+      this.f = args.f;
+    },
+    bot: new wrapper()
   };
 
   triggers.forEach(mod => mod(self));
   events.forEach(event => event(self));
-  
-})
-.catch(err => {
-  logger.error(`(main) ${err.message}`);
-});
-
-function trigger(args) {
-  this.call = args.call;
-  this.help = args.help || false;
-  this.level = args.level || 0;
-  this.active = args.hasOwnProperty("active") ? args.active : true;
-  this.set = args.set || "all"; // uwe, nxy, f0ck, all
-  this.clients = args.clients || ["irc", "tg", "discord"];
-  this.f = args.f;
-}
\ No newline at end of file
+}).catch(err => logger.error(`(main) ${err.message}`));
diff --git a/src/inc/wrapper.mjs b/src/inc/wrapper.mjs
index e801176..b90eb13 100644
--- a/src/inc/wrapper.mjs
+++ b/src/inc/wrapper.mjs
@@ -3,46 +3,47 @@ import { irc as irclib } from "../clients/irc";
 import { tg as tglib } from "../clients/tg";
 import { discord as discordlib } from "../clients/discord";
 
-import util from "util";
 import EventEmitter from "events";
 
 const clients = [];
 
-const wrapper = function () {
-  for (let srv in cfg.client) {
-    if(cfg.client[srv].val.enabled) {
-      switch (cfg.client[srv].val.type) {
-      case "irc":
-        clients.push({
-          name: cfg.client[srv].val.network,
-          type: "irc",
-          client: new irclib(cfg.client[srv].val)
-        });
-        break;
-      case "tg":
-        clients.push({
-          name: "tg",
-          type: "tg",
-          client: new tglib(cfg.client[srv].val)
-        });
-        break;
-      case "discord":
-        clients.push({
-          name: "discord",
-          type: "discord",
-          client: new discordlib(cfg.client[srv].val)
-        });
-        break;
+const wrapper = class wrapper extends EventEmitter {
+  constructor() {
+    super();
+    for (let srv in cfg.client) {
+      if(cfg.client[srv].val.enabled) {
+        switch (cfg.client[srv].val.type) {
+        case "irc":
+          clients.push({
+            name: cfg.client[srv].val.network,
+            type: "irc",
+            client: new irclib(cfg.client[srv].val)
+          });
+          break;
+        case "tg":
+          clients.push({
+            name: "tg",
+            type: "tg",
+            client: new tglib(cfg.client[srv].val)
+          });
+          break;
+        case "discord":
+          clients.push({
+            name: "discord",
+            type: "discord",
+            client: new discordlib(cfg.client[srv].val)
+          });
+          break;
+        }
       }
     }
-  }
 
-  clients.forEach(client => {
-    client.client.on("data", e => {
-      this.emit(e[0], e[1]);
+    clients.forEach(client => {
+      client.client.on("data", e => {
+        this.emit(e[0], e[1]);
+      });
     });
-  });
+  }
 };
 
-util.inherits(wrapper, EventEmitter);
 export { wrapper, clients };
\ No newline at end of file