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

Merge branch 'master' into 'f0ckdev'

Browse Source 
Master



See merge request !5
This commit is contained in:
Flummi 2016-10-20 22:10:27 +00:00
commit d5bf271ee1
1 changed files with 322 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/websrv.js
View File

@ -33,21 +33,23 @@ function Websrv(tlib) {
body = JSON.parse(body); body = JSON.parse(body);
var eventname = body.event_name; var eventname = body.event_name;
var autor = body.user_name; var autor = body.user_name;
var branch = body.ref.split('/')[2];
var commit = ""; if(branch === "master") {
try { var commit = "";
commit = body.commits[body.commits.length-1].message.replace('\n','').trim(); try {
} commit = body.commits[body.commits.length-1].message.replace('\n','').trim();
catch(ex) { }
commit = body.commits[body.commits.length-2].message.replace('\n','').trim(); catch(ex) {
} commit = body.commits[body.commits.length-2].message.replace('\n','').trim();
lib.bot.send( lib.cfg.debugchannel, eventname + ' from ' + autor + ' ('+commit+')', '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)
lib.bot.send( lib.cfg.debugchannel, stdout, 'n0xy' ); lib.bot.send( lib.cfg.debugchannel, stdout, 'n0xy' );
}); });
}
} }
}); });
res.writeHead(200, { 'Content-Type': 'text/html' }); res.writeHead(200, { 'Content-Type': 'text/html' });
@ -70,7 +72,6 @@ function Websrv(tlib) {
'.mp3': 'audio/mpeg', '.mp3': 'audio/mpeg',
'.mp4': 'video/mp4', '.mp4': 'video/mp4',
'.webm': 'video/webm', '.webm': 'video/webm',
'.css': 'text/css',
'.ogg': 'audio/ogg' '.ogg': 'audio/ogg'
}; };
if(filePath == "./index.html") { // mainpage if(filePath == "./index.html") { // mainpage