Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace old Module.setting() calls and clean up some other setting access #600

Merged
merged 5 commits into from
Aug 24, 2022
Merged

Replace old Module.setting() calls and clean up some other setting access #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e5dc49
Replace old Module.setting() calls
eritbh Aug 24, 2022
a87646a
Remove unused import from betterbuttons
eritbh Aug 24, 2022
e80e6e4
Don't do weird module lookup to get settings
eritbh Aug 24, 2022
1eedd66
Convert some more storage calls to async variants
eritbh Aug 24, 2022
46e2b2c
that's not how this method works
eritbh Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions extension/data/modules/betterbuttons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import TBModule, {Module} from '../tbmodule.js';
import {Module} from '../tbmodule.js';
import * as TBApi from '../tbapi.js';
import * as TBCore from '../tbcore.js';
import {getSettingAsync} from '../tbstorage.js';

const self = new Module({
name: 'Better Buttons',
Expand Down Expand Up @@ -322,13 +323,13 @@ function initRemoveConfirmation () {
// }, 100);
});
// Remove and spam
$body.on('click', '.flat-list .remove-button .togglebutton', function () {
$body.on('click', '.flat-list .remove-button .togglebutton', async function () {
const $button = $(this).closest('.remove-button'),
yes = $button.find('.yes')[0];

// Don't remove if removal reasons are enabled and the button isn't for spam
if (!$body.hasClass('tb-removal-reasons')
|| $body.hasClass('tb-removal-reasons') && !TBModule.modules.RReasons.setting('commentReasons')
|| $body.hasClass('tb-removal-reasons') && !await getSettingAsync('RReasons', 'commentReasons')
|| $button.children().first().attr('value') === 'spammed'
) {
if (yes) {
Expand Down
36 changes: 18 additions & 18 deletions extension/data/tbmodule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,17 @@ const TBModule = {
//
// preload some generic variables
//
const debugMode = TBStorage.getSetting('Utils', 'debugMode', false),
betaMode = TBStorage.getSetting('Utils', 'betaMode', false),
advancedMode = TBStorage.getSetting('Utils', 'advancedMode', false),
const debugMode = await TBStorage.getSettingAsync('Utils', 'debugMode', false),
betaMode = await TBStorage.getSettingAsync('Utils', 'betaMode', false),
advancedMode = await TBStorage.getSettingAsync('Utils', 'advancedMode', false),

settingSub = TBStorage.getSetting('Utils', 'settingSub', ''),
shortLength = TBStorage.getSetting('Utils', 'shortLength', 15),
longLength = TBStorage.getSetting('Utils', 'longLength', 45),
settingSub = await TBStorage.getSettingAsync('Utils', 'settingSub', ''),
shortLength = await TBStorage.getSettingAsync('Utils', 'shortLength', 15),
longLength = await TBStorage.getSettingAsync('Utils', 'longLength', 45),

// last export stuff
lastExport = await TBModule.modules['Modbar'].get('lastExport'),
showExportReminder = await TBModule.modules['Modbar'].get('showExportReminder'),
lastExport = await TBStorage.getSettingAsync('Modbar', 'lastExport'),
showExportReminder = await TBStorage.getSettingAsync('Modbar', 'showExportReminder'),
lastExportDays = Math.round(TBHelpers.millisecondsToDays(TBHelpers.getTime() - lastExport)),
lastExportLabel = lastExport === 0 ? 'Never' : `${lastExportDays} days ago`;

Expand Down Expand Up @@ -337,7 +337,7 @@ const TBModule = {
TBStorage.setSetting('Utils', 'betaMode', $('#betaMode').prop('checked'), false);
TBStorage.setSetting('Utils', 'advancedMode', $('#advancedMode').prop('checked'), false);

await TBModule.modules['Modbar'].set('showExportReminder', $('#showExportReminder').prop('checked'));
await TBStorage.setSettingAsync('Modbar', 'showExportReminder', $('#showExportReminder').prop('checked'));

// save cache settings.
TBStorage.setSetting('Utils', 'longLength', parseInt($('input[name=longLength]').val()), false);
Expand Down Expand Up @@ -386,7 +386,7 @@ const TBModule = {

if ($(e.target).hasClass('tb-settings-import')) {
await TBCore.importSettings(sub);
await TBModule.modules['Modbar'].set('lastExport', TBHelpers.getTime());
await TBStorage.setSettingAsync('Modbar', 'lastExport', TBHelpers.getTime());
TBCore.clearCache();
TBStorage.verifiedSettingsSave(succ => {
if (succ) {
Expand All @@ -401,7 +401,7 @@ const TBModule = {
} else {
TBui.textFeedback(`Backing up settings to /r/${sub}`, TBui.FEEDBACK_NEUTRAL);
TBCore.exportSettings(sub);
await TBModule.modules['Modbar'].setting('lastExport', TBHelpers.getTime());
await TBStorage.setSettingAsync('Modbar', 'lastExport', TBHelpers.getTime());
TBCore.clearCache();
window.location.reload();
}
Expand Down Expand Up @@ -453,12 +453,12 @@ const TBModule = {
TBModule.moduleList.sort((a, b) => a.localeCompare(b)).forEach(async moduleName => {
const module = TBModule.modules[moduleName];
// Don't do anything with beta modules unless beta mode is enabled
if (!TBStorage.getSetting('Utils', 'betaMode', false) && module.beta) {
if (!await TBStorage.getSettingAsync('Utils', 'betaMode', false) && module.beta) {
return;
}

// Don't do anything with dev modules unless debug mode is enabled
if (!TBStorage.getSetting('Utils', 'debugMode', false) && module.debugMode) {
if (!await TBStorage.getSettingAsync('Utils', 'debugMode', false) && module.debugMode) {
return;
}

Expand Down Expand Up @@ -530,24 +530,24 @@ const TBModule = {
// }

// hide beta stuff unless beta mode enabled
if (options.beta && !TBStorage.getSetting('Utils', 'betaMode', false)) {
if (options.beta && !await TBStorage.getSettingAsync('Utils', 'betaMode', false)) {
continue;
}

// hide debug stuff unless debug mode enabled
if (options.debug && !TBStorage.getSetting('Utils', 'debugMode', false)) {
if (options.debug && !await TBStorage.getSettingAsync('Utils', 'debugMode', false)) {
continue;
}

// hide hidden settings, ofc
// TODO: Tie to a specific setting rather than debug mode
if (options.hidden && !TBStorage.getSetting('Utils', 'debugMode', false)) {
if (options.hidden && !await TBStorage.getSettingAsync('Utils', 'debugMode', false)) {
continue;
}

// hide advanced settings, but do it via CSS so it can be overridden.
let displaySetting = true;
if (options.advanced && !TBStorage.getSetting('Utils', 'advancedMode', false)) {
if (options.advanced && !await TBStorage.getSettingAsync('Utils', 'advancedMode', false)) {
displaySetting = false;
}

Expand Down Expand Up @@ -654,7 +654,7 @@ body {
// Syntax highlighter selection stuff
$body.addClass('mod-syntax');
let editorSettings;
const enableWordWrap = TBStorage.getSetting('Syntax', 'enableWordWrap', true);
const enableWordWrap = await TBStorage.getSettingAsync('Syntax', 'enableWordWrap', true);
$(`#${module.shortname}_syntax_theme_css`).each(async (index, elem) => {
// Editor setup.
editorSettings = CodeMirror.fromTextArea(elem, {
Expand Down