jason/ThunderAI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

curr_message null error when there are no placeholders fixed. see #206

Browse source
This commit is contained in:
mic 2024-12-25 23:17:01 +01:00
parent f6e73f5481
commit b6c19e11b3
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
js/mzta-menus.js
View file

@ -117,6 +117,23 @@ export class mzta_Menus {
let fullPrompt = ''; let fullPrompt = '';
let full_tags_list = await getTagsList(); let full_tags_list = await getTagsList();
let curr_messages = null;
switch(tabs[0].type){
case 'mail':
curr_messages = await browser.mailTabs.getSelectedMessages();
curr_message = curr_messages.messages[0];
break;
case 'messageDisplay':
curr_messages = await messenger.messageDisplay.getDisplayedMessage(tabs[0].id);
curr_message = curr_messages;
break;
case 'messageCompose':
curr_messages = await browser.compose.getComposeDetails(tabs[0].id);
curr_message = curr_messages;
break;
}
if(!placeholdersUtils.hasPlaceholder(curr_prompt.text)){ if(!placeholdersUtils.hasPlaceholder(curr_prompt.text)){
// no placeholders, do as usual // no placeholders, do as usual
fullPrompt = curr_prompt.text + (String(curr_prompt.need_signature) == "1" ? " " + await this.getDefaultSignature():"") + " " + chatgpt_lang + " \"" + (selection_text=='' ? body_text : selection_text) + "\" "; fullPrompt = curr_prompt.text + (String(curr_prompt.need_signature) == "1" ? " " + await this.getDefaultSignature():"") + " " + chatgpt_lang + " \"" + (selection_text=='' ? body_text : selection_text) + "\" ";
@ -125,21 +142,6 @@ export class mzta_Menus {
let currPHs = await placeholdersUtils.extractPlaceholders(curr_prompt.text); let currPHs = await placeholdersUtils.extractPlaceholders(curr_prompt.text);
// console.log(">>>>>>>>>> currPHs: " + JSON.stringify(currPHs)); // console.log(">>>>>>>>>> currPHs: " + JSON.stringify(currPHs));
let finalSubs = {}; let finalSubs = {};
let curr_messages = null;
switch(tabs[0].type){
case 'mail':
curr_messages = await browser.mailTabs.getSelectedMessages();
curr_message = curr_messages.messages[0];
break;
case 'messageDisplay':
curr_messages = await messenger.messageDisplay.getDisplayedMessage(tabs[0].id);
curr_message = curr_messages;
break;
case 'messageCompose':
curr_messages = await browser.compose.getComposeDetails(tabs[0].id);
curr_message = curr_messages;
break;
}
for(let currPH of currPHs){ for(let currPH of currPHs){
switch(currPH.id){ switch(currPH.id){
case 'mail_text_body': case 'mail_text_body':