From 510838db4d59180f0737ffa91ade9767f0bdb62a Mon Sep 17 00:00:00 2001 From: Flummi Date: Sat, 8 Sep 2018 11:21:26 +0200 Subject: [PATCH] blah --- package.json | 1 + src/inc/cfg.mjs | 27 +++++++++++++++++++++++++-- src/index.mjs | 8 ++++---- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 807c103..1e8cae8 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "dependencies": { "node-fetch": "^2.2.0", "nodejs-mysql2": "git+https://gitfap.de/Flummi/nodejs-mysql2.git", + "cuffeo": "git+https://gitfap.de/keinBot/cuffeo.git", "request": "^2.88.0", "request-promise-native": "^1.0.5", "winston": "^2.4.0" diff --git a/src/inc/cfg.mjs b/src/inc/cfg.mjs index ddab593..9c3c6c2 100644 --- a/src/inc/cfg.mjs +++ b/src/inc/cfg.mjs @@ -6,6 +6,7 @@ let cfg = { websrv: {}, trigger: {} }; +let admins = []; const read = () => new Promise((resolve, reject) => { sql.exec("select * from cfg").then(rows => { @@ -27,11 +28,33 @@ const read = () => new Promise((resolve, reject) => { type: rows[row].type } } - resolve(); + loadAdmins().then(() => { + resolve(); + }); }) .catch(err => { reject("no cfg"); }) }); -export { cfg, read }; +export const loadAdmins = () => new Promise((resolve, reject) => { + admins = []; + sql.exec(`select * from admins`) + .then(rows => { + rows.forEach(row => { + admins.push({ + id: row.id, + prefix: row.prefix, + account: row.account, + network: row.network, + level: row.level + }); + }); + resolve(); + }) + .catch(err => { + reject("keine Admins vorhanden"); + }); +}); + +export { cfg, read, admins }; diff --git a/src/index.mjs b/src/index.mjs index bfa9573..678ef8b 100644 --- a/src/index.mjs +++ b/src/index.mjs @@ -1,6 +1,7 @@ import { logger } from "./inc/log"; -import { read, cfg } from "./inc/cfg"; -import { wrapper } from "./inc/wrapper"; +import { read, cfg, admins } from "./inc/cfg"; +//import { wrapper } from "./inc/wrapper"; +import { cuffeo } from "cuffeo"; import triggers from "./inc/trigger"; import events from "./inc/events"; @@ -17,11 +18,10 @@ read().then(() => { this.clients = args.clients || ["irc", "tg", "discord"]; this.f = args.f; }, - bot: new wrapper() + bot: new cuffeo(cfg.client, admins) }; triggers.forEach(mod => { - console.log(mod); mod(self); }); events.forEach(event => event(self));