From 2eee32093457757b9252ea429c103b7625882d0b Mon Sep 17 00:00:00 2001 From: Erisa <101444750+Asayukiii@users.noreply.github.com> Date: Sat, 10 Aug 2024 00:02:47 +0000 Subject: [PATCH 1/2] Made trim each line and remove blank lines if possible --- src/functions/textTrim.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/functions/textTrim.js b/src/functions/textTrim.js index 3f064a5ca..c4246c10a 100644 --- a/src/functions/textTrim.js +++ b/src/functions/textTrim.js @@ -2,7 +2,9 @@ module.exports = d => { const data = d.util.aoiFunc(d); let [text] = data.inside.splits; - data.result = text.trim(); + data.result = /\n/.test(text) + ? text.split(/\n/).map(l => l.trim()).filter(l => l !== "").join("\n") + : text.trim(); return { code: d.util.setCode(data) From 11abebc70bbad69d315baba916d3f7edc893db49 Mon Sep 17 00:00:00 2001 From: Erisa <101444750+Asayukiii@users.noreply.github.com> Date: Tue, 13 Aug 2024 00:40:24 +0000 Subject: [PATCH 2/2] Improvements for httpRequest --- src/functions/httpRequest.js | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/functions/httpRequest.js b/src/functions/httpRequest.js index a75371ece..58d863b9d 100644 --- a/src/functions/httpRequest.js +++ b/src/functions/httpRequest.js @@ -4,10 +4,17 @@ module.exports = async (d) => { const data = d.util.aoiFunc(d); if (data.err) return d.error(data.err); - let [url, method = 'get', body = '', property, error = 'default', ...header] = - data.inside.splits; + let [ + url, + method = 'get', + body = '', + property, + error = 'default', + ...header + ] = data.inside.splits; - body = body?.trim() === '' ? undefined : body + body = body?.trim() === '' ? undefined : body; + let headers = {}; if (header.length === 1) { try { @@ -34,9 +41,15 @@ module.exports = async (d) => { }); const responseBody = await response.text(); - data.result = property - ? eval(`JSON.parse(responseBody)?.${property}`) - : responseBody; + const contentType = response.headers.get("content-type")?.split(/;/)[0]; + + if (property && /content(-|\s)?type/gi.test(property)) { + data.result = contentType; + } else if (property && contentType.includes("json")) { + data.result = eval(`JSON.parse(responseBody)?.${property}`) + } else { + data.result = responseBody; + } } catch (err) { console.error(err); if (error === 'default') {