From e7b8f0b45618b38167918a62ccbcf08e1e41d307 Mon Sep 17 00:00:00 2001
From: Flummi <flummi@f0ck.space>
Date: Mon, 4 Dec 2017 13:03:21 +0100
Subject: [PATCH] remove fsimport

---
 src/bot.mjs             | 10 +---------
 src/inc/clients/irc.mjs |  7 ++-----
 src/inc/clients/tg.mjs  |  6 +++---
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/bot.mjs b/src/bot.mjs
index 9b06afa..a0e229c 100644
--- a/src/bot.mjs
+++ b/src/bot.mjs
@@ -1,7 +1,6 @@
 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";
 
@@ -13,19 +12,12 @@ read().then(() => {
     trigger: trigger
   };
 
-  /*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
+  bot.on("message", e => {
     for (var [name, trigger] of self._trigger.entries()) {
       if (!trigger.call.exec(e.message))
         continue;
diff --git a/src/inc/clients/irc.mjs b/src/inc/clients/irc.mjs
index 7d8bef6..4b08d04 100644
--- a/src/inc/clients/irc.mjs
+++ b/src/inc/clients/irc.mjs
@@ -6,8 +6,6 @@ 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",
@@ -21,9 +19,9 @@ const replaceColor = (match, color, text) => {
   return text;
 };
 
-export class irc {
+export class irc extends EventEmitter {
   constructor(options) {
-    EventEmitter.call(this);
+    super();
     this.options = options || {};
     this.options.channels = this.options.channels || [];
     this.options.host = this.options.host || "127.0.0.1";
@@ -161,7 +159,6 @@ export class irc {
       ;
   }
 }
-util.inherits(irc, EventEmitter);
 
 Map.prototype.hasi = function(val) {
   for (let [key] of this)
diff --git a/src/inc/clients/tg.mjs b/src/inc/clients/tg.mjs
index 5e26f5f..5817550 100644
--- a/src/inc/clients/tg.mjs
+++ b/src/inc/clients/tg.mjs
@@ -1,6 +1,6 @@
-import { logger } from "../log.mjs";
-import { getLevel } from "../admin.mjs";
-import { spurdo } from "../spurdo.mjs";
+import { logger } from "../log";
+import { getLevel } from "../admin";
+import { spurdo } from "../spurdo";
 
 import rp from "request-promise";
 import EventEmitter from "events";