Do not replace inline HTML img with image embed (#4063)

89ef54f2869392e32f3d89cde55f0c4d3c0c536e

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

Signed

public/script.js+6 -23 Viewed

@@ -3566,7 +3566,7 @@ class StreamingProcessor {
3566	3566	}
3567	3567
3568	3568	if (this.image) {
3569	3569	await processImageAttachment(chat[messageId], { imageUrl: this.image, parsedImage: null });
3570	3570	appendMediaToMessage(chat[messageId], $(this.messageDom));
3571	3571	}
3572	3572

  * Adds an image to the message.
  * @param {object} message Message object
  * @param {object} sources Image sources
 - * @param {ParsedImage} [sources.parsedImage] Parsed image
  * @param {string} [sources.imageUrl] Image URL
+ *
  * @returns {Promise<void>}
  */
 async function processImageAttachment(message, { parsedImage, imageUrl }) {
 -    if (parsedImage?.image) {
 -        saveImageToMessage(parsedImage, message);
 -        return;
 -    }
+-
     if (!imageUrl) {
         return;
+    }

     let oldMessage = '';
     const generationFinished = new Date();
 -    const parsedImage = extractImageFromMessage(getMessage);
 -    getMessage = parsedImage.getMessage;
     if (type === 'swipe') {
         oldMessage = chat[chat.length - 1]['mes'];
         chat[chat.length - 1]['swipes'].length++;

             chat[chat.length - 1]['extra']['model'] = getGeneratingModel();
             chat[chat.length - 1]['extra']['reasoning'] = reasoning;
             chat[chat.length - 1]['extra']['reasoning_duration'] = null;
             await processImageAttachment(chat[chat.length - 1], { parsedImage, imageUrl });
             if (power_user.message_token_count_enabled) {
                 const tokenCountText = (reasoning || '') + chat[chat.length - 1]['mes'];
                 chat[chat.length - 1]['extra']['token_count'] = await getTokenCountAsync(tokenCountText, 0);

         chat[chat.length - 1]['extra']['model'] = getGeneratingModel();
         chat[chat.length - 1]['extra']['reasoning'] = reasoning;
         chat[chat.length - 1]['extra']['reasoning_duration'] = null;
         await processImageAttachment(chat[chat.length - 1], { parsedImage, imageUrl });
         if (power_user.message_token_count_enabled) {
             const tokenCountText = (reasoning || '') + chat[chat.length - 1]['mes'];
             chat[chat.length - 1]['extra']['token_count'] = await getTokenCountAsync(tokenCountText, 0);

         chat[chat.length - 1]['extra']['api'] = getGeneratingApi();
         chat[chat.length - 1]['extra']['model'] = getGeneratingModel();
         chat[chat.length - 1]['extra']['reasoning'] += reasoning;
         await processImageAttachment(chat[chat.length - 1], { parsedImage, imageUrl });
         // We don't know if the reasoning duration extended, so we don't update it here on purpose.
         if (power_user.message_token_count_enabled) {
             const tokenCountText = (reasoning || '') + chat[chat.length - 1]['mes'];

             chat[chat.length - 1]['extra']['gen_id'] = group_generation_id;
+        }
         await processImageAttachment(chat[chat.length - 1], { parsedImage, imageUrl: imageUrl });
         const chat_id = (chat.length - 1);
         !fromStreaming && await eventSource.emit(event_types.MESSAGE_RECEIVED, chat_id, type);

     return model;
+}
 -function extractImageFromMessage(getMessage) {
 -    const regex = /<img src="(.*?)".*?alt="(.*?)".*?>/g;
 -    const results = regex.exec(getMessage);
 -    const image = results ? results[1] : '';
 -    const title = results ? results[2] : '';
 -    getMessage = getMessage.replace(regex, '');
 -    return { getMessage, image, title, inline: true };
 -}
+-
 /**
  * A function mainly used to switch 'generating' state - setting it to false and activating the buttons again
  */