diff --git a/js/mzta-chatgpt.js b/js/mzta-chatgpt.js index 5452e7c3..d92f824d 100644 --- a/js/mzta-chatgpt.js +++ b/js/mzta-chatgpt.js @@ -72,27 +72,26 @@ async function chatgpt_getFromDOM(pos) { // Removing the new buttons that let the user change model and insert a number (4 or 3.5 at the end of the text) let parser = new DOMParser(); let doc = parser.parseFromString(responseDivs[responseDivs.length - 1].innerHTML, 'text/html'); + if(!mztaKeepFormatting) { // Return only TEXT // Select the div with class 'empty:hidden' - // let divToRemove = doc.querySelector('div.empty\\\\:hidden'); - // if (divToRemove) { - // divToRemove.remove(); - // } - // // Extract the new HTML string - // responseDivs[responseDivs.length - 1].innerHTML = doc.body.innerHTML; - // //response = responseDivs[responseDivs.length - 1].textContent; - // response = responseDivs[responseDivs.length - 1].innerHTML; - // console.log('chatgpt_getFromDOM original response: '+ response); - // const parser2 = new DOMParser(); - // const doc2 = parser2.parseFromString(response, 'text/html'); - // Tags to exclude - //console.log(">>>>>>>>> doc.body.innerHTML original: " + doc.body.innerHTML); - const excludeTags = ['div', 'text', 'svg', 'path', 'button']; - const includeTags = ['p', 'ul']; - // removeTags(doc.body, excludeTags); - response = removeTagsAndReturnHTML(doc.body, excludeTags, includeTags) - //console.log(">>>>>>>>> doc.body.innerHTML final: " + doc.body.innerHTML); - // response = doc.body.innerHTML; - + let divToRemove = doc.querySelector('div.empty\\\\:hidden'); + if (divToRemove) { + divToRemove.remove(); + } + // Extract the new HTML string + responseDivs[responseDivs.length - 1].innerHTML = doc.body.innerHTML; + response = responseDivs[responseDivs.length - 1].textContent; + // response = responseDivs[responseDivs.length - 1].innerHTML; + } else { // Return HTML + // Tags to exclude + //console.log(">>>>>>>>> doc.body.innerHTML original: " + doc.body.innerHTML); + const excludeTags = ['div', 'text', 'svg', 'path', 'button']; + const includeTags = ['p', 'ul']; + // removeTags(doc.body, excludeTags); + response = removeTagsAndReturnHTML(doc.body, excludeTags, includeTags) + //console.log(">>>>>>>>> doc.body.innerHTML final: " + doc.body.innerHTML); + // response = doc.body.innerHTML; + } //console.log('chatgpt_getFromDOM final response: '+response); //console.log('chatgpt_getFromDOM: [HTML] ' + responseDivs[responseDivs.length - 1].innerHTML.replace(/]*>/gi, '').replace(/<\\/div>/gi, '').replace(/]*>/gi, '').replace(/<\\/svg>/gi, '').replace(/]*>/gi, '').replace(/<\\/path>/gi, '').replace(/]*>/gi, '').replace(/<\\/text>/gi, '').replace(/]*>/gi, '').replace(/<\\/span>/gi, '').replace(/]*>/gi, '').replace(/<\\/button>/gi, '')); } else { // get nth response --- HERE ONLY TEXT FROM RESPONSE, NO HTML diff --git a/mzta-background.js b/mzta-background.js index 92831bdb..9c3e886a 100644 --- a/mzta-background.js +++ b/mzta-background.js @@ -139,6 +139,7 @@ messenger.runtime.onMessage.addListener(async (message, sender, sendResponse) => async function openChatGPT(promptText, action, curr_tabId, do_custom_text = 0) { let prefs = await browser.storage.sync.get(prefs_default); prefs = checkScreenDimensions(prefs); + //console.log(">>>>>>>>>>>>>>>> prefs: " + JSON.stringify(prefs)); console.log('[ThunderAI] Prompt length: ' + promptText.length); if(promptText.length > 30000 ){ // Prompt too long for ChatGPT @@ -179,6 +180,7 @@ async function openChatGPT(promptText, action, curr_tabId, do_custom_text = 0) { let mztaForceCompletionDesc="`+ browser.i18n.getMessage("chatgpt_force_completion") +`"; let mztaForceCompletionTitle="`+ browser.i18n.getMessage("chatgpt_force_completion_title") +`"; let mztaDoCustomText=`+ do_custom_text +`; + let mztaKeepFormatting=`+ prefs.chatgpt_keep_formatting +`; `; browser.tabs.executeScript(createdTab.id, { code: pre_script + mzta_script, matchAboutBlank: false })