From 7da5f9c653280ec20144bbd7b5dd846ba11f647e Mon Sep 17 00:00:00 2001 From: Flummi Date: Sat, 8 Sep 2018 12:36:02 +0200 Subject: [PATCH] mhm --- index.mjs | 4 +-- src/clients/irc.mjs | 4 +-- src/clients/tg.mjs | 4 +-- src/inc/admin.mjs | 64 +++++++++++++++------------------------------ 4 files changed, 27 insertions(+), 49 deletions(-) diff --git a/index.mjs b/index.mjs index 64c8d69..5e8ef78 100644 --- a/index.mjs +++ b/index.mjs @@ -1,6 +1,6 @@ import { irc as irclib } from "./src/clients/irc"; import { tg as tglib } from "./src/clients/tg"; -import { admins } from "./src/inc/admin"; +import admins from "./src/inc/admin"; import EventEmitter from "events"; @@ -9,7 +9,7 @@ const clients = []; const cuffeo = class wrapper extends EventEmitter { constructor(cfg, _admins = []) { super(); - admins = _admins; + admins.admins = _admins; for (let srv in cfg) { if(cfg[srv].val.enabled) { switch (cfg[srv].val.type) { diff --git a/src/clients/irc.mjs b/src/clients/irc.mjs index 7ba5839..9f0688f 100644 --- a/src/clients/irc.mjs +++ b/src/clients/irc.mjs @@ -1,4 +1,4 @@ -import { getLevel } from "../inc/admin"; +import admins from "../inc/admin"; import modules from "./irc/index"; import net from "net"; @@ -102,7 +102,7 @@ export class irc extends EventEmitter { user: Object.assign(this.parsePrefix(tmp.prefix), { account: this.server.user.geti(this.parsePrefix(tmp.prefix).nick).account, prefix: tmp.prefix.charAt(0) === ":" ? tmp.prefix.substring(1) : tmp.prefix, - level: getLevel(this.network, Object.assign(this.parsePrefix(tmp.prefix), { + level: admins.getLevel(this.network, Object.assign(this.parsePrefix(tmp.prefix), { account: this.server.user.geti(this.parsePrefix(tmp.prefix).nick).account, prefix: tmp.prefix.charAt(0) === ":" ? tmp.prefix.substring(1) : tmp.prefix })) diff --git a/src/clients/tg.mjs b/src/clients/tg.mjs index 169af31..211042d 100644 --- a/src/clients/tg.mjs +++ b/src/clients/tg.mjs @@ -1,4 +1,4 @@ -import { getLevel } from "../inc/admin"; +import admins from "../inc/admin"; import fetch from "../inc/fetch"; import EventEmitter from "events"; @@ -105,7 +105,7 @@ export class tg extends EventEmitter { nick: tmp.from.first_name, username: tmp.from.username, account: tmp.from.id.toString(), - level: getLevel("Telegram", { + level: admins.getLevel("Telegram", { prefix: `${tmp.from.username}!${tmp.from.id}`, nick: tmp.from.first_name, username: tmp.from.username, diff --git a/src/inc/admin.mjs b/src/inc/admin.mjs index 1ef466b..0c2b3a2 100644 --- a/src/inc/admin.mjs +++ b/src/inc/admin.mjs @@ -1,44 +1,22 @@ -//import sql from "./sql"; - -/*export let admins = []; -export const loadAdmins = () => { - 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 - }); - }); - }) - .catch(err => { - console.log("keine Admins vorhanden"); - }); -}; -loadAdmins();*/ - -export let admins = []; - -export const getLevel = (network, user) => { - let ret = { - level: 0, - verified: false - }; - if (typeof user !== "object") - return "user has to be an object!"; - if (!user.account || !user.prefix) +export default { + admins: [], + getLevel: (network, user) => { + let ret = { + level: 0, + verified: false + }; + if (typeof user !== "object") + return "user has to be an object!"; + if (!user.account || !user.prefix) + return ret; + for(let admin of admins) { + if (admin.account === user.account.toLowerCase() && admin.network === network.toLowerCase()) { + ret = { + level: admin.level, + verified: user.prefix.toLowerCase() === admin.prefix + }; + } + }; return ret; - for(let admin of admins) { - if (admin.account === user.account.toLowerCase() && admin.network === network.toLowerCase()) { - ret = { - level: admin.level, - verified: user.prefix.toLowerCase() === admin.prefix - }; - } - }; - return ret; -}; \ No newline at end of file + } +};