diff --git a/src/modules/fedimbed.js b/src/modules/fedimbed.js index 27325ed..3268e1d 100644 --- a/src/modules/fedimbed.js +++ b/src/modules/fedimbed.js @@ -116,29 +116,29 @@ async function processUrl(msg, url, spoiler = false) { // Fetch post let rawPostData; - rawPostData = await signedFetch(url, { - headers: { - "User-Agent": FRIENDLY_USERAGENT, - Accept: "application/activity+json", - }, - }) - .then((res) => res.text()) - .catch(async (err) => { - logger.error( - "fedimbed", - `Failed to signed fetch "${url}", retrying unsigned: ${err}` - ); - rawPostData = await fetch(url, { - headers: { - "User-Agent": FRIENDLY_USERAGENT, - Accept: "application/activity+json", - }, - }) - .then((res) => res.text()) - .catch((err) => { - logger.error("fedimbed", `Failed to fetch "${url}": ${err}`); - }); - }); + try { + rawPostData = await signedFetch(url, { + headers: { + "User-Agent": FRIENDLY_USERAGENT, + Accept: "application/activity+json", + }, + }).then((res) => res.text()); + } catch (err) { + logger.error( + "fedimbed", + `Failed to signed fetch "${url}", retrying unsigned: ${err}` + ); + rawPostData = await fetch(url, { + headers: { + "User-Agent": FRIENDLY_USERAGENT, + Accept: "application/activity+json", + }, + }) + .then((res) => res.text()) + .catch((err) => { + logger.error("fedimbed", `Failed to fetch "${url}": ${err}`); + }); + } let postData; if (rawPostData?.startsWith("{")) { @@ -209,36 +209,36 @@ async function processUrl(msg, url, spoiler = false) { )}, ${JSON.stringify(headers)}` ); let rawPostData2; - rawPostData2 = await signedFetch( - redirUrl, - Object.assign(options, { - headers: Object.assign(headers, { - "User-Agent": FRIENDLY_USERAGENT, - }), - }) - ) - .then((res) => res.text()) - .catch(async (err) => { - logger.error( - "fedimbed", - `Failed to signed fetch "${url}" via MastoAPI, retrying unsigned: ${err}` - ); - rawPostData2 = await signedFetch( - redirUrl, - Object.assign(options, { - headers: Object.assign(headers, { - "User-Agent": FRIENDLY_USERAGENT, - }), - }) - ) - .then((res) => res.text()) - .catch((err) => { - logger.error( - "fedimbed", - `Failed to fetch "${url}" via MastoAPI: ${err}` - ); - }); - }); + try { + rawPostData2 = await signedFetch( + redirUrl, + Object.assign(options, { + headers: Object.assign(headers, { + "User-Agent": FRIENDLY_USERAGENT, + }), + }) + ).then((res) => res.text()); + } catch (err) { + logger.error( + "fedimbed", + `Failed to signed fetch "${url}" via MastoAPI, retrying unsigned: ${err}` + ); + rawPostData2 = await signedFetch( + redirUrl, + Object.assign(options, { + headers: Object.assign(headers, { + "User-Agent": FRIENDLY_USERAGENT, + }), + }) + ) + .then((res) => res.text()) + .catch((err) => { + logger.error( + "fedimbed", + `Failed to fetch "${url}" via MastoAPI: ${err}` + ); + }); + } let postData2; if (rawPostData2?.startsWith("{")) {