Merge pull request #983 from Hexastack/982-issue---reverting-eventemitter-changes

fix: revert eventemitter updates

api/src/analytics/services/bot-stats.service.ts

@@ -95,7 +95,6 @@ export class BotStatsService extends BaseService<BotStats> {
         'hook:stats:entry',
         BotStatsType.retention,
         'Retentioned users',
-        subscriber,
       );
     }
   }
@@ -107,11 +106,7 @@ export class BotStatsService extends BaseService<BotStats> {
    * @param name - The name or identifier of the statistics entry (e.g., a specific feature or component being tracked).
    */
   @OnEvent('hook:stats:entry')
-  async handleStatEntry(
+  async handleStatEntry(type: BotStatsType, name: string): Promise<void> {
-    type: BotStatsType,
-    name: string,
-    _subscriber: Subscriber,
-  ): Promise<void> {
     const day = new Date();
     day.setMilliseconds(0);
     day.setSeconds(0);

api/src/chat/controllers/message.controller.ts

@@ -164,7 +164,7 @@ export class MessageController extends BaseController<
         read: false,
         delivery: false,
       };
-      this.eventEmitter.emit('hook:chatbot:sent', sentMessage, event);
+      this.eventEmitter.emit('hook:chatbot:sent', sentMessage);
       return {
         success: true,
       };

api/src/chat/services/bot.service.spec.ts

@@ -243,8 +243,8 @@ describe('BlockService', () => {
     await botService.startConversation(event, block);
     expect(hasBotSpoken).toEqual(true);
     expect(triggeredEvents).toEqual([
-      ['popular', 'hasNextBlocks', webSubscriber],
+      ['popular', 'hasNextBlocks'],
-      ['new_conversations', 'New conversations', webSubscriber],
+      ['new_conversations', 'New conversations'],
     ]);
     clearMock.mockClear();
   });
@@ -301,7 +301,7 @@ describe('BlockService', () => {
     const captured = await botService.processConversationMessage(event);
     expect(captured).toBe(true);
     expect(triggeredEvents).toEqual([
-      ['existing_conversations', 'Existing conversations', webSubscriber],
+      ['existing_conversations', 'Existing conversations'],
     ]);
     clearMock.mockClear();
   });

api/src/chat/services/bot.service.ts

@@ -70,13 +70,11 @@ export class BotService {
       'hook:stats:entry',
       BotStatsType.outgoing,
       'Outgoing',
-      recipient,
     );
     this.eventEmitter.emit(
       'hook:stats:entry',
       BotStatsType.all_messages,
       'All Messages',
-      recipient,
     );
 
     // Trigger sent message event
@@ -315,7 +313,6 @@ export class BotService {
           'hook:stats:entry',
           BotStatsType.popular,
           next.name,
-          convo.sender,
         );
         // Go next!
         this.logger.debug('Respond to nested conversion! Go next ', next.id);
@@ -377,7 +374,6 @@ export class BotService {
         'hook:stats:entry',
         BotStatsType.existing_conversations,
         'Existing conversations',
-        subscriber,
       );
       this.logger.debug('Conversation has been captured! Responding ...');
       return await this.handleIncomingMessage(conversation, event);
@@ -397,15 +393,14 @@ export class BotService {
    * @param block - Starting block
    */
   async startConversation(event: EventWrapper<any, any>, block: BlockFull) {
-    // Launching a new conversation
-    const subscriber = event.getSender();
     // Increment popular stats
     this.eventEmitter.emit(
       'hook:stats:entry',
       BotStatsType.popular,
       block.name,
-      subscriber,
     );
+    // Launching a new conversation
+    const subscriber = event.getSender();
 
     try {
       const convo = await this.conversationService.create({
@@ -415,7 +410,6 @@ export class BotService {
         'hook:stats:entry',
         BotStatsType.new_conversations,
         'New conversations',
-        subscriber,
       );
 
       try {

api/src/chat/services/chat.service.ts

@@ -84,10 +84,7 @@ export class ChatService {
    * @param sentMessage - The message that has been sent
    */
   @OnEvent('hook:chatbot:sent', { promisify: true })
-  async handleSentMessage(
+  async handleSentMessage(sentMessage: MessageCreateDto) {
-    sentMessage: MessageCreateDto,
-    _event: EventWrapper<any, any>,
-  ) {
     if (sentMessage.mid) {
       try {
         const message = await this.messageService.findOneOrCreate(
@@ -141,13 +138,11 @@ export class ChatService {
         'hook:stats:entry',
         BotStatsType.incoming,
         'Incoming',
-        subscriber,
       );
       this.eventEmitter.emit(
         'hook:stats:entry',
         BotStatsType.all_messages,
         'All Messages',
-        subscriber,
       );
     } catch (err) {
       this.logger.error('Unable to log received message.', err, event);
@@ -241,8 +236,8 @@ export class ChatService {
           read: false,
         };
 
-        this.eventEmitter.emit('hook:chatbot:sent', sentMessage, event);
+        this.eventEmitter.emit('hook:chatbot:sent', sentMessage);
-        this.eventEmitter.emit('hook:stats:entry', 'echo', 'Echo', recipient);
+        this.eventEmitter.emit('hook:stats:entry', 'echo', 'Echo');
       } catch (err) {
         this.logger.error('Unable to log echo message', err, event);
       }