/send with return value too - /send - return message on `sendMessageAsUser` now
| @@ -4784,7 +4784,7 @@ export function removeMacros(str) { | |||
| 4784 | * @param {boolean} [compact] Send as a compact display message. | 4784 | * @param {boolean} [compact] Send as a compact display message. |
| 4785 | * @param {string} [name] Name of the user sending the message. Defaults to name1. | 4785 | * @param {string} [name] Name of the user sending the message. Defaults to name1. |
| 4786 | * @param {string} [avatar] Avatar of the user sending the message. Defaults to user_avatar. | 4786 | * @param {string} [avatar] Avatar of the user sending the message. Defaults to user_avatar. |
| 4787 | * @returns {Promise<void>} A promise that resolves when the message is inserted. | 4787 | * @returns {Promise<any>} A promise that resolves to the message when it is inserted. |
| 4788 | */ | 4788 | */ |
| 4789 | export async function sendMessageAsUser(messageText, messageBias, insertAt = null, compact = false, name = name1, avatar = user_avatar) { | 4789 | export async function sendMessageAsUser(messageText, messageBias, insertAt = null, compact = false, name = name1, avatar = user_avatar) { |
| 4790 | messageText = getRegexedString(messageText, regex_placement.USER_INPUT); | 4790 | messageText = getRegexedString(messageText, regex_placement.USER_INPUT); |
| @@ -4831,6 +4831,8 @@ export async function sendMessageAsUser(messageText, messageBias, insertAt = nul | |||
| 4831 | await eventSource.emit(event_types.USER_MESSAGE_RENDERED, chat_id); | 4831 | await eventSource.emit(event_types.USER_MESSAGE_RENDERED, chat_id); |
| 4832 | await saveChatConditional(); | 4832 | await saveChatConditional(); |
| 4833 | } | 4833 | } |
| 4834 | |||
| 4835 | return message; | ||
| 4834 | } | 4836 | } |
| 4835 | 4837 | ||
| 4836 | /** | 4838 | /** |
| @@ -478,6 +478,7 @@ export function initDefaultSlashCommands() { | |||
| 478 | SlashCommandParser.addCommandObject(SlashCommand.fromProps({ | 478 | SlashCommandParser.addCommandObject(SlashCommand.fromProps({ |
| 479 | name: 'send', | 479 | name: 'send', |
| 480 | callback: sendUserMessageCallback, | 480 | callback: sendUserMessageCallback, |
| 481 | returns: 'The text of the sent message', | ||
| 481 | namedArgumentList: [ | 482 | namedArgumentList: [ |
| 482 | new SlashCommandNamedArgument( | 483 | new SlashCommandNamedArgument( |
| 483 | 'compact', | 484 | 'compact', |
| @@ -2862,16 +2863,17 @@ async function sendUserMessageCallback(args, text) { | |||
| 2862 | insertAt = chat.length + insertAt; | 2863 | insertAt = chat.length + insertAt; |
| 2863 | } | 2864 | } |
| 2864 | 2865 | ||
| 2866 | let message; | ||
| 2865 | if ('name' in args) { | 2867 | if ('name' in args) { |
| 2866 | const name = args.name || ''; | 2868 | const name = args.name || ''; |
| 2867 | const avatar = findPersonaByName(name) || user_avatar; | 2869 | const avatar = findPersonaByName(name) || user_avatar; |
| 2868 | await sendMessageAsUser(text, bias, insertAt, compact, name, avatar); | 2870 | message = await sendMessageAsUser(text, bias, insertAt, compact, name, avatar); |
| 2869 | } | 2871 | } |
| 2870 | else { | 2872 | else { |
| 2871 | await sendMessageAsUser(text, bias, insertAt, compact); | 2873 | message = await sendMessageAsUser(text, bias, insertAt, compact); |
| 2872 | } | 2874 | } |
| 2873 | 2875 | ||
| 2874 | return ''; | 2876 | return message.mes; |
| 2875 | } | 2877 | } |
| 2876 | 2878 | ||
| 2877 | async function deleteMessagesByNameCallback(_, name) { | 2879 | async function deleteMessagesByNameCallback(_, name) { |