Merge branch 'staging' into sysprompt-divorce

1864b7d8689f3893b1905ec9a68d00eab3817106

Cohee <18619528+Cohee1207@users.noreply.github.com>

public/script.js+3 -3 Viewed

     proxies,
     loadProxyPresets,
     selected_proxy,
     initOpenaiinitOpenAI,
 } from './scripts/openai.js';
 import {

     addSafariPatch();
     await getClientVersion();
     await readSecretState();
     await initLocales();
     initDefaultSlashCommands();
     initTextGenModels();
 +    initOpenAI();
     initSystemPrompts();
     await initPresetManager();
     await getSystemMessages();

     initKeyboard();
     initDynamicStyles();
     initTags();
 -    initOpenai();
     initBookmarks();
     await getUserAvatars(true, user_avatar);
     await getCharacters();

public/scripts/chats.js+3 -2 Viewed

         const message = chat[messageId];
         if (!message) continue;
 +        message.is_system = hide;
++
 +        // Also toggle "hidden" state for all visible messages
         const messageBlock = $(`.mes[mesid="${messageId}"]`);
         if (!messageBlock.length) continue;
+-
 -        message.is_system = hide;
         messageBlock.attr('is_system', String(hide));
+    }

public/scripts/extensions/stable-diffusion/index.js+4 -1 Viewed

         ],
         helpString: `
             <div>
                 Requests to generate an image and posts it to chat (unless <code>quiet=true</code> argument is specified).</code>.
 +            </div>
 +            <div>
 +                Supported arguments: <code>${Object.values(triggerWords).flat().join(', ')}</code>.
             </div>
             <div>
                 Anything else would trigger a "free mode" to make generate whatever you prompted. Example: <code>/imagine apple tree</code> would generate a picture of an apple tree. Returns a link to the generated image.

public/scripts/openai.js+2 -4 Viewed

     return foundName;
+}
 export function initOpenaiinitOpenAI() {
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'proxy',
         callback: runProxyCallback,

         ],
         helpString: 'Sets a proxy preset by name.',
     }));
 -}
 -$(document).ready(async function () {
     $('#test_api_button').on('click', testApiConnection);
     $('#scale-alt').on('change', function () {

     $('#openai_proxy_password_show').on('click', onProxyPasswordShowClick);
     $('#customize_additional_parameters').on('click', onCustomizeParametersClick);
     $('#openai_proxy_preset').on('change', onProxyPresetChange);
 });