Added sync Settings toggle to toggle.proxy() + .streaming()

adamlui · Jun 27, 2024 · 8a1f926 · 8a1f926
1 parent 5487017
commit 8a1f926
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 14 deletions.
diff --git a/bravegpt/greasemonkey/bravegpt.user.js b/bravegpt/greasemonkey/bravegpt.user.js
@@ -148,7 +148,7 @@
 // @description:zu      Yengeza izimpendulo ze-AI ku-Brave Search (inikwa amandla yi-GPT-4o!)
 // @author              KudoAI
 // @namespace           https://kudoai.com
-// @version             2024.6.27.10
+// @version             2024.6.27.12
 // @license             MIT
 // @icon                https://media.bravegpt.com/images/icons/bravegpt/icon48.png?0a9e287
 // @icon64              https://media.bravegpt.com/images/icons/bravegpt/icon64.png?0a9e287
@@ -1448,7 +1448,10 @@ setTimeout(async () => {
             saveSetting('proxyAPIenabled', !config.proxyAPIenabled)
             notify(( msgs.menuLabel_proxyAPImode || 'Proxy API Mode' ) + ' ' + menuState.word[+config.proxyAPIenabled])
             refreshMenu()
-            if (appDiv.querySelector('#bravegpt-alert')) location.reload() // re-send query if user alerted 
+            const proxyToggle = document.querySelector('[id*="proxy"][id*="menu-entry"] input')
+            if (proxyToggle && proxyToggle.checked != config.proxyAPIenabled) // update visual state of Settings modal
+                modals.settings.toggle.switch(proxyToggle)
+            if (appDiv.querySelector('#ddgpt-alert')) location.reload() // re-send query if user alerted 
         },
 
         relatedQueries() {
@@ -1490,15 +1493,17 @@ setTimeout(async () => {
                         + ` <a target="_blank" rel="noopener" href="${scriptCatLink}">ScriptCat</a>.` // suggest SC
                         + ` (${ msgs.alert_userscriptMgrNoStream || 'Your userscript manager does not support returning stream responses' }.)`
                 )
-                if (streamingToggle) modals.settings.toggle.switch(streamingToggle) // reverse toggle visually
+                if (streamingToggle && streamingToggle.checked == config.streamingDisabled) // revert Settings auto-toggle
+                    modals.settings.toggle.switch(streamingToggle)
             } else if (getUserscriptManager() == 'Tampermonkey' && (isChrome || isEdge || isBrave)) { // alert TM/browser unsupported, suggest SC
                 siteAlert(`${settingsProps.streamingDisabled.label} ${ msgs.alert_unavailable || 'unavailable' }`,
                     `${settingsProps.streamingDisabled.label} ${ msgs.alert_isUnsupportedIn || 'is unsupported in' } `
                         + `${ isChrome ? 'Chrome' : isEdge ? 'Edge' : 'Brave' } ${ msgs.alert_whenUsing || 'when using' } Tampermonkey. `
                         + `${ msgs.alert_pleaseUse || 'Please use' } <a target="_blank" rel="noopener" href="${scriptCatLink}">ScriptCat</a> `
                             + `${ msgs.alert_instead || 'instead' }.`
                 )
-                if (streamingToggle) modals.settings.toggle.switch(streamingToggle) // reverse toggle visually
+                if (streamingToggle && streamingToggle.checked == config.streamingDisabled) // revert Settings auto-toggle
+                    modals.settings.toggle.switch(streamingToggle)
             } else if (!config.proxyAPIenabled) { // alert OpenAI API unsupported, suggest Proxy Mode
                 let msg = `${settingsProps.streamingDisabled.label} `
                         + `${ msgs.alert_isCurrentlyOnlyAvailBy || 'is currently only available by' } `
@@ -1509,7 +1514,8 @@ setTimeout(async () => {
                 const alertID = siteAlert(`${ msgs.mode_streaming || 'Streaming Mode' } ${ msgs.alert_unavailable || 'unavailable' }`, msg),
                       alert = document.getElementById(alertID)
                 alert.querySelector('[href="#"]').onclick = () => { alert.querySelector('.modal-close-btn').click() ; toggle.proxyMode() }
-                if (streamingToggle) modals.settings.toggle.switch(streamingToggle) // reverse toggle visually
+                if (streamingToggle && streamingToggle.checked == config.streamingDisabled) // revert Settings auto-toggle
+                    modals.settings.toggle.switch(streamingToggle)
             } else { // functional toggle
                 saveSetting('streamingDisabled', !config.streamingDisabled)
                 notify(settingsProps.streamingDisabled.label + ' ' + menuState.word[+!config.streamingDisabled])

diff --git a/duckduckgpt/greasemonkey/duckduckgpt.user.js b/duckduckgpt/greasemonkey/duckduckgpt.user.js
@@ -148,7 +148,7 @@
 // @description:zu      Yengeza izimpendulo ze-AI ku-DuckDuckGo (inikwa amandla yi-GPT-4o!)
 // @author              KudoAI
 // @namespace           https://kudoai.com
-// @version             2024.6.27.8
+// @version             2024.6.27.9
 // @license             MIT
 // @icon                https://media.ddgpt.com/images/icons/duckduckgpt/icon48.png?af89302
 // @icon64              https://media.ddgpt.com/images/icons/duckduckgpt/icon64.png?af89302
@@ -1378,6 +1378,9 @@
             saveSetting('proxyAPIenabled', !config.proxyAPIenabled)
             notify(( msgs.menuLabel_proxyAPImode || 'Proxy API Mode' ) + ' ' + menuState.word[+config.proxyAPIenabled])
             refreshMenu()
+            const proxyToggle = document.querySelector('[id*="proxy"][id*="menu-entry"] input')
+            if (proxyToggle && proxyToggle.checked != config.proxyAPIenabled) // update visual state of Settings toggle
+                modals.settings.toggle.switch(proxyToggle)
             if (appDiv.querySelector('#ddgpt-alert')) location.reload() // re-send query if user alerted 
         },
 
@@ -1423,15 +1426,17 @@
                         + ` <a target="_blank" rel="noopener" href="${scriptCatLink}">ScriptCat</a>.` // suggest SC
                         + ` (${ msgs.alert_userscriptMgrNoStream || 'Your userscript manager does not support returning stream responses' }.)`
                 )
-                if (streamingToggle) modals.settings.toggle.switch(streamingToggle) // reverse toggle visually
+                if (streamingToggle && streamingToggle.checked == config.streamingDisabled) // revert Settings auto-toggle
+                    modals.settings.toggle.switch(streamingToggle)
             } else if (getUserscriptManager() == 'Tampermonkey' && (isChrome || isEdge || isBrave)) { // alert TM/browser unsupported, suggest SC
                 siteAlert(`${settingsProps.streamingDisabled.label} ${ msgs.alert_unavailable || 'unavailable' }`,
                     `${settingsProps.streamingDisabled.label} ${ msgs.alert_isUnsupportedIn || 'is unsupported in' } `
                         + `${ isChrome ? 'Chrome' : isEdge ? 'Edge' : 'Brave' } ${ msgs.alert_whenUsing || 'when using' } Tampermonkey. `
                         + `${ msgs.alert_pleaseUse || 'Please use' } <a target="_blank" rel="noopener" href="${scriptCatLink}">ScriptCat</a> `
                             + `${ msgs.alert_instead || 'instead' }.`
                 )
-                if (streamingToggle) modals.settings.toggle.switch(streamingToggle) // reverse toggle visually
+                if (streamingToggle && streamingToggle.checked == config.streamingDisabled) // revert Settings auto-toggle
+                    modals.settings.toggle.switch(streamingToggle)
             } else if (!config.proxyAPIenabled) { // alert OpenAI API unsupported, suggest Proxy Mode
                 let msg = `${settingsProps.streamingDisabled.label} `
                         + `${ msgs.alert_isCurrentlyOnlyAvailBy || 'is currently only available by' } `
@@ -1442,7 +1447,8 @@
                 const alertID = siteAlert(`${ msgs.mode_streaming || 'Streaming Mode' } ${ msgs.alert_unavailable || 'unavailable' }`, msg),
                       alert = document.getElementById(alertID)
                 alert.querySelector('[href="#"]').onclick = () => { alert.querySelector('.modal-close-btn').click() ; toggle.proxyMode() }
-                if (streamingToggle) modals.settings.toggle.switch(streamingToggle) // reverse toggle visually
+                if (streamingToggle && streamingToggle.checked == config.streamingDisabled) // revert Settings auto-toggle
+                    modals.settings.toggle.switch(streamingToggle)
             } else { // functional toggle
                 saveSetting('streamingDisabled', !config.streamingDisabled)
                 notify(settingsProps.streamingDisabled.label + ' ' + menuState.word[+!config.streamingDisabled])

diff --git a/googlegpt/greasemonkey/googlegpt.user.js b/googlegpt/greasemonkey/googlegpt.user.js
@@ -149,7 +149,7 @@
 // @description:zu      Yengeza izimpendulo ze-AI ku-Google Search (inikwa amandla yi-Google Gemma + GPT-4o!)
 // @author              KudoAI
 // @namespace           https://kudoai.com
-// @version             2024.6.27.9
+// @version             2024.6.27.10
 // @license             MIT
 // @icon                https://media.googlegpt.io/images/icons/googlegpt/black/icon48.png?8652a6e
 // @icon64              https://media.googlegpt.io/images/icons/googlegpt/black/icon64.png?8652a6e
@@ -1693,7 +1693,10 @@
             saveSetting('proxyAPIenabled', !config.proxyAPIenabled)
             notify(( msgs.menuLabel_proxyAPImode || 'Proxy API Mode' ) + ' ' + menuState.word[+config.proxyAPIenabled])
             refreshMenu()
-            if (appDiv.querySelector('#googlegpt-alert')) location.reload() // re-send query if user alerted 
+            const proxyToggle = document.querySelector('[id*="proxy"][id*="menu-entry"] input')
+            if (proxyToggle && proxyToggle.checked != config.proxyAPIenabled) // update visual state of Settings modal
+                modals.settings.toggle.switch(proxyToggle)
+            if (appDiv.querySelector('#ddgpt-alert')) location.reload() // re-send query if user alerted 
         },
 
         relatedQueries() {
@@ -1738,15 +1741,17 @@
                         + ` <a target="_blank" rel="noopener" href="${scriptCatLink}">ScriptCat</a>.` // suggest SC
                         + ` (${ msgs.alert_userscriptMgrNoStream || 'Your userscript manager does not support returning stream responses' }.)`
                 )
-                if (streamingToggle) modals.settings.toggle.switch(streamingToggle) // reverse toggle visually
+                if (streamingToggle && streamingToggle.checked == config.streamingDisabled) // revert Settings auto-toggle
+                    modals.settings.toggle.switch(streamingToggle)
             } else if (getUserscriptManager() == 'Tampermonkey' && (isChrome || isEdge || isBrave)) { // alert TM/browser unsupported, suggest SC
                 siteAlert(`${settingsProps.streamingDisabled.label} ${ msgs.alert_unavailable || 'unavailable' }`,
                     `${settingsProps.streamingDisabled.label} ${ msgs.alert_isUnsupportedIn || 'is unsupported in' } `
                         + `${ isChrome ? 'Chrome' : isEdge ? 'Edge' : 'Brave' } ${ msgs.alert_whenUsing || 'when using' } Tampermonkey. `
                         + `${ msgs.alert_pleaseUse || 'Please use' } <a target="_blank" rel="noopener" href="${scriptCatLink}">ScriptCat</a> `
                             + `${ msgs.alert_instead || 'instead' }.`
                 )
-                if (streamingToggle) modals.settings.toggle.switch(streamingToggle) // reverse toggle visually
+                if (streamingToggle && streamingToggle.checked == config.streamingDisabled) // revert Settings auto-toggle
+                    modals.settings.toggle.switch(streamingToggle)
             } else if (!config.proxyAPIenabled) { // alert OpenAI API unsupported, suggest Proxy Mode
                 let msg = `${settingsProps.streamingDisabled.label} `
                         + `${ msgs.alert_isCurrentlyOnlyAvailBy || 'is currently only available by' } `
@@ -1757,7 +1762,8 @@
                 const alertID = siteAlert(`${ msgs.mode_streaming || 'Streaming Mode' } ${ msgs.alert_unavailable || 'unavailable' }`, msg),
                       alert = document.getElementById(alertID)
                 alert.querySelector('[href="#"]').onclick = () => { alert.querySelector('.modal-close-btn').click() ; toggle.proxyMode() }
-                if (streamingToggle) modals.settings.toggle.switch(streamingToggle) // reverse toggle visually
+                if (streamingToggle && streamingToggle.checked == config.streamingDisabled) // revert Settings auto-toggle
+                    modals.settings.toggle.switch(streamingToggle)
             } else { // functional toggle
                 saveSetting('streamingDisabled', !config.streamingDisabled)
                 notify(settingsProps.streamingDisabled.label + ' ' + menuState.word[+!config.streamingDisabled])