From 7047a5fa154f7602af875093f6dbc7c2bcb4a718 Mon Sep 17 00:00:00 2001
From: Danil Nikolaev <lischenkodev@gmail.com>
Date: Fri, 16 Jan 2026 16:04:10 +0300
Subject: [PATCH] add user's names to messages

---
 src/commands/gemini-chat.ts  | 8 ++++----
 src/commands/mistral-chat.ts | 3 ++-
 src/commands/ollama-chat.ts  | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/commands/gemini-chat.ts b/src/commands/gemini-chat.ts
index 50d8c0b..ab8d586 100644
--- a/src/commands/gemini-chat.ts
+++ b/src/commands/gemini-chat.ts
@@ -3,7 +3,7 @@ import {Message} from "typescript-telegram-bot-api";
 import {
     collectReplyChainText,
     editMessageText,
-    escapeMarkdownV2Text,
+    escapeMarkdownV2Text, extractText,
     logError,
     replyToMessage,
     startIntervalEditor
@@ -39,12 +39,12 @@ export class GeminiChat extends ChatCommand {
 
         const chatMessages = messageParts.map(part => {
             return {
-                role: part.bot ? "ASSISTANT" : "USER",
-                content: part.content
+                role: part.bot ? "assistant" : "user",
+                content: `MESSAGE FROM USER "${part.name}":\n` + extractText(part.content, "/gemini")
             };
         });
         chatMessages.reverse();
-        chatMessages.unshift({role: "SYSTEM", content: Environment.SYSTEM_PROMPT});
+        chatMessages.unshift({role: "system", content: Environment.SYSTEM_PROMPT});
 
         let chatContent = "";
         for (const part of chatMessages) {
diff --git a/src/commands/mistral-chat.ts b/src/commands/mistral-chat.ts
index 01b6e01..fac48b0 100644
--- a/src/commands/mistral-chat.ts
+++ b/src/commands/mistral-chat.ts
@@ -6,6 +6,7 @@ import {
     collectReplyChainText,
     editMessageText,
     escapeMarkdownV2Text,
+    extractText,
     getPhotoMaxSize,
     logError,
     replyToMessage,
@@ -68,7 +69,7 @@ export class MistralChat extends ChatCommand {
             const content = [];
             content.push({
                 type: "text",
-                text: part.content
+                text: `MESSAGE FROM USER "${part.name}":\n` + extractText(part.content, Environment.BOT_PREFIX),
             });
 
             if (imageFilePath && i === 0) {
diff --git a/src/commands/ollama-chat.ts b/src/commands/ollama-chat.ts
index fec7f35..6a47de7 100644
--- a/src/commands/ollama-chat.ts
+++ b/src/commands/ollama-chat.ts
@@ -62,13 +62,13 @@ export class OllamaChat extends ChatCommand {
 
         const chatMessages = messageParts.map((part, i) => {
             return {
-                role: part.bot ? "ASSISTANT" : "USER",
-                content: extractText(part.content, Environment.BOT_PREFIX),
+                role: part.bot ? "assistant" : "user",
+                content: `MESSAGE FROM USER "${part.name}":\n` + extractText(part.content, Environment.BOT_PREFIX),
                 images: imageFilePath && i === 0 ? [imageFilePath] : null
             };
         });
         chatMessages.reverse();
-        chatMessages.unshift({role: "SYSTEM", content: Environment.SYSTEM_PROMPT, images: null});
+        chatMessages.unshift({role: "system", content: Environment.SYSTEM_PROMPT, images: null});
 
         let waitMessage: Message;