Merge pull request #19 from kirill-markin:feature/text-and-photo-in-s…

…ingle-message Feature/text-and-photo-in-single-message
kirill-markin · Jun 22, 2024 · 50fc18a · 50fc18a
2 parents 81ee542 + 8e3c3e9
commit 50fc18a
Show file tree

Hide file tree

Showing 5 changed files with 164 additions and 166 deletions.
diff --git a/src/bot.ts b/src/bot.ts
@@ -20,49 +20,19 @@ const waitForAndLog = async (stopSignal: any, func: any) => {
     try {
       func();
     } catch (error) {
-        console.error(error);
+      console.error(error);
     }
   }
 };
 
 bot.use(async (ctx: MyContext, next) => {
   const start = new Date();
-
   let isNextDone = false;
   const stopSignal = () => isNextDone;
 
-  // Start waiting and logging in parallel
-  let sendChatActionTyping = async () => {};
-  let chatId: number = -1;
-  if (ctx.chat && ctx.chat.id) {
-    chatId = ctx.chat.id;
-  } else {
-    throw new Error(`ctx.chat.id is undefined`);
-  }
-
-  if (chatId !== -1) {
-    sendChatActionTyping = async () => {
-      try {
-        await ctx.telegram.sendChatAction(chatId, 'typing');
-      } catch (error: Error | any) {
-        if (error.response && error.response.error_code === 403) {
-          console.log(`User ${chatId} has blocked the bot.`);
-        } else {
-          console.error('Unexpected error:', error);
-        }
-      }
-    };
-  }
-
-  const waitPromise = waitForAndLog(stopSignal, sendChatActionTyping);
-
-  // Wait for next() to complete
   await next();
   isNextDone = true;
 
-  // Wait for waitForAndLog to finish
-  await waitPromise;
-
   const ms = new Date().getTime() - start.getTime();
   console.log(`message processed. Response time: ${ms / 1000} seconds.`);
 });

diff --git a/src/botHandlers.ts b/src/botHandlers.ts
@@ -4,26 +4,14 @@ import { MyContext, User } from './types';
 import { 
   upsertUserIfNotExists, 
   disableMessagesByChatId,
-  addSimpleEvent,
   storeCommand,
 } from './database/database';
 import {
   RESET_MESSAGE,
-  NO_VIDEO_ERROR,
   HELP_MESSAGE,
 } from './config';
-import { 
-  handleMessage, 
-  handleVoiceMessage, 
-  handleAudioFile, 
-  handlePhotoMessage 
-} from './messageHandlers';
+import { handleAnyMessage } from './messageHandlers';
 import { formatLogMessage } from './utils/utils';
-import { generateMessageBufferKey } from './utils/messageUtils';
-import { pineconeIndex } from './vectorDatabase';
-
-// Create a map to store the message buffers
-const messageBuffers = new Map();
 
 export function initializeBotHandlers(bot: Telegraf<MyContext>) {
 
@@ -60,86 +48,31 @@ export function initializeBotHandlers(bot: Telegraf<MyContext>) {
   });
 
   bot.on(message('photo'), async (ctx: MyContext) => {
-    console.log(formatLogMessage(ctx, `photo received`));
-    await handlePhotoMessage(ctx, pineconeIndex);
+    await handleAnyMessage(ctx, 'photo');
   });
 
-  bot.on(message('video'), (ctx: MyContext) => {
-    console.log(formatLogMessage(ctx, `video received`));
-    ctx.reply(NO_VIDEO_ERROR);
-    addSimpleEvent(ctx, 'user_message', 'user', 'video');
+  bot.on(message('video'), async (ctx: MyContext) => {
+    await handleAnyMessage(ctx, 'video');
   });
 
-  bot.on(message('sticker'), (ctx: MyContext) => {
-    console.log(formatLogMessage(ctx, `sticker received`));
-    ctx.reply('👍');
-    addSimpleEvent(ctx, 'user_message', 'user', 'sticker');
+  bot.on(message('sticker'), async (ctx: MyContext) => {
+    await handleAnyMessage(ctx, 'sticker');
   });
 
   bot.on(message('voice'), async (ctx: MyContext) => {
-    console.log(formatLogMessage(ctx, `[NEW] voice received`));
-    handleVoiceMessage(ctx, pineconeIndex);
+    await handleAnyMessage(ctx, 'voice');
   });
 
   bot.on(message('text'), async (ctx: MyContext) => {
-    console.log(formatLogMessage(ctx, '[NEW] text received'));
-    const key = generateMessageBufferKey(ctx);
-    const messageData = messageBuffers.get(key) || { messages: [], timer: null };
-
-    // @ts-ignore
-    messageData.messages.push(ctx.message?.text || '');
-
-    // Clear the old timer
-    if (messageData.timer) {
-      clearTimeout(messageData.timer);
-    }
-
-    // Set a new timer
-    messageData.timer = setTimeout(async () => {
-      // '<|endoftext|>' is a special token that marks the end of a text in OpenAI's and prohibited in the messages
-      const fullMessage = messageData.messages?.join('\n').replace(/<\|endoftext\|>/g, '[__openai_token_endoftext__]') || '';
-      console.log(formatLogMessage(ctx, `full message collected. length: ${fullMessage.length}`));
-      messageData.messages = []; // Clear the messages array
-
-      await handleMessage(ctx, fullMessage, 'user_message', 'text', pineconeIndex);
-    }, 4000);
-
-    // Save the message buffer
-    messageBuffers.set(key, messageData);
+    await handleAnyMessage(ctx, 'text');
   });
 
   bot.on(message('document'), async (ctx: MyContext) => {
-    // @ts-ignore
-    const fileId = ctx.message.document?.file_id;
-    // @ts-ignore
-    const fileName = ctx.message.document?.file_name;
-    // @ts-ignore
-    const mimeType = ctx.message.document?.mime_type;
-
-    if (fileId && mimeType) {
-      if (mimeType.startsWith('audio/')) {
-        await handleAudioFile(ctx, fileId, mimeType, pineconeIndex);
-      } else {
-        console.log(formatLogMessage(ctx, `File received: ${fileName} (${mimeType})`));
-        // ctx.reply(`Received file: ${fileName} with MIME type: ${mimeType}`);
-        ctx.reply('I can only process audio files and compresed photos for now.');
-      }
-    } else {
-      console.error(formatLogMessage(ctx, 'Received file, but file_id or mimeType is undefined'));
-    }
+    await handleAnyMessage(ctx, 'document');
   });
 
   bot.on(message('audio'), async (ctx: MyContext) => {
-    // @ts-ignore
-    const fileId = ctx.message.audio?.file_id;
-    // @ts-ignore
-    const mimeType = ctx.message.audio?.mime_type;
-
-    if (fileId && mimeType) {
-      await handleAudioFile(ctx, fileId, mimeType, pineconeIndex);
-    } else {
-      console.error(formatLogMessage(ctx, 'Received audio file, but file_id or mimeType is undefined'));
-    }
+    await handleAnyMessage(ctx, 'audio');
   });
 
 }