diff --git a/index.mjs b/index.mjs index 4876014..21b74ce 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 cuffeo 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 9f0688f..7ba5839 100644 --- a/src/clients/irc.mjs +++ b/src/clients/irc.mjs @@ -1,4 +1,4 @@ -import admins from "../inc/admin"; +import { getLevel } 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: admins.getLevel(this.network, Object.assign(this.parsePrefix(tmp.prefix), { + level: 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 211042d..169af31 100644 --- a/src/clients/tg.mjs +++ b/src/clients/tg.mjs @@ -1,4 +1,4 @@ -import admins from "../inc/admin"; +import { getLevel } 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: admins.getLevel("Telegram", { + level: 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 005e487..adb3319 100644 --- a/src/inc/admin.mjs +++ b/src/inc/admin.mjs @@ -1,24 +1,25 @@ let _admins = []; -export default { - admins: _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 - }; - } - }; +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) 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; +}; + +export { + _admins, getLevel };