fix: add judgment for message_thread_id

adolphnov · Nov 11, 2024 · 954d016 · 954d016
1 parent 1c5aefa
commit 954d016
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/dist/buildinfo.json b/dist/buildinfo.json
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/timestamp b/dist/timestamp
diff --git a/src/extra/log/logDecortor.ts b/src/extra/log/logDecortor.ts
@@ -169,7 +169,7 @@ export function getLog(context: AgentUserConfig, returnModel: boolean = false):
     }
 
     const formattedEntries = logList.filter(Boolean).map(entry => `>\`${entry}\``).join('\n');
-    return `LOGSTART\n${formattedEntries}\nLOGEND\n`;
+    return `LOGSTART\n${formattedEntries}LOGEND\n`;
 }
 
 export function clearLog(context: AgentUserConfig) {

diff --git a/src/telegram/utils/md2tgmd.ts b/src/telegram/utils/md2tgmd.ts
@@ -63,7 +63,7 @@ export function escape(text: string): string {
         const last = `${lines.slice(stack[0]).join('\n')}\n\`\`\``;
         result.push(handleEscape(last, 'code'));
     }
-    const regexp = /^\s*LOGSTART\n(.*?)\s*LOGEND/s;
+    const regexp = /^LOGSTART(.*?)LOGEND/s;
     return result.join('\n')
         .replace(regexp, '**$1||')
         .replace(new RegExp(Object.values(escapedChars).join('|'), 'g'), match => escapedCharsReverseMap.get(match) ?? match);

diff --git a/src/telegram/utils/send.ts b/src/telegram/utils/send.ts
@@ -35,7 +35,7 @@ class MessageContext implements Record<string, any> {
             }
 
             this.allow_sending_without_reply = true;
-            if (message.message_thread_id) {
+            if (message.message_thread_id && message.is_topic_message) {
                 this.message_thread_id = message.message_thread_id;
             }
         } else {