diff --git a/src/lib.js b/src/lib.js index 8509a64..6dc9ea8 100644 --- a/src/lib.js +++ b/src/lib.js @@ -25,14 +25,16 @@ Lib.prototype.debug = false; Lib.prototype.getUserlevel = (user, network, channel, cb) => { bot.whois(user, network, (err, data) => { var host = data.username+'@'+data.hostname; - var lvl_channel = (data.nick in channel)? cfg.level[ channel[data.nick] ] : 0; - var lvl_db = 0; - if(host in Lib.prototype.admins) - lvl_db = (Lib.prototype.admins[host].server == network)? Lib.prototype.admins[host].level : 0; - cb({ - 'channel': lvl_channel, - 'db': lvl_db, - 'level': Math.max(lvl_channel, lvl_db) + bot.names(channel, network, (names) => { + var lvl_channel = (data.nick in names)? cfg.level[ names[data.nick] ] : 0; + var lvl_db = 0; + if(host in Lib.prototype.admins) + lvl_db = (Lib.prototype.admins[host].server == network)? Lib.prototype.admins[host].level : 0; + cb({ + 'channel': lvl_channel, + 'db': lvl_db, + 'level': Math.max(lvl_channel, lvl_db) + }); }); }); }; diff --git a/src/main.js b/src/main.js index 594cce1..cd6b464 100644 --- a/src/main.js +++ b/src/main.js @@ -44,7 +44,7 @@ bot.on('message', (e) => { trigger.trigger.forEach((entry,i,a) => { if(e.message.match(entry.call) && entry.active == 1) { lib.log('trigger: '+entry.name); - lib.getUserlevel(e.user.getNick(), e.network, e.channel.names, (cb) => { + lib.getUserlevel(e.user.getNick(), e.network, e.channel.getName(), (cb) => { if(cb.level >= entry.level) entry.func(e, cb.level); else diff --git a/src/trigger/level.js b/src/trigger/level.js index 029fab3..55d6d0e 100644 --- a/src/trigger/level.js +++ b/src/trigger/level.js @@ -49,7 +49,7 @@ module.exports = (bot, trigger, lib) => { user = e.user.getNick(); else user = user.trim(); - lib.getUserlevel(user, e.network, e.channel.names, cb => { + lib.getUserlevel(user, e.network, e.channel.getName(), cb => { e.reply("level from "+user+": "+cb.level+" (Channel: "+cb.channel+" DB: "+cb.db+")"); }); } diff --git a/src/trigger/parser.js b/src/trigger/parser.js index b99e4bf..8e791b1 100644 --- a/src/trigger/parser.js +++ b/src/trigger/parser.js @@ -76,8 +76,6 @@ module.exports = (bot, trigger, lib) => { else e.reply('f0ck! your file is too big (~'+lib.formatSize(length)+'), max '+lib.formatSize(cfg.maxFileSize)+' allowed'); } - else - e.reply('lol, go f0ck yourself'); } }); }