Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging

c807e9f36ccdb24f1e3dce5b97ee2ad7dbae1e03

Yokayo <nonameutubecomm@gmail.com>

default/config.yaml+3 -1 Viewed

 ##   headers:
 ##     User-Agent: "Googlebot/2.1 (+http://www.google.com/bot.html)"
 requestOverrides: []
 # -- PLUGINEXTENSIONS CONFIGURATION --
 # Enable UI extensions
 enableExtensions: true
 +# Automatically update extensions when a release version changes
 +enableExtensionsAutoUpdate: true
 # Extension settings
 extras:
   # Disables automatic model download from HuggingFace

public/script.js+4 -2 Viewed

     GENERATION_STOPPED: 'generation_stopped',
     GENERATION_ENDED: 'generation_ended',
     EXTENSIONS_FIRST_LOAD: 'extensions_first_load',
 +    EXTENSION_SETTINGS_LOADED: 'extension_settings_loaded',
     SETTINGS_LOADED: 'settings_loaded',
     SETTINGS_UPDATED: 'settings_updated',
     GROUP_UPDATED: 'group_updated',

         selected_button = settings.selected_button;
         if (data.enable_extensions) {
 +            const enableAutoUpdate = Boolean(data.enable_extensions_auto_update);
             const isVersionChanged = settings.currentVersion !== currentVersion;
             await loadExtensionSettings(settings, isVersionChanged, enableAutoUpdate);
             await eventSource.emit(event_types.EXTENSION_SETTINGS_LOADED);
+        }
         firstRun = !!settings.firstRun;

public/scripts/extensions.js+7 -6 Viewed

                 if (!isDisabled) {
                     const promise = Promise.all([addExtensionScript(name, manifest), addExtensionStyle(name, manifest)]);
                     await promise
                         .then(() => activeExtensions.add(name))
                         .catch(err => console.log('Could not activate extension: ' + name, err));
                     promises.push(promise);

     const response = await request.json();
     toastr.success(`Extension "${response.display_name}" by ${response.author} (version ${response.version}) has been installed successfully!`, 'Extension installation successful');
     console.debug(`Extension "${response.display_name}" has been installed successfully at ${response.extensionPath}`);
     await loadExtensionSettings({}, false, false);
     await eventSource.emit(event_types.EXTENSION_SETTINGS_LOADED);
+}
 /**
  * Loads extension settings from the app settings.
  * @param {object} settings App Settings
  * @param {boolean} versionChanged Is this a version change?
 + * @param {boolean} enableAutoUpdate Enable auto-update
  */
 async function loadExtensionSettings(settings, versionChanged, enableAutoUpdate) {
     if (settings.extension_settings) {
         Object.assign(extension_settings, settings.extension_settings);
+    }

     $('#extensions_notify_updates').prop('checked', extension_settings.notifyUpdates);
     // Activate offline extensions
     await eventSource.emit(event_types.EXTENSIONS_FIRST_LOAD);
     extensionNames = await discoverExtensions();
     manifests = await getManifests(extensionNames);
     if (versionChanged && enableAutoUpdate) {
         await autoUpdateExtensions(false);
+    }

public/scripts/showdown-underscore.js+1 -1 Viewed

         return [{
             type: 'output',
             regex: new RegExp('(<code(?:\\s+[^>]*)?>[\\s\\S]*?<\\/code>)|\\b(?<!_)_(?!_)(.*?)(?<!_)_(?!_)\\b', 'g'),
             replace: function(match, codeContent, italicContent) {
                 if (codeContent) {
                     // If it's inside <code> tags, return unchanged

src/endpoints/settings.js+2 -0 Viewed

 const { getAllUserHandles, getUserDirectories } = require('../users');
 const ENABLE_EXTENSIONS = getConfigValue('enableExtensions', true);
 +const ENABLE_EXTENSIONS_AUTO_UPDATE = getConfigValue('enableExtensionsAutoUpdate', true);
 const ENABLE_ACCOUNTS = getConfigValue('enableUserAccounts', false);
 // 10 minutes

         instruct,
         context,
         enable_extensions: ENABLE_EXTENSIONS,
 +        enable_extensions_auto_update: ENABLE_EXTENSIONS_AUTO_UPDATE,
         enable_accounts: ENABLE_ACCOUNTS,
     });
 });