From 5ba5ff0afb11f26a59049848bbed0b8620116ea4 Mon Sep 17 00:00:00 2001 From: jkhsjdhjs Date: Fri, 14 Sep 2018 20:10:49 +0200 Subject: [PATCH] add full.pr0gramm.com --- src/inc/trigger/pr0gag.mjs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/inc/trigger/pr0gag.mjs b/src/inc/trigger/pr0gag.mjs index 2e04e3f..7e7f7a4 100644 --- a/src/inc/trigger/pr0gag.mjs +++ b/src/inc/trigger/pr0gag.mjs @@ -14,7 +14,7 @@ const flags = { 4: "[color=red]nsfl[/color]", 8: "[color=blue]nsfp[/color]" }; -const regex = /(img|vid)\.pr0gramm\.com\/((?:\d+){4}\/(?:\d+){2}(\/(?:\d+){2})?\/(?:\w{1,20})\.(?:webm|png|jpg|mp4|webm)?)/gi; +const regex = /(full|img|vid)\.pr0gramm\.com\/((?:\d+){4}\/(?:\d+){2}(\/(?:\d+){2})?\/(?:\w{1,20})\.(?:gif|png|jpg|mp4)?)/gi; const site = "https://pr0gramm.com/new/"; export default bot => { @@ -26,9 +26,10 @@ export default bot => { const tmp = url.parse(link).path.substr(1); rp(apis.reverse + tmp) .then(res => { + res = JSON.parse(res); if(res.error) throw res.error; - return JSON.parse(res).data.id; + return res.data.id; }) .then(id => Promise.all([ rp(apis.pr0gag.list + id.toString()), @@ -63,7 +64,7 @@ export default bot => { `toptags: ${meta.toptags.join(", ")} (${meta.flag})` ]) .then(out => e.reply(out.join(" - "))) - ).catch(err => e.reply("wo pr0gagcrawler jkhsjdhjs")); + ).catch(err => e.reply(JSON.stringify(err))); } })); };