f0ck/f0ckv1
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'f0ckdev' into 'master'

Browse Source 
F0ckdev



See merge request !14
This commit is contained in:
Flummi 2016-10-26 13:49:40 +00:00
commit 8351f8a282
4 changed files with 333 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/trigger/gitpull.js
View File

@ -9,8 +9,10 @@ module.exports = (lib) => {
func: (e) => { func: (e) => {
exec('cd ../../ & git pull', (error, stdout) => { exec('cd ../../ & git pull', (error, stdout) => {
if(error === null) { if(error === null) {
if(!lib.debug)
e.reply('git pull suxxessfully.'); e.reply('git pull suxxessfully.');
//e.reply(stdout); else
lib.log(stdout);
} }
}); });
}, },

1
src/trigger/parser.js
View File

@ -138,6 +138,7 @@ module.exports = (lib) => {
(err, res, data) => { (err, res, data) => {
if(!err) { if(!err) {
var type = res.headers['content-type']; var type = res.headers['content-type'];
lib.log('MimeType: '+type);
var length = res.headers['content-length']; var length = res.headers['content-length'];
if(cfg.allowedMimes.hasOwnProperty(type)) { if(cfg.allowedMimes.hasOwnProperty(type)) {
//if(length <= cfg.maxFileSize) { //if(length <= cfg.maxFileSize) {

6
src/trigger/user.js
View File

@ -5,11 +5,7 @@ module.exports = (lib) => {
level: 0, level: 0,
active: 1, active: 1,
func: (e) => { func: (e) => {
if(!(user = e.message.match(/^\!user( +@(.*))?/i)[2])) lib.bot.whois(!(user = e.message.match(/^\!user( +@(.*))?/i)[2])?e.user.getNick():user.trim(), e.network, (err, data) => {
user = e.user.getNick();
else
user = user.trim();
lib.bot.whois(user, e.network, (err, data) => {
e.reply(data); e.reply(data);
}); });
}, },

6
src/websrv.js
View File

@ -46,8 +46,12 @@ function Websrv(tlib) {
lib.bot.send( lib.cfg.debugchannel, eventname + ' from ' + autor + ' ('+commit+') in branch '+branch, 'n0xy' ); lib.bot.send( lib.cfg.debugchannel, eventname + ' from ' + autor + ' ('+commit+') in branch '+branch, 'n0xy' );
if( lib.cfg.debugchannel === '#f0ck' ) { if( lib.cfg.debugchannel === '#f0ck' ) {
exec('cd ../ & git pull', (error, stdout) => { exec('cd ../ & git pull', (error, stdout) => {
if(error === null) if(error === null) {
if(!lib.debug)
lib.bot.send(lib.cfg.debugchannel, 'git pull suxxessfully.', 'n0xy'); lib.bot.send(lib.cfg.debugchannel, 'git pull suxxessfully.', 'n0xy');
else
lib.log(stdout);
}
}); });
} }
} }