Skip to content

Commit 3dcf26a

Browse files
adamluiadamlui
committed
Renamed settings.isEnabled to typeIsEnabled(), added/improved comments
1 parent 9a08126 commit 3dcf26a

File tree

15 files changed

+70
-67
lines changed

15 files changed

+70
-67
lines changed

‎autoclear-chatgpt-history/greasemonkey/autoclear-chatgpt-history.user.js‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
// @description:zu Ziba itshala lokucabanga okuzoshintshwa ngokuzenzakalelayo uma ukubuka chatgpt.com
226226
// @author Adam Lui
227227
// @namespace https://github.com/adamlui
228-
// @version 2025.4.1.1
228+
// @version 2025.4.1.2
229229
// @license MIT
230230
// @icon https://cdn.jsdelivr.net/gh/adamlui/autoclear-chatgpt-history@f461c06/assets/images/icons/openai/black/icon48.png
231231
// @icon64 https://cdn.jsdelivr.net/gh/adamlui/autoclear-chatgpt-history@f461c06/assets/images/icons/openai/black/icon64.png
@@ -392,21 +392,21 @@
392392
label: app.msgs.menuLabel_clearNow, helptip: app.msgs.helptip_clearNow }
393393
},
394394

395-
isEnabled(key) {
396-
const reInvertFlags = /disabled|hidden/i
397-
return reInvertFlags.test(key) // flag in control key name
398-
&& !reInvertFlags.test(this.controls[key]?.label || '') // but not in label msg key name
399-
? !config[key] : config[key] // so invert since flag reps opposite state, else don't
400-
},
401-
402395
load(...keys) {
403396
keys.flat().forEach(key => {
404397
config[key] = GM_getValue(`${app.configKeyPrefix}_${key}`,
405398
this.controls[key]?.defaultVal ?? this.controls[key]?.type == 'toggle')
406399
})
407400
},
408401

409-
save(key, val) { GM_setValue(`${app.configKeyPrefix}_${key}`, val) ; config[key] = val }
402+
save(key, val) { GM_setValue(`${app.configKeyPrefix}_${key}`, val) ; config[key] = val },
403+
404+
typeIsEnabled(key) { // for menu labels + notifs to return ON/OFF for type w/o suffix
405+
const reInvertSuffixes = /disabled|hidden/i
406+
return reInvertSuffixes.test(key) // flag in control key name
407+
&& !reInvertSuffixes.test(this.controls[key]?.label || '') // but not in label msg key name
408+
? !config[key] : config[key] // so invert since flag reps opposite type state, else don't
409+
}
410410
}
411411
settings.load(Object.keys(settings.controls))
412412

@@ -429,15 +429,15 @@
429429
this.ids = Object.keys(settings.controls).map(key => {
430430
const ctrlType = settings.controls[key].type
431431
const ctrlStatus = settings.controls[key].status
432-
const menuLabel = `${ settings.controls[key].symbol || this.state.symbols[+settings.isEnabled(key)] } `
433-
+ settings.controls[key].label
434-
+ ( ctrlType == 'toggle' ? this.state.separator
435-
+ this.state.words[+settings.isEnabled(key)]
436-
: ctrlStatus ? `— ${ctrlStatus}` : '' )
432+
const menuLabel = `${
433+
settings.controls[key].symbol || this.state.symbols[+settings.typeIsEnabled(key)] } ${
434+
settings.controls[key].label} ${
435+
ctrlType == 'toggle' ? this.state.separator + this.state.words[+settings.typeIsEnabled(key)]
436+
: ctrlStatus ? `— ${ctrlStatus}` : '' }`
437437
return GM_registerMenuCommand(menuLabel, () => {
438438
if (ctrlType == 'toggle') {
439439
settings.save(key, !config[key]) ; syncConfigToUI({ updatedKey: key })
440-
notify(`${settings.controls[key].label}: ${this.state.words[+settings.isEnabled(key)]}`)
440+
notify(`${settings.controls[key].label}: ${this.state.words[+settings.typeIsEnabled(key)]}`)
441441
} else // Clear Now action
442442
clearChatsAndGoHome()
443443
}, env.scriptManager.supportsTooltips ? { title: settings.controls[key].helptip || ' ' } : undefined)

‎bravegpt/greasemonkey/bravegpt.user.js‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
// @description:zu Yengeza izimpendulo ze-AI ku-Brave Search (inikwa amandla yi-GPT-4o!)
149149
// @author KudoAI
150150
// @namespace https://kudoai.com
151-
// @version 2025.4.1
151+
// @version 2025.4.1.1
152152
// @license MIT
153153
// @icon https://cdn.jsdelivr.net/gh/KudoAI/bravegpt@df624b0/assets/images/icons/bravegpt/icon48.png
154154
// @icon64 https://cdn.jsdelivr.net/gh/KudoAI/bravegpt@df624b0/assets/images/icons/bravegpt/icon64.png
@@ -405,19 +405,22 @@
405405
// Init DEBUG mode
406406
const config = {}
407407
const settings = {
408-
isEnabled(key) {
409-
const reInvertFlags = /disabled|hidden/i
410-
return reInvertFlags.test(key) // flag in control key name
411-
&& !reInvertFlags.test(this.controls[key]?.label || '') // but not in label msg key name
412-
? !config[key] : config[key] // so invert since flag reps opposite state, else don't
413-
},
408+
414409
load(...keys) {
415410
keys.flat().forEach(key => {
416411
config[key] = GM_getValue(`${app.configKeyPrefix}_${key}`,
417412
this.controls?.[key]?.defaultVal ?? this.controls?.[key]?.type == 'toggle')
418413
})
419414
},
420-
save(key, val) { GM_setValue(`${app.configKeyPrefix}_${key}`, val) ; config[key] = val }
415+
416+
save(key, val) { GM_setValue(`${app.configKeyPrefix}_${key}`, val) ; config[key] = val },
417+
418+
typeIsEnabled(key) { // for toggle.<auto|manual>Gen auto-toggles + notifs
419+
const reInvertSuffixes = /disabled|hidden/i
420+
return reInvertSuffixes.test(key) // flag in control key name
421+
&& !reInvertSuffixes.test(this.controls[key]?.label || '') // but not in label msg key name
422+
? !config[key] : config[key] // so invert since flag reps opposite type state, else don't
423+
}
421424
}
422425
settings.load('debugMode')
423426

@@ -3202,18 +3205,18 @@
32023205
modeKey = `auto${log.toTitleCase(mode)}${ mode == 'get' ? 'Disabled' : '' }`
32033206
let conflictingModeToggled = false // to extend this notif duration
32043207
settings.save(modeKey, !config[modeKey])
3205-
if (settings.isEnabled(modeKey)) { // this Auto-Gen mode toggled on, disable other one + Manual-Gen
3208+
if (settings.typeIsEnabled(modeKey)) { // this Auto-Gen mode toggled on, disable other one + Manual-Gen
32063209
const otherMode = validModes[+(mode == validModes[0])],
32073210
otherModeKey = `auto${log.toTitleCase(otherMode)}${ otherMode == 'get' ? 'Disabled' : '' }`
3208-
if (settings.isEnabled(otherModeKey)) { toggle.autoGen(otherMode) ; conflictingModeToggled = true }
3211+
if (settings.typeIsEnabled(otherModeKey)) { toggle.autoGen(otherMode) ; conflictingModeToggled = true }
32093212
['prefix', 'suffix'].forEach(mode => {
32103213
if (config[`${mode}Enabled`]) { toggle.manualGen(mode) ; conflictingModeToggled = true }})
32113214
}
3212-
notify(`${settings.controls[modeKey].label} ${toolbarMenu.state.words[+settings.isEnabled(modeKey)]}`,
3215+
notify(`${settings.controls[modeKey].label} ${toolbarMenu.state.words[+settings.typeIsEnabled(modeKey)]}`,
32133216
null, conflictingModeToggled ? 2.75 : null) // +1s duration if conflicting mode notif shown
32143217
if (modals.settings.get()) { // update visual state of Settings toggle
32153218
const modeToggle = document.querySelector(`[id*=${modeKey}] input`)
3216-
if (modeToggle.checked != settings.isEnabled(modeKey)) modals.settings.toggle.switch(modeToggle)
3219+
if (modeToggle.checked != settings.typeIsEnabled(modeKey)) modals.settings.toggle.switch(modeToggle)
32173220
}
32183221
},
32193222

@@ -3251,7 +3254,7 @@
32513254
settings.save(modeKey, !config[modeKey])
32523255
if (config[modeKey]) // Manual-Gen toggled on, disable all Auto-Gen
32533256
['get', 'summarize'].forEach(mode => {
3254-
if (settings.isEnabled(`auto${log.toTitleCase(mode)}${ mode == 'get' ? 'Disabled' : '' }`)) {
3257+
if (settings.typeIsEnabled(`auto${log.toTitleCase(mode)}${ mode == 'get' ? 'Disabled' : '' }`)) {
32553258
toggle.autoGen(mode) ; autoGenToggled = true }
32563259
})
32573260
notify(`${settings.controls[modeKey].label} ${toolbarMenu.state.words[+config[modeKey]]}`,

‎chatgpt-auto-continue/chromium/extension/lib/settings.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ window.settings = {
2222
return msg
2323
},
2424

25-
isEnabled(key) {
25+
typeIsEnabled(key) { // for menu labels + notifs to return ON/OFF for type w/o suffix
2626
const reInvertFlags = /disabled|hidden/i
2727
return reInvertFlags.test(key) // flag in control key name
2828
&& !reInvertFlags.test(this._msgKeys.get(this.controls[key]?.label) || '') // but not in label msg key name
29-
? !config[key] : config[key] // so invert since flag reps opposite state, else don't
29+
? !config[key] : config[key] // so invert since flag reps opposite type state, else don't
3030
},
3131

3232
load(...keys) {

‎chatgpt-auto-continue/chromium/extension/popup/controller.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
entry.div.append(entry.leftElem, entry.label) ; childEntriesDiv.append(entry.div)
9191
if (ctrlType == 'toggle') { // add track to left, init knob pos
9292
entry.leftElem.append(dom.create.elem('span', { class: 'track' }))
93-
entry.leftElem.classList.toggle('on', settings.isEnabled(key))
93+
entry.leftElem.classList.toggle('on', settings.typeIsEnabled(key))
9494
} else { // add symbol to left, append status to right
9595
entry.leftElem.innerText = settings.controls[key].symbol
9696
entry.label.innerText += ctrlStatus ? `— ${ctrlStatus }` : ''
@@ -101,7 +101,7 @@
101101
entry.leftElem.classList.toggle('on')
102102
settings.save(key, !config[key]) ; sync.configToUI({ updatedKey: key })
103103
notify(`${settings.controls[key].label} ${chrome.i18n.getMessage(`state_${
104-
settings.isEnabled(key) ? 'on' : 'off' }`).toUpperCase()}`)
104+
settings.typeIsEnabled(key) ? 'on' : 'off' }`).toUpperCase()}`)
105105
}
106106
}
107107
})

‎chatgpt-auto-continue/firefox/extension/lib/settings.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ window.settings = {
2222
return msg
2323
},
2424

25-
isEnabled(key) {
25+
typeIsEnabled(key) { // for menu labels + notifs to return ON/OFF for type w/o suffix
2626
const reInvertFlags = /disabled|hidden/i
2727
return reInvertFlags.test(key) // flag in control key name
2828
&& !reInvertFlags.test(this._msgKeys.get(this.controls[key]?.label) || '') // but not in label msg key name
29-
? !config[key] : config[key] // so invert since flag reps opposite state, else don't
29+
? !config[key] : config[key] // so invert since flag reps opposite type state, else don't
3030
},
3131

3232
load(...keys) {

‎chatgpt-auto-continue/firefox/extension/popup/controller.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
entry.div.append(entry.leftElem, entry.label) ; childEntriesDiv.append(entry.div)
9191
if (ctrlType == 'toggle') { // add track to left, init knob pos
9292
entry.leftElem.append(dom.create.elem('span', { class: 'track' }))
93-
entry.leftElem.classList.toggle('on', settings.isEnabled(key))
93+
entry.leftElem.classList.toggle('on', settings.typeIsEnabled(key))
9494
} else { // add symbol to left, append status to right
9595
entry.leftElem.innerText = settings.controls[key].symbol
9696
entry.label.innerText += ctrlStatus ? `— ${ctrlStatus }` : ''
@@ -101,7 +101,7 @@
101101
entry.leftElem.classList.toggle('on')
102102
settings.save(key, !config[key]) ; sync.configToUI({ updatedKey: key })
103103
notify(`${settings.controls[key].label} ${chrome.i18n.getMessage(`state_${
104-
settings.isEnabled(key) ? 'on' : 'off' }`).toUpperCase()}`)
104+
settings.typeIsEnabled(key) ? 'on' : 'off' }`).toUpperCase()}`)
105105
}
106106
}
107107
})

‎chatgpt-auto-refresh/greasemonkey/chatgpt-auto-refresh.user.js‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
// @description:zu *NGOKUPHEPHA* susa ukusetha kabusha ingxoxo yemizuzu eyi-10 + amaphutha enethiwekhi ahlala njalo + Ukuhlolwa kwe-Cloudflare ku-ChatGPT.
221221
// @author Adam Lui
222222
// @namespace https://github.com/adamlui
223-
// @version 2025.4.1.2
223+
// @version 2025.4.1.3
224224
// @license MIT
225225
// @icon https://cdn.jsdelivr.net/gh/adamlui/chatgpt-auto-refresh@f11a0a8/assets/images/icons/openai/black/icon48.png
226226
// @icon64 https://cdn.jsdelivr.net/gh/adamlui/chatgpt-auto-refresh@f11a0a8/assets/images/icons/openai/black/icon64.png
@@ -401,21 +401,21 @@
401401
label: app.msgs.menuLabel_refreshInt, helptip: app.msgs.helptip_refreshInt }
402402
},
403403

404-
isEnabled(key) {
405-
const reInvertFlags = /disabled|hidden/i
406-
return reInvertFlags.test(key) // flag in control key name
407-
&& !reInvertFlags.test(this.controls[key]?.label || '') // but not in label msg key name
408-
? !config[key] : config[key] // so invert since flag reps opposite state, else don't
409-
},
410-
411404
load(...keys) {
412405
keys.flat().forEach(key => {
413406
config[key] = GM_getValue(`${app.configKeyPrefix}_${key}`,
414407
this.controls[key]?.defaultVal ?? this.controls[key]?.type == 'toggle')
415408
})
416409
},
417410

418-
save(key, val) { GM_setValue(`${app.configKeyPrefix}_${key}`, val) ; config[key] = val }
411+
save(key, val) { GM_setValue(`${app.configKeyPrefix}_${key}`, val) ; config[key] = val },
412+
413+
typeIsEnabled(key) { // for menu labels + notifs to return ON/OFF for type w/o suffix
414+
const reInvertSuffixes = /disabled|hidden/i
415+
return reInvertSuffixes.test(key) // flag in control key name
416+
&& !reInvertSuffixes.test(this.controls[key]?.label || '') // but not in label msg key name
417+
? !config[key] : config[key] // so invert since flag reps opposite type state, else don't
418+
}
419419
}
420420
settings.load(Object.keys(settings.controls))
421421
if (!config.refreshInterval) settings.save('refreshInterval', 30) // init refresh interval to 30 secs if unset
@@ -442,15 +442,15 @@
442442
this.ids = Object.keys(settings.controls).map(key => {
443443
const ctrlType = settings.controls[key].type
444444
const ctrlStatus = settings.controls[key].status
445-
const menuLabel = `${ settings.controls[key].symbol || this.state.symbols[+settings.isEnabled(key)] } `
446-
+ settings.controls[key].label
447-
+ ( ctrlType == 'toggle' ? this.state.separator
448-
+ this.state.words[+settings.isEnabled(key)]
449-
: ctrlStatus ? `— ${settings.controls[key].status}` : '' )
445+
const menuLabel = `${
446+
settings.controls[key].symbol || this.state.symbols[+settings.typeIsEnabled(key)] } ${
447+
settings.controls[key].label} ${
448+
ctrlType == 'toggle' ? this.state.separator + this.state.words[+settings.typeIsEnabled(key)]
449+
: ctrlStatus ? `— ${ctrlStatus}` : '' }`
450450
return GM_registerMenuCommand(menuLabel, () => {
451451
if (ctrlType == 'toggle') {
452452
settings.save(key, !config[key])
453-
notify(`${settings.controls[key].label}: ${this.state.words[+settings.isEnabled(key)]}`)
453+
notify(`${settings.controls[key].label}: ${this.state.words[+settings.typeIsEnabled(key)]}`)
454454
} else { // Refresh Interval prompt
455455
while (true) {
456456
const refreshInterval = prompt(

‎chatgpt-infinity/chromium/extension/lib/settings.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ window.settings = {
4444
return msg
4545
},
4646

47-
isEnabled(key) {
47+
typeIsEnabled(key) { // for menu labels + notifs to return ON/OFF for type w/o suffix
4848
const reInvertFlags = /disabled|hidden/i
4949
return reInvertFlags.test(key) // flag in control key name
5050
&& !reInvertFlags.test(this._msgKeys.get(this.controls[key]?.label) || '') // but not in label msg key name
51-
? !config[key] : config[key] // so invert since flag reps opposite state, else don't
51+
? !config[key] : config[key] // so invert since flag reps opposite type state, else don't
5252
},
5353

5454
load(...keys) {

‎chatgpt-infinity/chromium/extension/popup/controller.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
entry.div.append(entry.leftElem, entry.label) ; childEntriesDiv.append(entry.div)
101101
if (ctrlType == 'toggle') { // add track to left, init knob pos
102102
entry.leftElem.append(dom.create.elem('span', { class: 'track' }))
103-
entry.leftElem.classList.toggle('on', settings.isEnabled(key))
103+
entry.leftElem.classList.toggle('on', settings.typeIsEnabled(key))
104104
} else { // add symbol to left, append status to right
105105
entry.leftElem.innerText = settings.controls[key].symbol
106106
entry.label.innerText += ctrlStatus ? `— ${ctrlStatus }` : ''
@@ -112,7 +112,7 @@
112112
entry.leftElem.classList.toggle('on')
113113
settings.save(key, !config[key]) ; sync.configToUI({ updatedKey: key })
114114
notify(`${settings.controls[key].label} ${chrome.i18n.getMessage(`state_${
115-
settings.isEnabled(key) ? 'on' : 'off' }`).toUpperCase()}`)
115+
settings.typeIsEnabled(key) ? 'on' : 'off' }`).toUpperCase()}`)
116116
} else {
117117
if (key == 'replyLanguage') {
118118
while (true) {

‎chatgpt-infinity/firefox/extension/lib/settings.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ window.settings = {
4444
return msg
4545
},
4646

47-
isEnabled(key) {
47+
typeIsEnabled(key) { // for menu labels + notifs to return ON/OFF for type w/o suffix
4848
const reInvertFlags = /disabled|hidden/i
4949
return reInvertFlags.test(key) // flag in control key name
5050
&& !reInvertFlags.test(this._msgKeys.get(this.controls[key]?.label) || '') // but not in label msg key name
51-
? !config[key] : config[key] // so invert since flag reps opposite state, else don't
51+
? !config[key] : config[key] // so invert since flag reps opposite type state, else don't
5252
},
5353

5454
load(...keys) {

0 commit comments

Comments
 (0)