codeoverhaul

This commit is contained in:
Flummi
2016-09-15 00:05:18 +02:00
parent e87499e705
commit 32b830f929
20 changed files with 130 additions and 150 deletions

View File

@ -1,6 +1,6 @@
var fs = require('fs-extra');
module.exports = (bot, lib) => {
module.exports = (lib) => {
lib.trigger.add({
name: 'clean',
call: /^\!clean/i,

View File

@ -1,4 +1,4 @@
module.exports = (bot, lib) => {
module.exports = (lib) => {
lib.trigger.add({
name: 'debug',
call: /^\!debug$/i,

View File

@ -1,4 +1,4 @@
module.exports = (bot, lib) => {
module.exports = (lib) => {
lib.trigger.add({
name: 'delete',
call: /^\!del (\d+)$/i,

View File

@ -1,6 +1,6 @@
var exec = require('child_process').exec;
module.exports = (bot, lib) => {
module.exports = (lib) => {
lib.trigger.add({
name: 'gitpull',
call: /^\!pull$/,

View File

@ -1,4 +1,4 @@
module.exports = (bot, lib) => {
module.exports = (lib) => {
lib.trigger.add({
name: 'level',
call: /^\!level(?: +\@.*)?/i,
@ -13,32 +13,34 @@ module.exports = (bot, lib) => {
var level = (args[2]>=100)?100:args[2];
if( name in e.channel.names ) {
bot.whois(name.trim(), e.network, (err, data) => {
if(data.account !== null) {
var host = data.username+'@'+data.hostname;
if(host in lib.admins) {
if(level <= 0) {
lib.sql.query('delete from `f0ck`.`user` where `id` = ? limit 1', [lib.admins[host].id], () => {
lib.loadUser();
e.reply('deleted user '+data.nick+' ('+host+')');
});
console.log(lib.admins);
lib.bot.whois(name.trim(), e.network, (err, data) => {
if(!err) {
if(data.account !== null) {
if(data.account in lib.admins) {
if(level <= 0) {
lib.sql.query('delete from `f0ck`.`user` where `id` = ? limit 1', [lib.admins[data.account].id], () => {
lib.loadUser();
e.reply('deleted user '+data.nick+' ('+data.account+')');
});
}
else {
lib.sql.query('update `f0ck`.`user` set `level` = ? where `id` = ?', [level, lib.admins[data.account].id], () => {
lib.loadUser();
e.reply('changed user '+data.nick+' ('+data.account+') to level '+level);
});
}
}
else {
lib.sql.query('update `f0ck`.`user` set `level` = ? where `id` = ?', [level, lib.admins[host].id], () => {
lib.sql.query('insert into `f0ck`.`user` (`account`,`level`,`network`) values (?,?,?)', [data.account, level, e.network], () => {
lib.loadUser();
e.reply('changed user '+data.nick+' ('+host+') to level '+level);
e.reply('added new user '+data.nick+' ('+data.account+') with level '+level);
});
}
}
else {
lib.sql.query('insert into `f0ck`.`user` (`nick`,`vhost`,`level`,`server`) values (?,?,?,?)', [data.nick, host, level, e.network], () => {
lib.loadUser();
e.reply('added new user '+data.nick+' ('+host+') with level '+level);
});
}
else
e.reply('user '+data.nick+' isn\'t registered');
}
else
e.reply('user '+data.nick+' isn\'t registered');
});
}
else

View File

@ -9,7 +9,7 @@ var ytdl = require('ytdl-core');
var Readable = require('stream').Readable;
var cfg = require('../../cfg/main.json');
module.exports = (bot, lib) => {
module.exports = (lib) => {
lib.trigger.add({
name: 'parser',
call: /https?:\/\/[\w-]+(\.[\w-]+)+\.?(:\d+)?(\/\S*)?/gi,
@ -25,7 +25,7 @@ module.exports = (bot, lib) => {
if(cb.success === true) {
fs.move(cb.file, cb.file + '.' + cb.info.ext, (err) => {
if(!err) {
bot.whois(e.user.getNick(), e.network, (err, cbgu) => {
lib.bot.whois(e.user.getNick(), e.network, (err, cbgu) => {
lib.sql.query("insert into `f0ck`.`items` (`src`,`dest`,`mime`,`size`,`checksum`,`username`,`userchannel`,`usernetwork`,`stamp`,`active`,`thumb`) values (?,?,?,?,?,?,?,?,?,?,?)", [
entry,
cb.file + '.' + cb.info.ext,

View File

@ -1,6 +1,6 @@
var du = require('du');
module.exports = (bot, lib) => {
module.exports = (lib) => {
lib.trigger.add({
name: 'stats',
call: /^\!stats$/i,

View File

@ -1,19 +1,19 @@
module.exports = (bot, lib) => {
module.exports = (lib) => {
lib.trigger.add({
name: 'sync',
call: /^!sync$/i,
level: 100,
active: 1,
func: (e) => {
bot.names(e.channel, e.network, (names) => {
lib.bot.names(e.channel, e.network, (names) => {
Object.keys(names).forEach(key => {
bot.whois(key, e.network, (err, data) => {
if(data.nick != bot.me.nick) {
bot.mode(e.channel, '-qaohv' + (' '+data.nick).repeat(5), e.network);
lib.bot.whois(key, e.network, (err, data) => {
if(data.nick != lib.bot.me.nick) {
lib.bot.mode(e.channel, '-qaohv' + (' '+data.nick).repeat(5), e.network);
var level = 0;
var modes = false;
if((data.username+'@'+data.hostname) in lib.admins) {
level = lib.admins[data.username+'@'+data.hostname].level;
if(data.account in lib.admins) {
level = lib.admins[data.account].level;
if(level >= 70)
modes = "+ao";
else if(level >= 60)
@ -24,7 +24,7 @@ module.exports = (bot, lib) => {
modes = "+v";
}
if(modes !== false)
bot.mode(e.channel, modes + (' '+data.nick).repeat(modes.length-1), e.network);
lib.bot.mode(e.channel, modes + (' '+data.nick).repeat(modes.length-1), e.network);
}
});
});

View File

@ -1,4 +1,4 @@
module.exports = (bot, lib) => {
module.exports = (lib) => {
lib.trigger.add({
name: 'test',
call: /^!test$/i,

View File

@ -1,6 +1,6 @@
var fs = require('fs-extra');
module.exports = (bot, lib) => {
module.exports = (lib) => {
lib.trigger.add({
name: 'thumbnailer',
call: /^\!thumb(.*\d+)?$/i,

View File

@ -2,7 +2,7 @@ var allowedModes = [
'q','a','o','h','v'
];
module.exports = (bot, lib) => {
module.exports = (lib) => {
lib.trigger.add({
name: 'umode',
call: /^\!umode .*/i,
@ -17,7 +17,7 @@ module.exports = (bot, lib) => {
else
tmp.pop();
var modes;
if(user.toLowerCase() != bot.me.nick.toLowerCase()) {
if(user.toLowerCase() != lib.bot.me.nick.toLowerCase()) {
var modes = processModes(tmp.join(''));
if(modes.length) {
if(checkModes(modes, allowedModes)) {
@ -32,7 +32,7 @@ module.exports = (bot, lib) => {
modesToApply.push(currentPrefix + queuedModes + (' ' + user).repeat(queuedModes.length));
for(var i = 0; i < queuedModes.length; i++) modes.shift();
}
modesToApply.forEach(modeStr => bot.mode(e.channel, modeStr, e.network));
modesToApply.forEach(modeStr => lib.bot.mode(e.channel, modeStr, e.network));
}
else
e.reply('Error! Allowed modes are: ' + allowedModes.join(','));

View File

@ -1,4 +1,4 @@
module.exports = (bot, lib) => {
module.exports = (lib) => {
lib.trigger.add({
name: 'user',
call: /^\!user( \@.*)?/i,
@ -9,7 +9,7 @@ module.exports = (bot, lib) => {
user = e.user.getNick();
else
user = user.trim();
bot.whois(user, e.network, (err, data) => {
lib.bot.whois(user, e.network, (err, data) => {
e.reply(data);
});
},