From 14466270fbd0c4d62da643648b1bb65c11189ae0 Mon Sep 17 00:00:00 2001 From: Flummi Date: Wed, 11 Jan 2017 00:45:54 +0100 Subject: [PATCH 01/10] sysmsgs as notice test --- src/trigger/trigger.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/trigger/trigger.js b/src/trigger/trigger.js index 6f01487..c1347b4 100644 --- a/src/trigger/trigger.js +++ b/src/trigger/trigger.js @@ -17,7 +17,7 @@ module.exports = (lib) => { case "reset": lib.cfg.trigger[e.network+e.channel] = lib.genStdTrigger(); lib.config.write('trigger', e.network+e.channel, lib.cfg.trigger[e.network+e.channel], 'json', cbwc => { - e.reply("trigger resetted"); + e.replyNotice("trigger resetted"); }); break; default: @@ -26,21 +26,21 @@ module.exports = (lib) => { if(triggerexists(trigger)) { lib.cfg.trigger[e.network+e.channel][trigger] = !lib.cfg.trigger[e.network+e.channel][trigger]; lib.config.write('trigger', e.network+e.channel, lib.cfg.trigger[e.network+e.channel], 'json', cbwc => { - e.reply(!cbwc?"trigger "+ trigger +" in channel "+e.channel.getName() + lib.bot.format.get(lib.cfg.trigger[e.network+e.channel][trigger]?'green':'red')+" "+(lib.cfg.trigger[e.network+e.channel][trigger]?'activated':'deactivated'):cbwc); + e.replyNotice(!cbwc?"trigger "+ trigger +" in channel "+e.channel.getName() + lib.bot.format.get(lib.cfg.trigger[e.network+e.channel][trigger]?'green':'red')+" "+(lib.cfg.trigger[e.network+e.channel][trigger]?'activated':'deactivated'):cbwc); }); } else - e.reply("trigger "+trigger+" not found D:"); + e.replyNotice("trigger "+trigger+" not found D:"); } break; } } else { var output = ""; - e.reply("Trigger in "+e.channel.getName()+" (green: activated, red: deactivated):"); + e.replyNotice("Trigger in "+e.channel.getName()+" (green: activated, red: deactivated):"); for(var key in lib.cfg.trigger[e.network+e.channel]) output += lib.bot.format.get(lib.cfg.trigger[e.network+e.channel][key]?'green':'red')+" "+key; - e.reply(output); + e.replyNotice(output); } }, desc: 'muh' From ad9db1df30f893ba1f5eab988cf1bc3ff7c46a76 Mon Sep 17 00:00:00 2001 From: Flummi Date: Tue, 10 Jan 2017 23:50:07 +0000 Subject: [PATCH 02/10] Revert "sysmsgs as notice test" This reverts commit 14466270fbd0c4d62da643648b1bb65c11189ae0 --- src/trigger/trigger.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/trigger/trigger.js b/src/trigger/trigger.js index c1347b4..6f01487 100644 --- a/src/trigger/trigger.js +++ b/src/trigger/trigger.js @@ -17,7 +17,7 @@ module.exports = (lib) => { case "reset": lib.cfg.trigger[e.network+e.channel] = lib.genStdTrigger(); lib.config.write('trigger', e.network+e.channel, lib.cfg.trigger[e.network+e.channel], 'json', cbwc => { - e.replyNotice("trigger resetted"); + e.reply("trigger resetted"); }); break; default: @@ -26,21 +26,21 @@ module.exports = (lib) => { if(triggerexists(trigger)) { lib.cfg.trigger[e.network+e.channel][trigger] = !lib.cfg.trigger[e.network+e.channel][trigger]; lib.config.write('trigger', e.network+e.channel, lib.cfg.trigger[e.network+e.channel], 'json', cbwc => { - e.replyNotice(!cbwc?"trigger "+ trigger +" in channel "+e.channel.getName() + lib.bot.format.get(lib.cfg.trigger[e.network+e.channel][trigger]?'green':'red')+" "+(lib.cfg.trigger[e.network+e.channel][trigger]?'activated':'deactivated'):cbwc); + e.reply(!cbwc?"trigger "+ trigger +" in channel "+e.channel.getName() + lib.bot.format.get(lib.cfg.trigger[e.network+e.channel][trigger]?'green':'red')+" "+(lib.cfg.trigger[e.network+e.channel][trigger]?'activated':'deactivated'):cbwc); }); } else - e.replyNotice("trigger "+trigger+" not found D:"); + e.reply("trigger "+trigger+" not found D:"); } break; } } else { var output = ""; - e.replyNotice("Trigger in "+e.channel.getName()+" (green: activated, red: deactivated):"); + e.reply("Trigger in "+e.channel.getName()+" (green: activated, red: deactivated):"); for(var key in lib.cfg.trigger[e.network+e.channel]) output += lib.bot.format.get(lib.cfg.trigger[e.network+e.channel][key]?'green':'red')+" "+key; - e.replyNotice(output); + e.reply(output); } }, desc: 'muh' From 2d682d4fb83ab4e32864aee8260724162ecddc31 Mon Sep 17 00:00:00 2001 From: Flummi Date: Wed, 11 Jan 2017 01:03:54 +0100 Subject: [PATCH 03/10] parse yt as mp3 --- src/trigger/parser.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/trigger/parser.js b/src/trigger/parser.js index 1259b99..1d65b00 100644 --- a/src/trigger/parser.js +++ b/src/trigger/parser.js @@ -20,7 +20,7 @@ module.exports = (lib) => { var tmp = e.message.match(/https?:\/\/[\w-]+(\.[\w-]+)+\.?(:\d+)?(\/\S*)?/gi); // get links tmp.forEach((entry,i,a) => { if(!entry.match(/f0ck\.me/i) && !entry.match(/\.onion/i)) { - getLink(entry, ((e.message.match(/(!|-)force/i) && userlevel >= 100)?true:false), (cb) => { + getLink(entry, ((e.message.match(/(!|-)force/i) && userlevel >= 100)?true:false), (e.message.match(/(!|-)mp3/i)?true:false), (cb) => { if(cb.success === true) { fs.move(cb.file, cb.file + '.' + cb.info.ext, (err) => { if(!err) { @@ -64,7 +64,7 @@ module.exports = (lib) => { desc: 'muh' }); - var getLink = (url, force, cb) => { + var getLink = (url, force, mp3, cb) => { var yt = /https?:\/\/(www\.)?youtu(\.be\/|be\.com\/)((.+\/)?(watch(\?v=|.+&v=))?(v=)?)([\w_-]{11})(&.+)?/gi; var sc = /https?:\/\/(www\.)?(soundcloud\.com|snd\.sc)(\/\S*)(\/\S*)/gi; lib.checkRepost(url, (cbcr) => { @@ -78,14 +78,15 @@ module.exports = (lib) => { var title = inf.title; var iurl = inf.iurl; try { - ytdl.downloadFromInfo(inf, { filter: (format) => { return format.container === 'webm'; } }) + var dlformat = (mp3?'mp3':'webm'); + ytdl.downloadFromInfo(inf, { filter: (format) => { return format.container === dlformat; } }) .on('response', (res) => { if( ( res.headers['content-length'] <= lib.cfg.main.maxFileSize ) || force ) { info = { type: 'youtube', title: title, - mime: 'video/webm', - ext: 'webm', + mime: mp3?'audio/mpeg':'video/webm', + ext: mp3?'mp3':'webm', thumb: iurl }; } From 4253da7c490775e1c3722795539773b1c4479fe5 Mon Sep 17 00:00:00 2001 From: Flummi Date: Wed, 11 Jan 2017 01:09:17 +0100 Subject: [PATCH 04/10] * parse yt as m4a --- src/trigger/parser.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/trigger/parser.js b/src/trigger/parser.js index 1d65b00..54656d3 100644 --- a/src/trigger/parser.js +++ b/src/trigger/parser.js @@ -20,7 +20,7 @@ module.exports = (lib) => { var tmp = e.message.match(/https?:\/\/[\w-]+(\.[\w-]+)+\.?(:\d+)?(\/\S*)?/gi); // get links tmp.forEach((entry,i,a) => { if(!entry.match(/f0ck\.me/i) && !entry.match(/\.onion/i)) { - getLink(entry, ((e.message.match(/(!|-)force/i) && userlevel >= 100)?true:false), (e.message.match(/(!|-)mp3/i)?true:false), (cb) => { + getLink(entry, ((e.message.match(/(!|-)force/i) && userlevel >= 100)?true:false), (e.message.match(/(!|-)audio/i)?true:false), (cb) => { if(cb.success === true) { fs.move(cb.file, cb.file + '.' + cb.info.ext, (err) => { if(!err) { @@ -64,7 +64,7 @@ module.exports = (lib) => { desc: 'muh' }); - var getLink = (url, force, mp3, cb) => { + var getLink = (url, force, m4a, cb) => { var yt = /https?:\/\/(www\.)?youtu(\.be\/|be\.com\/)((.+\/)?(watch(\?v=|.+&v=))?(v=)?)([\w_-]{11})(&.+)?/gi; var sc = /https?:\/\/(www\.)?(soundcloud\.com|snd\.sc)(\/\S*)(\/\S*)/gi; lib.checkRepost(url, (cbcr) => { @@ -78,15 +78,15 @@ module.exports = (lib) => { var title = inf.title; var iurl = inf.iurl; try { - var dlformat = (mp3?'mp3':'webm'); + var dlformat = (m4a?'m4a':'webm'); ytdl.downloadFromInfo(inf, { filter: (format) => { return format.container === dlformat; } }) .on('response', (res) => { if( ( res.headers['content-length'] <= lib.cfg.main.maxFileSize ) || force ) { info = { type: 'youtube', title: title, - mime: mp3?'audio/mpeg':'video/webm', - ext: mp3?'mp3':'webm', + mime: m4a?'audio/mp4':'video/webm', + ext: m4a?'m4a':'webm', thumb: iurl }; } From d648e1c8489ed06a9c16ceb10d828b6bcc358c88 Mon Sep 17 00:00:00 2001 From: Flummi Date: Wed, 11 Jan 2017 01:15:57 +0100 Subject: [PATCH 05/10] meh, damn formats --- src/trigger/parser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/trigger/parser.js b/src/trigger/parser.js index 54656d3..9c17234 100644 --- a/src/trigger/parser.js +++ b/src/trigger/parser.js @@ -78,7 +78,7 @@ module.exports = (lib) => { var title = inf.title; var iurl = inf.iurl; try { - var dlformat = (m4a?'m4a':'webm'); + var dlformat = (m4a?'audioonly':'webm'); ytdl.downloadFromInfo(inf, { filter: (format) => { return format.container === dlformat; } }) .on('response', (res) => { if( ( res.headers['content-length'] <= lib.cfg.main.maxFileSize ) || force ) { From 125efb0bf86b14bdaa3b41a56f1943a8430423c2 Mon Sep 17 00:00:00 2001 From: Flummi Date: Wed, 11 Jan 2017 01:19:49 +0100 Subject: [PATCH 06/10] -.- --- src/trigger/parser.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/trigger/parser.js b/src/trigger/parser.js index 9c17234..e0a1571 100644 --- a/src/trigger/parser.js +++ b/src/trigger/parser.js @@ -78,8 +78,14 @@ module.exports = (lib) => { var title = inf.title; var iurl = inf.iurl; try { - var dlformat = (m4a?'audioonly':'webm'); - ytdl.downloadFromInfo(inf, { filter: (format) => { return format.container === dlformat; } }) + //var dlformat = (m4a?'audioonly':'webm'); + var dlformat; + if(m4a) + dlformat = 'audioonly'; + else + dlformat = { filter: (format) => { return format.container === 'webm'; } }; + + ytdl.downloadFromInfo(inf, dlformat) .on('response', (res) => { if( ( res.headers['content-length'] <= lib.cfg.main.maxFileSize ) || force ) { info = { From 201da0cd3666b81daba5f941a5375d0805895bff Mon Sep 17 00:00:00 2001 From: Flummi Date: Wed, 11 Jan 2017 01:22:22 +0100 Subject: [PATCH 07/10] -.- --- src/trigger/parser.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/trigger/parser.js b/src/trigger/parser.js index e0a1571..c16d6b6 100644 --- a/src/trigger/parser.js +++ b/src/trigger/parser.js @@ -81,7 +81,7 @@ module.exports = (lib) => { //var dlformat = (m4a?'audioonly':'webm'); var dlformat; if(m4a) - dlformat = 'audioonly'; + dlformat = { filter: 'audioonly' }; else dlformat = { filter: (format) => { return format.container === 'webm'; } }; @@ -91,8 +91,8 @@ module.exports = (lib) => { info = { type: 'youtube', title: title, - mime: m4a?'audio/mp4':'video/webm', - ext: m4a?'m4a':'webm', + mime: (m4a?'audio/mp4':'video/webm'), + ext: (m4a?'m4a':'webm'), thumb: iurl }; } From d8913d407d76e92ee52a3e3288019b025811e3b6 Mon Sep 17 00:00:00 2001 From: Flummi Date: Wed, 11 Jan 2017 01:25:42 +0100 Subject: [PATCH 08/10] -.- --- src/trigger/parser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/trigger/parser.js b/src/trigger/parser.js index c16d6b6..e15ffdf 100644 --- a/src/trigger/parser.js +++ b/src/trigger/parser.js @@ -81,7 +81,7 @@ module.exports = (lib) => { //var dlformat = (m4a?'audioonly':'webm'); var dlformat; if(m4a) - dlformat = { filter: 'audioonly' }; + dlformat = { filter: '141' }; else dlformat = { filter: (format) => { return format.container === 'webm'; } }; From 73af845e48da813cbf24f4dc8f62f60f7d08a2c0 Mon Sep 17 00:00:00 2001 From: Flummi Date: Wed, 11 Jan 2017 01:30:25 +0100 Subject: [PATCH 09/10] -.- --- src/trigger/parser.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/trigger/parser.js b/src/trigger/parser.js index e15ffdf..2646bbb 100644 --- a/src/trigger/parser.js +++ b/src/trigger/parser.js @@ -81,7 +81,7 @@ module.exports = (lib) => { //var dlformat = (m4a?'audioonly':'webm'); var dlformat; if(m4a) - dlformat = { filter: '141' }; + dlformat = { format: '171' }; else dlformat = { filter: (format) => { return format.container === 'webm'; } }; @@ -91,8 +91,8 @@ module.exports = (lib) => { info = { type: 'youtube', title: title, - mime: (m4a?'audio/mp4':'video/webm'), - ext: (m4a?'m4a':'webm'), + mime: (m4a?'audio/mpeg':'video/webm'), + ext: (m4a?'mp3':'webm'), thumb: iurl }; } From e658e13d6a06a612cd87d856e2d715e6673c89a0 Mon Sep 17 00:00:00 2001 From: Flummi Date: Fri, 13 Jan 2017 21:50:07 +0000 Subject: [PATCH 10/10] Revert "Revert "sysmsgs as notice test"" This reverts commit ad9db1df30f893ba1f5eab988cf1bc3ff7c46a76 --- src/trigger/trigger.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/trigger/trigger.js b/src/trigger/trigger.js index 6f01487..c1347b4 100644 --- a/src/trigger/trigger.js +++ b/src/trigger/trigger.js @@ -17,7 +17,7 @@ module.exports = (lib) => { case "reset": lib.cfg.trigger[e.network+e.channel] = lib.genStdTrigger(); lib.config.write('trigger', e.network+e.channel, lib.cfg.trigger[e.network+e.channel], 'json', cbwc => { - e.reply("trigger resetted"); + e.replyNotice("trigger resetted"); }); break; default: @@ -26,21 +26,21 @@ module.exports = (lib) => { if(triggerexists(trigger)) { lib.cfg.trigger[e.network+e.channel][trigger] = !lib.cfg.trigger[e.network+e.channel][trigger]; lib.config.write('trigger', e.network+e.channel, lib.cfg.trigger[e.network+e.channel], 'json', cbwc => { - e.reply(!cbwc?"trigger "+ trigger +" in channel "+e.channel.getName() + lib.bot.format.get(lib.cfg.trigger[e.network+e.channel][trigger]?'green':'red')+" "+(lib.cfg.trigger[e.network+e.channel][trigger]?'activated':'deactivated'):cbwc); + e.replyNotice(!cbwc?"trigger "+ trigger +" in channel "+e.channel.getName() + lib.bot.format.get(lib.cfg.trigger[e.network+e.channel][trigger]?'green':'red')+" "+(lib.cfg.trigger[e.network+e.channel][trigger]?'activated':'deactivated'):cbwc); }); } else - e.reply("trigger "+trigger+" not found D:"); + e.replyNotice("trigger "+trigger+" not found D:"); } break; } } else { var output = ""; - e.reply("Trigger in "+e.channel.getName()+" (green: activated, red: deactivated):"); + e.replyNotice("Trigger in "+e.channel.getName()+" (green: activated, red: deactivated):"); for(var key in lib.cfg.trigger[e.network+e.channel]) output += lib.bot.format.get(lib.cfg.trigger[e.network+e.channel][key]?'green':'red')+" "+key; - e.reply(output); + e.replyNotice(output); } }, desc: 'muh'