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

using the prompt conntype in addtags. see #438

Browse source
This commit is contained in:
Mic 2025-09-03 23:18:00 +02:00
parent 40b6571e04
commit f1377f7de8
1 changed files with 49 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
mzta-background.js
View file

@ -20,7 +20,34 @@ import { mzta_script } from './js/mzta-chatgpt.js';
import { prefs_default } from './options/mzta-options-default.js';
import { mzta_Menus } from './js/mzta-menus.js';
import { taLogger } from './js/mzta-logger.js';
import { getCurrentIdentity, getOriginalBody, replaceBody, setBody, i18nConditionalGet, generateCallID, migrateCustomPromptsStorage, migrateDefaultPromptsPropStorage, getGPTWebModelString, getTagsList, createTag, assignTagsToMessage, checkIfTagLabelExists, getActiveSpecialPromptsIDs, checkSparksPresence, getMessages, getMailBody, extractJsonObject, contextMenuID_AddTags, contextMenuID_Spamfilter, sanitizeChatGPTModelData, sanitizeChatGPTWebCustomData, stripHtmlKeepLines, htmlBodyToPlainText, convertNewlinesToParagraphs } from './js/mzta-utils.js';
import {
getCurrentIdentity,
getOriginalBody,
replaceBody,
setBody,
i18nConditionalGet,
generateCallID,
migrateCustomPromptsStorage,
migrateDefaultPromptsPropStorage,
getGPTWebModelString,
getTagsList,
createTag,
assignTagsToMessage,
checkIfTagLabelExists,
getActiveSpecialPromptsIDs,
checkSparksPresence,
getMessages,
getMailBody,
extractJsonObject,
contextMenuID_AddTags,
contextMenuID_Spamfilter,
sanitizeChatGPTModelData,
sanitizeChatGPTWebCustomData,
stripHtmlKeepLines,
htmlBodyToPlainText,
convertNewlinesToParagraphs,
getConnectionType
} from './js/mzta-utils.js';
import { taPromptUtils } from './js/mzta-utils-prompt.js';
import { mzta_specialCommand } from './js/mzta-special-commands.js';
import { getSpamFilterPrompt } from './js/mzta-prompts.js';
@ -749,7 +776,23 @@ function doGetSparkFeature(spark_feature_active) {
}
async function reload_pref_init(){
prefs_init = await browser.storage.sync.get({do_debug: prefs_default.do_debug, add_tags: prefs_default.add_tags, get_calendar_event: prefs_default.get_calendar_event, get_task: prefs_default.get_task, connection_type: prefs_default.connection_type, add_tags_auto: prefs_default.add_tags_auto, add_tags_auto_force_existing: prefs_default.add_tags_auto_force_existing, add_tags_auto_only_inbox: prefs_default.add_tags_auto_only_inbox, spamfilter: prefs_default.spamfilter, spamfilter_threshold: prefs_default.spamfilter_threshold, dynamic_menu_force_enter: prefs_default.dynamic_menu_force_enter, add_tags_context_menu: prefs_default.add_tags_context_menu, spamfilter_context_menu: prefs_default.spamfilter_context_menu});
prefs_init = await browser.storage.sync.get({
do_debug: prefs_default.do_debug,
add_tags: prefs_default.add_tags,
get_calendar_event: prefs_default.get_calendar_event,
get_task: prefs_default.get_task,
connection_type: prefs_default.connection_type,
add_tags_auto: prefs_default.add_tags_auto,
add_tags_auto_force_existing: prefs_default.add_tags_auto_force_existing,
add_tags_auto_only_inbox: prefs_default.add_tags_auto_only_inbox,
spamfilter: prefs_default.spamfilter,
spamfilter_threshold: prefs_default.spamfilter_threshold,
dynamic_menu_force_enter: prefs_default.dynamic_menu_force_enter,
add_tags_context_menu: prefs_default.add_tags_context_menu,
spamfilter_context_menu: prefs_default.spamfilter_context_menu,
add_tags_connection_type: prefs_default.add_tags_connection_type,
spamfilter_connection_type: prefs_default.spamfilter_connection_type
});
_process_incoming = prefs_init.add_tags_auto || prefs_init.spamfilter;
_sparks_presence = await checkSparksPresence();
}
@ -910,12 +953,12 @@ function removeContextMenu(menu_id) {
}
// Add Context menu: Add tags
if(prefs_init.add_tags && prefs_init.add_tags_context_menu && (prefs_init.connection_type !== "chatgpt_web")){
if(prefs_init.add_tags && prefs_init.add_tags_context_menu && ((prefs_init.connection_type !== "chatgpt_web")||(prefs_init.add_tags_connection_type !== ""))){
addContextMenu(contextMenuID_AddTags);
}
// Add Context menu: Spamfilter
if(prefs_init.spamfilter && prefs_init.spamfilter_context_menu && (prefs_init.connection_type !== "chatgpt_web")){
if(prefs_init.spamfilter && prefs_init.spamfilter_context_menu && ((prefs_init.connection_type !== "chatgpt_web")||(prefs_init.spamfilter_connection_type !== ""))){
addContextMenu(contextMenuID_Spamfilter);
}
@ -1019,7 +1062,7 @@ async function processEmails(messages, addTagsAuto, spamFilter) {
});
specialFullPrompt_add_tags = taPromptUtils.finalizePrompt_add_tags(specialFullPrompt_add_tags, prefs_aats.add_tags_maxnum, prefs_aats.add_tags_force_lang, prefs_aats.default_chatgpt_lang, prefs_aats.add_tags_auto_uselist, prefs_aats.add_tags_auto_uselist_list);
taLog.log("Special prompt: " + specialFullPrompt_add_tags);
let cmd_addTags = new mzta_specialCommand(specialFullPrompt_add_tags, prefs_aats.connection_type, prefs_init.do_debug);
let cmd_addTags = new mzta_specialCommand(specialFullPrompt_add_tags, getConnectionType(prefs_aats.connection_type, curr_prompt_add_tags), prefs_init.do_debug);
await cmd_addTags.initWorker();
let tags_current_email = [];
try {
@ -1053,7 +1096,7 @@ async function processEmails(messages, addTagsAuto, spamFilter) {
});
taLog.log("Special prompt: " + specialFullPrompt_spamfilter);
// console.log(">>>>>>>> Special prompt for spamfilter: " + specialFullPrompt_spamfilter);
let cmd_spamfilter = new mzta_specialCommand(specialFullPrompt_spamfilter, prefs_init.connection_type, prefs_init.do_debug);
let cmd_spamfilter = new mzta_specialCommand(specialFullPrompt_spamfilter, getConnectionType(prefs_init.connection_type, curr_prompt_spamfilter), prefs_init.do_debug);
await cmd_spamfilter.initWorker();
let spamfilter_result = '';
taLog.log("Sending the prompt...");