Merge branch 'f0ckdev' into 'master'

blacklisted 4ducky

See merge request !47
This commit is contained in:
Flummi 2016-11-22 16:43:47 +00:00
commit 2291813f4c

View File

@ -19,7 +19,7 @@ module.exports = (lib) => {
if(!e.message.match(/\!ignore/)) { if(!e.message.match(/\!ignore/)) {
var tmp = e.message.match(/https?:\/\/[\w-]+(\.[\w-]+)+\.?(:\d+)?(\/\S*)?/gi); // get links var tmp = e.message.match(/https?:\/\/[\w-]+(\.[\w-]+)+\.?(:\d+)?(\/\S*)?/gi); // get links
tmp.forEach((entry,i,a) => { tmp.forEach((entry,i,a) => {
if(!entry.match(/f0ck\.me/i)) { if(!entry.match(/f0ck\.me/i) && !entry.match(/4ducky\.com/i)) {
getLink(entry, (cb) => { getLink(entry, (cb) => {
if(cb.success === true) { if(cb.success === true) {
fs.move(cb.file, cb.file + '.' + cb.info.ext, (err) => { fs.move(cb.file, cb.file + '.' + cb.info.ext, (err) => {