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

Implement fail-safe placeholders for email components to handle null or undefined values. fixes #288

Browse source
This commit is contained in:
mic 2025-03-09 21:56:03 +01:00
parent 3608b2d3a1
commit bf3b2a0898
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
js/mzta-placeholders.js
View file

@ -291,62 +291,62 @@ export const placeholdersUtils = {
for(let currPH of currPHs){ for(let currPH of currPHs){
switch(currPH.id){ switch(currPH.id){
case 'mail_text_body': case 'mail_text_body':
finalSubs['mail_text_body'] = body_text; finalSubs['mail_text_body'] = placeholdersUtils.failSafePlaceholders(body_text);
break; break;
case 'mail_html_body': case 'mail_html_body':
finalSubs['mail_html_body'] = msg_text.html; finalSubs['mail_html_body'] = placeholdersUtils.failSafePlaceholders(msg_text?.html);
break; break;
case 'mail_typed_text': case 'mail_typed_text':
finalSubs['mail_typed_text'] = only_typed_text; finalSubs['mail_typed_text'] = placeholdersUtils.failSafePlaceholders(only_typed_text);
break; break;
case 'mail_subject': case 'mail_subject':
finalSubs['mail_subject'] = mail_subject; finalSubs['mail_subject'] = placeholdersUtils.failSafePlaceholders(mail_subject);
break; break;
case 'mail_folder_name': case 'mail_folder_name':
finalSubs['mail_folder_name'] = curr_message.folder.name; finalSubs['mail_folder_name'] = placeholdersUtils.failSafePlaceholders(curr_message.folder?.name);
break; break;
case 'mail_folder_path': case 'mail_folder_path':
finalSubs['mail_folder_path'] = curr_message.folder.path; finalSubs['mail_folder_path'] = placeholdersUtils.failSafePlaceholders(curr_message.folder?.path);
break; break;
case 'selected_text': case 'selected_text':
finalSubs['selected_text'] = selection_text; finalSubs['selected_text'] = placeholdersUtils.failSafePlaceholders(selection_text);
break; break;
case 'author': case 'author':
finalSubs['author'] = curr_message.author; finalSubs['author'] = placeholdersUtils.failSafePlaceholders(curr_message.author);
break; break;
case 'recipients': case 'recipients':
finalSubs['recipients'] = curr_message.recipients.join(", "); finalSubs['recipients'] = placeholdersUtils.failSafePlaceholders(curr_message.recipients?.join(", "));
break; break;
case 'cc_list': case 'cc_list':
finalSubs['cc_list'] = curr_message.ccList.join(", "); finalSubs['cc_list'] = placeholdersUtils.failSafePlaceholders(curr_message.ccList?.join(", "));
break; break;
case 'junk_score': case 'junk_score':
finalSubs['junk_score'] = curr_message.junkScore; finalSubs['junk_score'] = placeholdersUtils.failSafePlaceholders(curr_message.junkScore);
break; break;
case 'mail_datetime': case 'mail_datetime':
finalSubs['mail_datetime'] = curr_message.date; finalSubs['mail_datetime'] = placeholdersUtils.failSafePlaceholders(curr_message.date);
break; break;
case 'current_datetime': case 'current_datetime':
finalSubs['current_datetime'] = new Date().toString(); finalSubs['current_datetime'] = placeholdersUtils.failSafePlaceholders(new Date().toString());
break; break;
case 'account_email_address': case 'account_email_address':
let current_identity = await getCurrentIdentity(curr_message, true); let current_identity = await getCurrentIdentity(curr_message, true);
finalSubs['account_email_address'] = current_identity.email; finalSubs['account_email_address'] = placeholdersUtils.failSafePlaceholders(current_identity.email);
break; break;
case 'tags_current_email': case 'tags_current_email':
let tags_current_email_array = await transformTagsLabels(curr_message.tags, tags_full_list[1]); let tags_current_email_array = await transformTagsLabels(curr_message.tags, tags_full_list[1]);
finalSubs['tags_current_email'] = tags_current_email_array.join(", "); finalSubs['tags_current_email'] = placeholdersUtils.failSafePlaceholders(tags_current_email_array.join(", "));
break; break;
case 'tags_full_list': case 'tags_full_list':
finalSubs['tags_full_list'] = tags_full_list[0]; finalSubs['tags_full_list'] = placeholdersUtils.failSafePlaceholders(tags_full_list[0]);
break; break;
case 'thunderai_def_sign': case 'thunderai_def_sign':
let prefs_def_sign = await browser.storage.sync.get({default_sign_name: ''}); let prefs_def_sign = await browser.storage.sync.get({default_sign_name: ''});
finalSubs['thunderai_def_sign'] = prefs_def_sign.default_sign_name; finalSubs['thunderai_def_sign'] = placeholdersUtils.failSafePlaceholders(prefs_def_sign.default_sign_name);
break; break;
case 'thunderai_def_lang': case 'thunderai_def_lang':
let prefs_def_lang = await browser.storage.sync.get({default_chatgpt_lang: ''}); let prefs_def_lang = await browser.storage.sync.get({default_chatgpt_lang: ''});
finalSubs['thunderai_def_lang'] = prefs_def_lang.default_chatgpt_lang; finalSubs['thunderai_def_lang'] = placeholdersUtils.failSafePlaceholders(prefs_def_lang.default_chatgpt_lang);
break; break;
default: // TODO Manage custom placeholders https://github.com/micz/ThunderAI/issues/156 default: // TODO Manage custom placeholders https://github.com/micz/ThunderAI/issues/156
break; break;
@ -354,6 +354,12 @@ export const placeholdersUtils = {
} }
return finalSubs; return finalSubs;
},
failSafePlaceholders(element){
if(element === null || element === undefined){
return '';
}
} }
} }