From f7303c804dd6563c190d4c0d32f08963fcdfe436 Mon Sep 17 00:00:00 2001 From: Flummi Date: Fri, 7 Sep 2018 20:03:32 +0200 Subject: [PATCH] remove getLevel --- .gitignore | 2 ++ package.json | 6 +++++- src/clients/irc.mjs | 6 ++---- src/clients/tg.mjs | 6 ++---- src/inc/admin.mjs | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 .gitignore create mode 100644 src/inc/admin.mjs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ccb2c80 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +node_modules/ +package-lock.json \ No newline at end of file diff --git a/package.json b/package.json index cf1ccd4..cec5fb9 100644 --- a/package.json +++ b/package.json @@ -11,5 +11,9 @@ "url": "git@gitfap.de:keinBot/cuffeo.git" }, "author": "Flummi", - "license": "ISC" + "license": "ISC", + "dependencies": { + "request": "^2.88.0", + "request-promise-native": "^1.0.5" + } } diff --git a/src/clients/irc.mjs b/src/clients/irc.mjs index 624e1df..79c47bd 100644 --- a/src/clients/irc.mjs +++ b/src/clients/irc.mjs @@ -1,5 +1,3 @@ -import { getLevel } from "../inc/admin"; - import modules from "./irc/index"; import net from "net"; @@ -103,10 +101,10 @@ 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: 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 - })) + }))*/ }), message: tmp.params[1], time: ~~(Date.now() / 1000), diff --git a/src/clients/tg.mjs b/src/clients/tg.mjs index 3515c6b..770131d 100644 --- a/src/clients/tg.mjs +++ b/src/clients/tg.mjs @@ -1,5 +1,3 @@ -import { getLevel } from "../inc/admin"; - import rp from "request-promise-native"; import EventEmitter from "events"; @@ -106,12 +104,12 @@ export class tg extends EventEmitter { nick: tmp.from.first_name, username: tmp.from.username, account: tmp.from.id.toString(), - level: getLevel("Telegram", { + /*level: getLevel("Telegram", { prefix: `${tmp.from.username}!${tmp.from.id}`, nick: tmp.from.first_name, username: tmp.from.username, account: tmp.from.id.toString() - }) + })*/ }, self: this.server, message: tmp.text, diff --git a/src/inc/admin.mjs b/src/inc/admin.mjs new file mode 100644 index 0000000..f76b95d --- /dev/null +++ b/src/inc/admin.mjs @@ -0,0 +1,42 @@ +//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 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; +}; \ No newline at end of file