From 9ea5be1777f7140f10c8afcc75931025e1045d27 Mon Sep 17 00:00:00 2001 From: bingus_violet Date: Fri, 31 May 2024 01:28:48 -0500 Subject: [PATCH] Only check body if body actually exists, apply conversions to Rich Presence --- pageUpdater.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pageUpdater.js b/pageUpdater.js index 111fa50..1fc99c8 100644 --- a/pageUpdater.js +++ b/pageUpdater.js @@ -110,9 +110,12 @@ function converter(html) { replacers.ALL_KEYWORDS = "{" + Object.keys(replacers).join("}{") + "} " - var bodyHTML = htmlMinifier.minify(html.substring(html.indexOf("") + 6, html.lastIndexOf(""))) - - var parsedHTML = himalaya.parse(bodyHTML) + if (html.includes("")) { + var bodyHTML = htmlMinifier.minify(html.substring(html.indexOf("") + 6, html.lastIndexOf(""))) + var parsedHTML = himalaya.parse(bodyHTML) + } else { + var parsedHTML = himalaya.parse(html) + } function scanParsedHTML(json) { for (var i = 0; i < json.length; i++) { @@ -196,7 +199,11 @@ function converter(html) { parsedHTML = himalaya.stringify(parsedHTML) - html = html.substring(0, html.indexOf("")) + parsedHTML + html.substring(html.indexOf("") + 7) + if (html.includes("")) { + html = html.substring(0, html.indexOf("")) + parsedHTML + html.substring(html.indexOf("") + 7) + } else { + html = parsedHTML + } html = html.replaceAll("{LOAD_TIME}", (Date.now() - startTime).toString() + "ms") @@ -205,7 +212,7 @@ function converter(html) { module.exports = { getActivities: function () { - return htmlMinifier.minify(activityToHTML.activitiesToHTML(lanyardData, cachedImages)) + return htmlMinifier.minify(converter(activityToHTML.activitiesToHTML(lanyardData, cachedImages))) }, middleWare: async function (req, res, next) {