From ddc076e89433cc5d814cbd3014aa2db40cd0d196 Mon Sep 17 00:00:00 2001 From: Pavel Djundik Date: Fri, 23 Jun 2017 20:49:45 +0300 Subject: [PATCH] Check status code in link prefetcher Fixes #1258. --- src/plugins/irc-events/link.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/plugins/irc-events/link.js b/src/plugins/irc-events/link.js index 1d3531f7..51bf657c 100644 --- a/src/plugins/irc-events/link.js +++ b/src/plugins/irc-events/link.js @@ -31,6 +31,10 @@ module.exports = function(client, chan, originalMsg) { const link = escapeHeader(links[0]); fetch(link, function(res) { + if (res === null) { + return; + } + parse(msg, link, res, client); }); }; @@ -90,7 +94,7 @@ function fetch(url, cb) { } }); } catch (e) { - return; + return cb(null); } var length = 0; var limit = Helper.config.prefetchMaxImageSize * 1024; @@ -111,7 +115,11 @@ function fetch(url, cb) { })) .pipe(es.wait(function(err, data) { if (err) { - return; + return cb(null); + } + + if (req.response.statusCode < 200 || req.response.statusCode > 299) { + return cb(null); } let type;