adding the statement to the prompt to limit the used tags. see #289
This commit is contained in:
parent
c25639b245
commit
0f22ae5148
3 changed files with 28 additions and 9 deletions
|
|
@ -1139,6 +1139,10 @@
|
||||||
"message": "The list must contain at least one tag. The tags must be separated by a comma.",
|
"message": "The list must contain at least one tag. The tags must be separated by a comma.",
|
||||||
"description": ""
|
"description": ""
|
||||||
},
|
},
|
||||||
|
"prompt_add_tags_use_list": {
|
||||||
|
"message": "Use only these tags, that are comma separated in the list",
|
||||||
|
"description": ""
|
||||||
|
},
|
||||||
"prefs_OptionText_add_tags_auto_only_inbox": {
|
"prefs_OptionText_add_tags_auto_only_inbox": {
|
||||||
"message": "Only add tags to inbox emails",
|
"message": "Only add tags to inbox emails",
|
||||||
"description": ""
|
"description": ""
|
||||||
|
|
|
||||||
|
|
@ -80,13 +80,16 @@ export const taPromptUtils = {
|
||||||
return fullPrompt;
|
return fullPrompt;
|
||||||
},
|
},
|
||||||
|
|
||||||
finalizePrompt_add_tags(fullPrompt, add_tags_maxnum, add_tags_force_lang, default_chatgpt_lang){
|
finalizePrompt_add_tags(fullPrompt, add_tags_maxnum, add_tags_force_lang, default_chatgpt_lang, add_tags_auto_uselist = false, add_tags_auto_uselist_list = ''){
|
||||||
if(add_tags_maxnum > 0){
|
if(add_tags_maxnum > 0){
|
||||||
fullPrompt += " \n" + browser.i18n.getMessage("prompt_add_tags_maxnum") + " " + add_tags_maxnum +".";
|
fullPrompt += " \n" + browser.i18n.getMessage("prompt_add_tags_maxnum") + " " + add_tags_maxnum +".";
|
||||||
}
|
}
|
||||||
if(add_tags_force_lang && default_chatgpt_lang !== ''){
|
if(add_tags_force_lang && default_chatgpt_lang !== ''){
|
||||||
fullPrompt += " \n" + browser.i18n.getMessage("prompt_add_tags_force_lang") + " " + default_chatgpt_lang + ".";
|
fullPrompt += " \n" + browser.i18n.getMessage("prompt_add_tags_force_lang") + " " + default_chatgpt_lang + ".";
|
||||||
}
|
}
|
||||||
|
if(add_tags_auto_uselist && add_tags_auto_uselist_list && add_tags_auto_uselist_list.length > 0){
|
||||||
|
fullPrompt += " \n" + browser.i18n.getMessage("prompt_add_tags_use_list") + " " + add_tags_auto_uselist_list + ".";
|
||||||
|
}
|
||||||
|
|
||||||
return fullPrompt;
|
return fullPrompt;
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -100,6 +100,8 @@ document.addEventListener('DOMContentLoaded', async () => {
|
||||||
|
|
||||||
document.getElementById('add_tags_maxnum').addEventListener('change', updateAdditionalPromptStatements);
|
document.getElementById('add_tags_maxnum').addEventListener('change', updateAdditionalPromptStatements);
|
||||||
document.getElementById('add_tags_force_lang').addEventListener('change', updateAdditionalPromptStatements);
|
document.getElementById('add_tags_force_lang').addEventListener('change', updateAdditionalPromptStatements);
|
||||||
|
document.getElementById('add_tags_auto_uselist').addEventListener('change', updateAdditionalPromptStatements);
|
||||||
|
document.getElementById('add_tags_auto_uselist_list').addEventListener('change', updateAdditionalPromptStatements);
|
||||||
|
|
||||||
updateAdditionalPromptStatements();
|
updateAdditionalPromptStatements();
|
||||||
|
|
||||||
|
|
@ -124,7 +126,7 @@ document.addEventListener('DOMContentLoaded', async () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
excl_list_save_btn.addEventListener('click', () => {
|
excl_list_save_btn.addEventListener('click', () => {
|
||||||
let excl_array_new = normalizeStringList(excl_list_textarea.value, true);
|
let excl_array_new = normalizeStringList(excl_list_textarea.value, 2);
|
||||||
addTags_setExclusionList(excl_array_new);
|
addTags_setExclusionList(excl_array_new);
|
||||||
excl_list_save_btn.disabled = true;
|
excl_list_save_btn.disabled = true;
|
||||||
excl_list_textarea.value = excl_array_new.join('\n');
|
excl_list_textarea.value = excl_array_new.join('\n');
|
||||||
|
|
@ -189,19 +191,26 @@ document.addEventListener('DOMContentLoaded', async () => {
|
||||||
|
|
||||||
|
|
||||||
async function updateAdditionalPromptStatements(){
|
async function updateAdditionalPromptStatements(){
|
||||||
let prefs_ = await browser.storage.sync.get({add_tags_maxnum: 3, add_tags_force_lang: true, default_chatgpt_lang: ''});
|
let prefs_ = await browser.storage.sync.get({
|
||||||
|
add_tags_maxnum: prefs_default.add_tags_maxnum,
|
||||||
|
add_tags_force_lang: prefs_default.add_tags_force_lang,
|
||||||
|
default_chatgpt_lang: prefs_default.default_chatgpt_lang,
|
||||||
|
add_tags_auto_uselist: prefs_default.add_tags_auto_uselist,
|
||||||
|
add_tags_auto_uselist_list: prefs_default.add_tags_auto_uselist_list,
|
||||||
|
});
|
||||||
let el_tag_limit = document.getElementById('addtags_info_additional_statements');
|
let el_tag_limit = document.getElementById('addtags_info_additional_statements');
|
||||||
if((prefs_.add_tags_maxnum > 0)||(prefs_.add_tags_force_lang && prefs_.default_chatgpt_lang !== '')){
|
if((prefs_.add_tags_maxnum > 0)||(prefs_.add_tags_force_lang && prefs_.default_chatgpt_lang !== '')||(prefs_.add_tags_auto_uselist && prefs_.add_tags_auto_uselist_list.trim() !== '')){
|
||||||
el_tag_limit.textContent = browser.i18n.getMessage("addtags_info_additional_statements") + " \""
|
el_tag_limit.textContent = browser.i18n.getMessage("addtags_info_additional_statements") + " \""
|
||||||
if(prefs_.add_tags_maxnum > 0){
|
if(prefs_.add_tags_maxnum > 0){
|
||||||
el_tag_limit.textContent += browser.i18n.getMessage("prompt_add_tags_maxnum") + " " + prefs_.add_tags_maxnum +"."
|
el_tag_limit.textContent += browser.i18n.getMessage("prompt_add_tags_maxnum") + " " + prefs_.add_tags_maxnum +". "
|
||||||
}
|
}
|
||||||
if(prefs_.add_tags_force_lang && prefs_.default_chatgpt_lang !== ''){
|
if(prefs_.add_tags_force_lang && prefs_.default_chatgpt_lang !== ''){
|
||||||
if(prefs_.add_tags_maxnum > 0){
|
el_tag_limit.textContent += browser.i18n.getMessage("prompt_add_tags_force_lang") + " " + prefs_.default_chatgpt_lang + ". "
|
||||||
el_tag_limit.textContent += " "
|
|
||||||
}
|
|
||||||
el_tag_limit.textContent += browser.i18n.getMessage("prompt_add_tags_force_lang") + " " + prefs_.default_chatgpt_lang + "."
|
|
||||||
}
|
}
|
||||||
|
if(prefs_.add_tags_auto_uselist && prefs_.add_tags_auto_uselist_list.trim() !== ''){
|
||||||
|
el_tag_limit.textContent += browser.i18n.getMessage("prompt_add_tags_use_list") + ": " + prefs_.add_tags_auto_uselist_list + ".";
|
||||||
|
}
|
||||||
|
el_tag_limit.textContent = el_tag_limit.textContent.trim();
|
||||||
el_tag_limit.textContent += "\".";
|
el_tag_limit.textContent += "\".";
|
||||||
el_tag_limit.style.display = 'block';
|
el_tag_limit.style.display = 'block';
|
||||||
}else{
|
}else{
|
||||||
|
|
@ -263,6 +272,9 @@ async function restoreOptions() {
|
||||||
case 'password':
|
case 'password':
|
||||||
let default_text_value = '';
|
let default_text_value = '';
|
||||||
if(element.id == 'default_chatgpt_lang') default_text_value = prefs_default.default_chatgpt_lang;
|
if(element.id == 'default_chatgpt_lang') default_text_value = prefs_default.default_chatgpt_lang;
|
||||||
|
if(element.id === 'add_tags_auto_uselist_list') {
|
||||||
|
result[element.id] = normalizeStringList(result[element.id], 1);
|
||||||
|
}
|
||||||
element.value = result[element.id] || default_text_value;
|
element.value = result[element.id] || default_text_value;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue