🚀 release: v0.1.1-alpha - Merge pull request #4 from wgtechlabs/dev

warengonzaga · web-flow · commit 488a7af49c7a · 2025-06-07T00:25:39.000+08:00
diff --git a/README.md b/README.md
@@ -8,6 +8,12 @@ The Unthread Telegram Bot seamlessly connects your Telegram community with Unthr
 
 With simple commands and intuitive interactions, support tickets automatically sync between both platforms, streamlining your workflow and improving response times. Whether you're managing a community group, running a business chat, or supporting an open-source project, this bot provides the tools you need for efficient, organized customer support.
 
+## 💸 Sponsored Ads
+
+Open source development is resource-intensive. These **sponsored ads help keep Log Engine free and actively maintained** while connecting you with tools and services that support open-source development.
+
+[![sponsored ads](https://gitads.dev/v1/ad-serve?source=wgtechlabs/unthread-telegram-bot@github)](https://gitads.dev/v1/ad-track?source=wgtechlabs/unthread-telegram-bot@github)
+
 ## 🤔 How It Works
 
 The Unthread Telegram Bot creates a seamless bridge between your Telegram group chats and Unthread's ticket management system. Here's how it works:
@@ -415,4 +421,6 @@ This project is created by **[Waren Gonzaga](https://github.com/warengonzaga)**
 
 ---
 
-💻 with ❤️ by [Waren Gonzaga](https://warengonzaga.com) under [WG Technology Labs](https://wgtechlabs.com), and [Him](https://www.youtube.com/watch?v=HHrxS4diLew&t=44s) 🙏
+💻 with ❤️ by [Waren Gonzaga](https://warengonzaga.com) under [WG Technology Labs](https://wgtechlabs.com), and [Him](https://www.youtube.com/watch?v=HHrxS4diLew&t=44s) 🙏
+
+<!-- GitAds-Verify: SKBGYTYZU867TO8VU9UB6VRLMN1V8RXA -->
diff --git a/src/events/message.js b/src/events/message.js
@@ -102,18 +102,40 @@ async function handleTicketReply(ctx) {
         // Get the ID of the message being replied to
         const replyToMessageId = ctx.message.reply_to_message.message_id;
         
+        LogEngine.info('Processing potential ticket reply', {
+            replyToMessageId,
+            messageText: ctx.message.text?.substring(0, 100),
+            chatId: ctx.chat.id,
+            userId: ctx.from.id
+        });
+        
         // Check if this is a reply to a ticket confirmation
         const ticketInfo = await unthreadService.getTicketFromReply(replyToMessageId);
         if (ticketInfo) {
+            LogEngine.info('Found ticket for reply', {
+                ticketId: ticketInfo.ticketId,
+                friendlyId: ticketInfo.friendlyId,
+                replyToMessageId
+            });
             return await handleTicketConfirmationReply(ctx, ticketInfo);
         }
         
         // Check if this is a reply to an agent message
         const agentMessageInfo = await unthreadService.getAgentMessageFromReply(replyToMessageId);
         if (agentMessageInfo) {
+            LogEngine.info('Found agent message for reply', {
+                conversationId: agentMessageInfo.conversationId,
+                friendlyId: agentMessageInfo.friendlyId,
+                replyToMessageId
+            });
             return await handleAgentMessageReply(ctx, agentMessageInfo);
         }
         
+        LogEngine.debug('No ticket or agent message found for reply', {
+            replyToMessageId,
+            chatId: ctx.chat.id
+        });
+        
         return false;
     } catch (error) {
         LogEngine.error('Error in handleTicketReply', {
@@ -139,6 +161,15 @@ async function handleTicketConfirmationReply(ctx, ticketInfo) {
         const username = ctx.from.username;
         const message = ctx.message.text;
         
+        LogEngine.info('Processing ticket confirmation reply', {
+            conversationId: ticketInfo.conversationId,
+            ticketId: ticketInfo.ticketId,
+            friendlyId: ticketInfo.friendlyId,
+            telegramUserId,
+            username,
+            messageLength: message?.length
+        });
+        
         // Send a waiting message
         const waitingMsg = await ctx.reply("Adding your message to the ticket...", {
             reply_to_message_id: ctx.message.message_id
@@ -148,9 +179,15 @@ async function handleTicketConfirmationReply(ctx, ticketInfo) {
             // Get user information from database
             const userData = await unthreadService.getOrCreateUser(telegramUserId, username);
             
-            // Send the message to the ticket
+            LogEngine.info('Retrieved user data for ticket reply', {
+                userData: JSON.stringify(userData),
+                hasName: !!userData.name,
+                hasEmail: !!userData.email
+            });
+            
+            // Send the message to the ticket using conversationId (which is the same as ticketId)
             await unthreadService.sendMessage({
-                conversationId: ticketInfo.ticketId,
+                conversationId: ticketInfo.conversationId || ticketInfo.ticketId,
                 message,
                 onBehalfOf: userData
             });
@@ -165,7 +202,7 @@ async function handleTicketConfirmationReply(ctx, ticketInfo) {
             
             LogEngine.info('Added message to ticket', {
                 ticketNumber: ticketInfo.friendlyId,
-                ticketId: ticketInfo.ticketId,
+                conversationId: ticketInfo.conversationId || ticketInfo.ticketId,
                 telegramUserId,
                 username,
                 messageLength: message?.length,
@@ -177,7 +214,10 @@ async function handleTicketConfirmationReply(ctx, ticketInfo) {
             // Handle API errors
             LogEngine.error('Error adding message to ticket', {
                 error: error.message,
-                ticketId: ticketInfo.ticketId
+                stack: error.stack,
+                conversationId: ticketInfo.conversationId || ticketInfo.ticketId,
+                telegramUserId,
+                username
             });
             
             // Update the waiting message with error
@@ -194,6 +234,7 @@ async function handleTicketConfirmationReply(ctx, ticketInfo) {
     } catch (error) {
         LogEngine.error('Error in handleTicketReply', {
             error: error.message,
+            stack: error.stack,
             chatId: ctx.chat?.id
         });
         return false;
@@ -220,12 +261,14 @@ async function handleAgentMessageReply(ctx, agentMessageInfo) {
         });
         
         try {
+            // Get user information for proper onBehalfOf formatting
+            const userData = await unthreadService.getOrCreateUser(telegramUserId, username);
+            
             // Send the message to the conversation
             await unthreadService.sendMessage({
                 conversationId: agentMessageInfo.conversationId,
                 message,
-                username,
-                telegramUserId
+                onBehalfOf: userData
             });
             
             // Update the waiting message with success
@@ -235,7 +278,12 @@ async function handleAgentMessageReply(ctx, agentMessageInfo) {
                 null,
                 `✅ Your reply has been sent to the agent for Ticket #${agentMessageInfo.friendlyId}`
             );
-            
+
+            // Auto-delete the confirmation message after 1 minute
+            setTimeout(() => {
+                ctx.telegram.deleteMessage(ctx.chat.id, waitingMsg.message_id).catch(() => {});
+            }, 5000); // 5,000 ms = 5 seconds
+
             LogEngine.info('Sent reply to agent', {
                 ticketNumber: agentMessageInfo.friendlyId,
                 conversationId: agentMessageInfo.conversationId,
diff --git a/src/handlers/webhookMessage.js b/src/handlers/webhookMessage.js
@@ -20,7 +20,7 @@ export class TelegramWebhookHandler {
    */
   async handleMessageCreated(event) {
     try {
-      LogEngine.info('Processing agent message webhook', {
+      LogEngine.info('🔄 Processing agent message webhook', {
         conversationId: event.data.conversationId,
         textLength: event.data.content?.length || 0,
         sentBy: event.data.userId,
@@ -30,28 +30,58 @@ export class TelegramWebhookHandler {
       // 1. Get conversation ID from webhook event
       const conversationId = event.data.conversationId;
       if (!conversationId) {
-        LogEngine.warn('No conversation ID in webhook event', { event });
+        LogEngine.warn('❌ No conversation ID in webhook event', { event });
         return;
       }
 
+      LogEngine.info('🔍 Looking up ticket for conversation', { conversationId });
+
       // 2. Look up original ticket message using bots-brain
       const ticketData = await this.botsStore.getTicketByConversationId(conversationId);
       if (!ticketData) {
-        LogEngine.warn(`No ticket found for conversation: ${conversationId}`);
+        LogEngine.warn(`❌ No ticket found for conversation: ${conversationId}`);
         return;
       }
 
-      // 3. Validate message content
-      const messageText = event.data.content;
+      LogEngine.info('✅ Ticket found', {
+        conversationId,
+        friendlyId: ticketData.friendlyId,
+        chatId: ticketData.chatId,
+        messageId: ticketData.messageId
+      });
+
+      // 3. Validate message content - check both 'content' and 'text' fields
+      const messageText = event.data.content || event.data.text;
       if (!messageText || messageText.trim().length === 0) {
-        LogEngine.warn('Empty message text in webhook event', { conversationId });
+        LogEngine.warn('❌ Empty message text in webhook event', { 
+          conversationId,
+          hasContent: !!event.data.content,
+          hasText: !!event.data.text
+        });
         return;
       }
 
+      LogEngine.info('✅ Message content validated', { 
+        conversationId, 
+        messageLength: messageText.length,
+        messagePreview: messageText.substring(0, 100) + (messageText.length > 100 ? '...' : '')
+      });
+
       // 4. Format agent message for Telegram
       const formattedMessage = this.formatAgentMessage(messageText, ticketData.friendlyId);
+      
+      LogEngine.info('✅ Message formatted for Telegram', { 
+        conversationId,
+        formattedLength: formattedMessage.length
+      });
 
       // 5. Send agent message as reply to original ticket message
+      LogEngine.info('📤 Attempting to send message to Telegram', {
+        conversationId,
+        chatId: ticketData.chatId,
+        replyToMessageId: ticketData.messageId
+      });
+
       try {
         const sentMessage = await this.bot.telegram.sendMessage(
           ticketData.chatId,
@@ -73,7 +103,7 @@ export class TelegramWebhookHandler {
           sentAt: new Date().toISOString()
         });
 
-        this.        LogEngine.info('Agent message delivered to Telegram', {
+        LogEngine.info('✅🎉 Agent message delivered to Telegram successfully!', {
           conversationId,
           chatId: ticketData.chatId,
           replyToMessageId: ticketData.messageId,
@@ -100,13 +130,13 @@ export class TelegramWebhookHandler {
             }
           );
 
-          this.LogEngine.info('Agent message sent as new message (fallback)', {
+          LogEngine.info('Agent message sent as new message (fallback)', {
             conversationId,
             chatId: ticketData.chatId
           });
 
         } catch (fallbackError) {
-          this.LogEngine.error('Failed to send fallback message to Telegram', {
+          LogEngine.error('Failed to send fallback message to Telegram', {
             error: fallbackError.message,
             chatId: ticketData.chatId,
             conversationId
@@ -116,7 +146,7 @@ export class TelegramWebhookHandler {
       }
 
     } catch (error) {
-      this.LogEngine.error('Error handling webhook message', {
+      LogEngine.error('Error handling webhook message', {
         error: error.message,
         stack: error.stack,
         event: event
@@ -135,13 +165,11 @@ export class TelegramWebhookHandler {
     // Clean and truncate message if too long
     const cleanText = this.sanitizeMessageText(text);
     const maxLength = 4000; // Telegram message limit is 4096, leave some room
-    
     let truncatedText = cleanText;
     if (cleanText.length > maxLength) {
       truncatedText = cleanText.substring(0, maxLength - 50) + '...\n\n_Message truncated_';
     }
-
-    return `🎧 **Agent Response** (${friendlyId})\n\n${truncatedText}`;
+    return `🎫 Ticket #${friendlyId}\n\n💬 Response:\n${truncatedText}\n\n──────────\n📝 Reply to this message to respond or add more info to your ticket.`;
   }
 
   /**
@@ -172,7 +200,7 @@ export class TelegramWebhookHandler {
    * @param {Object} event - The webhook event data
    */
   async handleOtherEvent(eventType, event) {
-    this.LogEngine.info(`Received ${eventType} event (not processed)`, {
+    LogEngine.info(`Received ${eventType} event (not processed)`, {
       eventType,
       conversationId: event.data?.conversationId,
       timestamp: event.timestamp
diff --git a/src/sdk/unthread-webhook/EventValidator.js b/src/sdk/unthread-webhook/EventValidator.js
@@ -1,3 +1,5 @@
+import { LogEngine } from '@wgtechlabs/log-engine';
+
 /**
  * EventValidator - Simple validation for Unthread webhook events
  * 
@@ -11,11 +13,47 @@ export class EventValidator {
    * @returns {boolean} - True if valid
    */
   static validate(event) {
-    return event && 
-           event.type === 'message_created' &&
-           event.sourcePlatform === 'dashboard' &&
-           event.data &&
-           event.data.conversationId &&
-           event.data.content;
+    LogEngine.debug('🔍 EventValidator: Starting validation for event:', { event });
+    
+    // Check each condition individually for detailed logging
+    const hasEvent = !!event;
+    LogEngine.debug('✅ Has event object:', { hasEvent });
+    
+    if (!hasEvent) return false;
+    
+    const hasCorrectType = event.type === 'message_created';
+    LogEngine.debug('✅ Type is message_created:', { hasCorrectType, actual: event.type });
+    
+    const hasCorrectPlatform = event.sourcePlatform === 'dashboard';
+    LogEngine.debug('✅ Source is dashboard:', { hasCorrectPlatform, actual: event.sourcePlatform });
+    
+    const hasData = !!event.data;
+    LogEngine.debug('✅ Has data object:', { hasData });
+    
+    if (!hasData) return false;
+    
+    // Log the actual data structure for debugging
+    LogEngine.debug('🔍 Event data structure:', { data: event.data });
+    
+    const hasConversationId = !!event.data.conversationId;
+    LogEngine.debug('✅ Has conversationId:', { hasConversationId, actual: event.data.conversationId });
+    
+    // Check for both 'content' and 'text' fields (webhook server sends 'text')
+    const hasContent = !!(event.data.content || event.data.text);
+    LogEngine.debug('✅ Has content/text:', { hasContent, content: event.data.content, text: event.data.text });
+    
+    // Additional checks for debugging
+    if (!hasConversationId) {
+      LogEngine.warn('❌ Missing conversationId - data keys:', { keys: Object.keys(event.data || {}) });
+    }
+    
+    if (!hasContent) {
+      LogEngine.warn('❌ Missing content/text - data keys:', { keys: Object.keys(event.data || {}) });
+    }
+    
+    const isValid = hasEvent && hasCorrectType && hasCorrectPlatform && hasData && hasConversationId && hasContent;
+    LogEngine.info('🎯 Final validation result:', { isValid });
+    
+    return isValid;
   }
 }
diff --git a/src/sdk/unthread-webhook/WebhookConsumer.js b/src/sdk/unthread-webhook/WebhookConsumer.js
diff --git a/src/services/unthread.js b/src/services/unthread.js
