Use saved settings instead of local storage noShadows, fast_ui_mode, avatar_style and hotswap_enabled are now using settings json instead of local storage.

d153991a11c42b976a13e13b06f1b7d2280bea7a

d-ber <davide.bertalero@studenti.unimi.it>

Parents: 3b46b5a46db816bea279dc11995def03c99bfced

public/script.js+3 -0 Viewed

     context_presets,
     resetMovableStyles,
     forceCharacterEditorTokenize,
+    applyPowerUserSettings,
 } from './scripts/power-user.js';
 import {

         // Load power user settings
         await loadPowerUserSettings(settings, data);
+        applyPowerUserSettings();
         // Load character tags
         loadTagsSettings(settings);

public/scripts/power-user.js+26 -50 Viewed

     power_user,
     send_on_enter_options,
     getContextSettings,
+    applyPowerUserSettings,
 };
 export const MAX_CONTEXT_DEFAULT = 8192;

 export let context_presets = [];
 const storage_keys = {
-    fast_ui_mode: 'TavernAI_fast_ui_mode',
-    avatar_style: 'TavernAI_avatar_style',
     chat_display: 'TavernAI_chat_display',
     chat_width: 'chat_width',
     font_scale: 'TavernAI_font_scale',

     waifuMode: 'TavernAI_waifuMode',
     movingUI: 'TavernAI_movingUI',
-    noShadows: 'TavernAI_noShadows',
-    hotswap_enabled: 'HotswapEnabled',
     timer_enabled: 'TimerEnabled',
     timestamps_enabled: 'TimestampsEnabled',
     timestamp_model_icon: 'TimestampModelIcon',

@@ -458,8 +455,6 @@ function fixMarkdown(text, forDisplay) {
458	}	455	}
459		456
460	function switchHotswap() {	457	function switchHotswap() {
461	const value = localStorage.getItem(storage_keys.hotswap_enabled);
462	power_user.hotswap_enabled = value === null ? true : value == 'true';
463	$('body').toggleClass('no-hotswap', !power_user.hotswap_enabled);	458	$('body').toggleClass('no-hotswap', !power_user.hotswap_enabled);
464	$('#hotswapEnabled').prop('checked', power_user.hotswap_enabled);	459	$('#hotswapEnabled').prop('checked', power_user.hotswap_enabled);
465	}	460	}

@@ -971,8 +966,6 @@ async function CreateZenSliders(elmnt) {
971	}	966	}
972	}	967	}
973	function switchUiMode() {	968	function switchUiMode() {
974	const fastUi = localStorage.getItem(storage_keys.fast_ui_mode);
975	power_user.fast_ui_mode = fastUi === null ? true : fastUi == 'true';
976	$('body').toggleClass('no-blur', power_user.fast_ui_mode);	969	$('body').toggleClass('no-blur', power_user.fast_ui_mode);
977	$('#fast_ui_mode').prop('checked', power_user.fast_ui_mode);	970	$('#fast_ui_mode').prop('checked', power_user.fast_ui_mode);
978	if (power_user.fast_ui_mode) {	971	if (power_user.fast_ui_mode) {

@@ -1039,9 +1032,7 @@ function switchMovingUI() {
1039	}	1032	}
1040	}	1033	}
1041		1034
1042	function noShadows() {	1035	function applyNoShadows() {
1043	const noShadows = localStorage.getItem(storage_keys.noShadows);
1044	power_user.noShadows = noShadows === null ? false : noShadows == 'true';
1045	$('body').toggleClass('noShadows', power_user.noShadows);	1036	$('body').toggleClass('noShadows', power_user.noShadows);
1046	$('#noShadowsmode').prop('checked', power_user.noShadows);	1037	$('#noShadowsmode').prop('checked', power_user.noShadows);
1047	if (power_user.noShadows) {	1038	if (power_user.noShadows) {

@@ -1055,12 +1046,9 @@ function noShadows() {
1055	}	1046	}
1056		1047
1057	function applyAvatarStyle() {	1048	function applyAvatarStyle() {
1058	power_user.avatar_style = Number(localStorage.getItem(storage_keys.avatar_style) ?? avatar_styles.ROUND);
1059	$('body').toggleClass('big-avatars', power_user.avatar_style === avatar_styles.RECTANGULAR);	1049	$('body').toggleClass('big-avatars', power_user.avatar_style === avatar_styles.RECTANGULAR);
1060	$('body').toggleClass('square-avatars', power_user.avatar_style === avatar_styles.SQUARE);	1050	$('body').toggleClass('square-avatars', power_user.avatar_style === avatar_styles.SQUARE);
1061	$('#avatar_style').val(power_user.avatar_style).prop('selected', true);	1051	$('#avatar_style').val(power_user.avatar_style).prop('selected', true);
1062	//$(`input[name="avatar_style"][value="${power_user.avatar_style}"]`).prop("checked", true);
1063
1064	}	1052	}
1065		1053
1066	function applyChatDisplay() {	1054	function applyChatDisplay() {

+        {
             key: 'fast_ui_mode',
             action: async () => {
-                localStorage.setItem(storage_keys.fast_ui_mode, power_user.fast_ui_mode);
                 switchUiMode();
             },
         },

+        {
             key: 'avatar_style',
             action: async () => {
-                localStorage.setItem(storage_keys.avatar_style, power_user.avatar_style);
                 applyAvatarStyle();
             },
         },
+        {
             key: 'noShadows',
             action: async () => {
-                localStorage.setItem(storage_keys.noShadows, power_user.noShadows);
+                applyNoShadows();
-                noShadows();
             },
         },
+        {

+        {
             key: 'hotswap_enabled',
             action: async () => {
-                localStorage.setItem(storage_keys.hotswap_enabled, Boolean(power_user.hotswap_enabled));
                 switchHotswap();
             },
         },

     callGenericPopup(template, POPUP_TYPE.TEXT, '', { wide: true, large: true, allowVerticalScrolling: true });
+}
-switchUiMode();
+function applyPowerUserSettings() {
-applyFontScale('forced');
+    switchUiMode();
-applyThemeColor();
+    applyFontScale('forced');
-applyChatWidth('forced');
+    applyThemeColor();
-applyAvatarStyle();
+    applyChatWidth('forced');
-applyBlurStrength();
+    applyAvatarStyle();
-applyShadowWidth();
+    applyBlurStrength();
-applyCustomCSS();
+    applyShadowWidth();
-switchMovingUI();
+    applyCustomCSS();
-noShadows();
+    switchMovingUI();
-switchHotswap();
+    applyNoShadows();
-switchTimer();
+    switchHotswap();
-switchTimestamps();
+    switchTimer();
-switchIcons();
+    switchTimestamps();
-switchMesIDDisplay();
+    switchIcons();
-switchHideChatAvatars();
+    switchMesIDDisplay();
-switchTokenCount();
+    switchHideChatAvatars();
-switchMessageActions();
+    switchTokenCount();
+    switchMessageActions();
+}
 function getExampleMessagesBehavior() {
     if (power_user.strip_examples) {

+    }
     // These are still local storage
-    const fastUi = localStorage.getItem(storage_keys.fast_ui_mode);
     const movingUI = localStorage.getItem(storage_keys.movingUI);
-    const noShadows = localStorage.getItem(storage_keys.noShadows);
-    const hotswap = localStorage.getItem(storage_keys.hotswap_enabled);
     const timer = localStorage.getItem(storage_keys.timer_enabled);
     const timestamps = localStorage.getItem(storage_keys.timestamps_enabled);
     const mesIDDisplay = localStorage.getItem(storage_keys.mesIDDisplay_enabled);

         localStorage.removeItem(storage_keys.auto_connect_legacy);
+    }
-    power_user.fast_ui_mode = fastUi === null ? true : fastUi == 'true';
     power_user.movingUI = movingUI === null ? false : movingUI == 'true';
-    power_user.noShadows = noShadows === null ? false : noShadows == 'true';
-    power_user.hotswap_enabled = hotswap === null ? true : hotswap == 'true';
     power_user.timer_enabled = timer === null ? true : timer == 'true';
     power_user.timestamps_enabled = timestamps === null ? true : timestamps == 'true';
     power_user.mesIDDisplay_enabled = mesIDDisplay === null ? true : mesIDDisplay == 'true';

     power_user.expand_message_actions = expandMessageActions === null ? true : expandMessageActions == 'true';
     power_user.enableZenSliders = enableZenSliders === null ? false : enableZenSliders == 'true';
     power_user.enableLabMode = enableLabMode === null ? false : enableLabMode == 'true';
-    power_user.avatar_style = Number(localStorage.getItem(storage_keys.avatar_style) ?? avatar_styles.ROUND);
-    //power_user.chat_display = Number(localStorage.getItem(storage_keys.chat_display) ?? chat_styles.DEFAULT);
     power_user.chat_width = Number(localStorage.getItem(storage_keys.chat_width) ?? 50);
     power_user.font_scale = Number(localStorage.getItem(storage_keys.font_scale) ?? 1);
     power_user.blur_strength = Number(localStorage.getItem(storage_keys.blur_strength) ?? 10);

     // Settings that go to local storage
     $('#fast_ui_mode').change(function () {
         power_user.fast_ui_mode = $(this).prop('checked');
-        localStorage.setItem(storage_keys.fast_ui_mode, power_user.fast_ui_mode);
         switchUiMode();
         saveSettingsDebounced();
     });

     $('#noShadowsmode').change(function () {
         power_user.noShadows = $(this).prop('checked');
-        localStorage.setItem(storage_keys.noShadows, power_user.noShadows);
+        applyNoShadows();
-        noShadows();
         saveSettingsDebounced();
     });

     $('#avatar_style').on('change', function () {
         const value = $(this).find(':selected').val();
         power_user.avatar_style = Number(value);
-        localStorage.setItem(storage_keys.avatar_style, power_user.avatar_style);
         applyAvatarStyle();
         saveSettingsDebounced();
     });

     $('#hotswapEnabled').on('input', function () {
         const value = !!$(this).prop('checked');
         power_user.hotswap_enabled = value;
-        localStorage.setItem(storage_keys.hotswap_enabled, Boolean(power_user.hotswap_enabled));
         switchHotswap();
+        saveSettingsDebounced();
     });
     $('#prefer_character_prompt').on('input', function () {