Merge branch 'send-commands-return-value' of https://github.com/SillyTavern/SillyTavern into send-commands-return-value

d96bb3dcea9b5439d608ef444135b798f7d9996e

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

public/scripts/slash-commands/SlashCommandReturnHelper.js+9 -7 Viewed

      * @param {object|number|string} value The value to return
      * @param {object} [options={}] Options
      * @param {(o: object) => string} [options.objectToStringFunc=null] Function to convert the object to a string, if object was provided and 'object' was not the chosen return type
 +     * @param {(o: object) => string} [options.objectToHtmlFunc=null] Analog to 'objectToStringFunc', which will be used here if not provided - but can do a different string layout if HTML is requested
      * @returns {Promise<*>} The processed return value
      */
     async doReturn(type, value, { objectToStringFunc = o => o?.toString(), objectToHtmlFunc = null } = {}) {
 -        const stringValue = typeof value !== 'string' ? objectToStringFunc(value) : value;
 +        const shouldHtml = type.endsWith('html');
 +        const actualConverterFunc = shouldHtml && objectToHtmlFunc ? objectToHtmlFunc : objectToStringFunc;
 +        const stringValue = typeof value !== 'string' ? actualConverterFunc(value) : value;
         switch (type) {
             case 'popup-html':

             case 'chat-html':
             case 'toast-text':
             case 'toast-html': {
 -                const shouldHtml = type.endsWith('html');
 +                const htmlOrNotHtml = shouldHtml ? (new showdown.Converter()).makeHtml(stringValue) : escapeHtml(stringValue);
 -                const makeHtml = (str) => (new showdown.Converter()).makeHtml(str);
                 if (type.startsWith('popup')) await callGenericPopup(shouldHtml ? makeHtml(stringValue) : escapeHtml(stringValue)htmlOrNotHtml, POPUP_TYPE.TEXT);
                 if (type.startsWith('chat')) sendSystemMessage(system_message_types.GENERIC, shouldHtml ? makeHtml(stringValue) : escapeHtml(stringValue)htmlOrNotHtml);
                 if (type.startsWith('toast')) toastr.info(shouldHtml ? makeHtml(stringValue) : escapeHtml(stringValue)htmlOrNotHtml, null, { escapeHtml: !shouldHtml });
                 return '';
+            }