Merge branch 'f0ckdev' into 'master'

f0ck with !f0ck (not in #f0ck)

See merge request !52
This commit is contained in:
Flummi 2016-11-25 12:25:05 +00:00
commit 35afd7e6d5

View File

@ -15,7 +15,7 @@ module.exports = (lib) => {
level: 0,
active: 0,
func: (e) => {
//if(e.channel.getName() == '#f0ck' || e.channel.getName() == '#kbot-dev') {
if(e.channel.getName() === lib.cfg.main.debugchannel || e.message.match(/^\!f0ck (.*?)/i)) {
if(!e.message.match(/\!ignore/)) {
var tmp = e.message.match(/https?:\/\/[\w-]+(\.[\w-]+)+\.?(:\d+)?(\/\S*)?/gi); // get links
tmp.forEach((entry,i,a) => {
@ -58,7 +58,7 @@ module.exports = (lib) => {
});
}
});
//}
}
}
},
desc: 'muh'