reply with question or statement

apps/bot/src/bot.controller.ts

@@ -0,0 +1,25 @@
+import { Controller, Logger, UseInterceptors } from '@nestjs/common';
+import { MessagePattern, Payload } from '@nestjs/microservices';
+import { BotService } from './bot.service';
+import { TelegramAction } from '@app/common';
+import { EventsInterceptor } from '@app/common/rmq/interceptors/events.interceptor';
+
+interface MessagePayload {
+  chat_id: number | string;
+  text: string;
+  other: any;
+}
+
+@Controller()
+@UseInterceptors(EventsInterceptor)
+export class BotController {
+  private readonly logger = new Logger(BotController.name);
+  constructor(private readonly botService: BotService) { }
+
+  @MessagePattern(TelegramAction.SEND_MESSAGE)
+  async sendMessage(@Payload() payload: MessagePayload): Promise<void> {
+    const { chat_id, text, other } = payload;
+    await this.botService.sendMessage(chat_id, text, other);
+    return;
+  }
+}

apps/bot/src/bot.module.ts

@@ -9,6 +9,7 @@ import {
   RmqModule,
 } from '@app/common';
 import { Services } from '@app/common';
+import { BotController } from './bot.controller';
 
 @Module({
   imports: [
@@ -21,6 +22,7 @@ import { Services } from '@app/common';
     RmqModule.register(Services.GraphStore),
     RmqModule.register(Services.TGQuestionService),
   ],
+  controllers: [BotController],
   providers: [BotService],
 })
 export class BotModule { }

apps/bot/src/bot.service.ts

@@ -2,7 +2,9 @@ import { IgnoreEvent, Services, UpdateEvent } from '@app/common';
 import { Inject, Injectable, Logger, OnModuleInit } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { ClientProxy } from '@nestjs/microservices';
-import { API_CONSTANTS, Bot } from 'grammy';
+import { API_CONSTANTS, Bot, RawApi } from 'grammy';
+import { Other } from 'grammy/out/core/api';
+import { Message, ReplyParameters } from 'grammy/types';
 
 @Injectable()
 export class BotService implements OnModuleInit {
@@ -29,7 +31,10 @@ export class BotService implements OnModuleInit {
         this.logger.log(`Received ${event} from ${ctx.chat.id}`);
         this.eventClient.emit(event, ctx);
         this.graphClient.emit(event, ctx);
-        this.tgQuestionClient.emit(event, ctx);
+        if (!ctx.update.message.from.is_bot) {
+          this.tgQuestionClient.emit(event, ctx);
+        }
+        return;
       });
     });
   }
@@ -39,4 +44,14 @@ export class BotService implements OnModuleInit {
       allowed_updates: API_CONSTANTS.ALL_UPDATE_TYPES,
     });
   }
+
+  async sendMessage(
+    chat_id: number | string,
+    text: string,
+    other?: Other<RawApi, 'sendMessage', 'text' | 'chat_id'>,
+  ): Promise<Message.TextMessage | null> {
+    const receipt = await this.bot.api.sendMessage(chat_id, text, other);
+    this.logger.log(`Message ${receipt.message_id} sent to ${receipt.chat.id}`);
+    return receipt;
+  }
 }

apps/event-store/src/event-store.controller.ts

@@ -2,15 +2,15 @@ import { Controller, Logger, UseInterceptors } from '@nestjs/common';
 import { EventStoreService } from './event-store.service';
 import { MessagePattern, Payload } from '@nestjs/microservices';
 import { UpdateEvent } from '@app/common';
-import { EventsInterceptor } from './interceptors/events.interceptor';
+import { EventsInterceptor } from '@app/common/rmq/interceptors/events.interceptor';
 import { API_CONSTANTS } from 'grammy';
 
 @Controller()
 @UseInterceptors(EventsInterceptor)
 export class EventStoreController {
   private readonly logger = new Logger(EventStoreController.name);
 
-  constructor(private readonly eventsService: EventStoreService) {}
+  constructor(private readonly eventsService: EventStoreService) { }
 
   a = typeof API_CONSTANTS.ALL_UPDATE_TYPES;
 

apps/graph-store/src/chat_member/chat_member.controller.ts

@@ -2,7 +2,7 @@ import { UpdateEvent } from '@app/common';
 import { Controller, Logger, UseInterceptors } from '@nestjs/common';
 import { MessagePattern } from '@nestjs/microservices';
 import { DChatMemberUpdated } from '../decorators/chatMemberUpdated.decorator';
-import { RmqInterceptor } from '../interceptors/rmq.interceptor';
+import { EventsInterceptor } from '@app/common/rmq/interceptors/events.interceptor';
 import { Chat, ChatMemberUpdated } from 'grammy/types';
 import { ChatMemberService } from './chat_member.service';
 import { DChat } from '../decorators/chat.decorator';
@@ -25,11 +25,11 @@ type Action =
   | 'DEMOTED';
 
 @Controller('chat-member')
-@UseInterceptors(RmqInterceptor)
+@UseInterceptors(EventsInterceptor)
 export class ChatMemberController {
   private readonly logger = new Logger(ChatMemberController.name);
 
-  constructor(private readonly chatMemberService: ChatMemberService) {}
+  constructor(private readonly chatMemberService: ChatMemberService) { }
 
   @MessagePattern(UpdateEvent.CHAT_MEMBER)
   async chat_member(

apps/graph-store/src/edited_message/edited_message.controller.ts

@@ -13,10 +13,10 @@ import { MentionedService } from '../mentioned/mentioned.service';
 import { MessageService } from '../message/message.service';
 import { RepliedService } from '../replied/replied.service';
 import { UserService } from '../user/user.service';
-import { RmqInterceptor } from '../interceptors/rmq.interceptor';
+import { EventsInterceptor } from '@app/common/rmq/interceptors/events.interceptor';
 
 @Controller('edited-message')
-@UseInterceptors(RmqInterceptor)
+@UseInterceptors(EventsInterceptor)
 export class EditedMessageController {
   private readonly logger = new Logger(EditedMessageController.name);
 
@@ -28,7 +28,7 @@ export class EditedMessageController {
     private readonly joinedService: JoinedService,
     private readonly repliedService: RepliedService,
     private readonly mentionedService: MentionedService,
-  ) {}
+  ) { }
 
   @MessagePattern(UpdateEvent.EDITED_MESSAGE)
   async chat_member(

apps/graph-store/src/graph-store.module.ts

@@ -36,4 +36,4 @@ import { MessageReactionModule } from './message_reaction/message_reaction.modul
     MessageReactionModule,
   ],
 })
-export class GraphStoreModule {}
+export class GraphStoreModule { }

apps/graph-store/src/message/message.controller.ts

@@ -2,7 +2,6 @@ import { UpdateEvent } from '@app/common';
 import { Controller, Logger, UseInterceptors } from '@nestjs/common';
 import { MessagePattern } from '@nestjs/microservices';
 import { DChat } from '../decorators/chat.decorator';
-import { RmqInterceptor } from '../interceptors/rmq.interceptor';
 import { MessageService } from './message.service';
 import { DMessage } from '../decorators/message.decorator';
 import { Chat, Message, MessageEntity, User } from 'grammy/types';
@@ -14,9 +13,10 @@ import { MentionedService } from '../mentioned/mentioned.service';
 import { RepliedService } from '../replied/replied.service';
 import { UserService } from '../user/user.service';
 import { Neo4jService } from 'nest-neo4j/dist';
+import { EventsInterceptor } from '@app/common/rmq/interceptors/events.interceptor';
 
 @Controller('message')
-@UseInterceptors(RmqInterceptor)
+@UseInterceptors(EventsInterceptor)
 export class MessageController {
   private readonly logger = new Logger(MessageController.name);
 
@@ -28,7 +28,7 @@ export class MessageController {
     private readonly joinedService: JoinedService,
     private readonly repliedService: RepliedService,
     private readonly mentionedService: MentionedService,
-  ) {}
+  ) { }
 
   @MessagePattern(UpdateEvent.MESSAGE)
   async message(

apps/graph-store/src/message_reaction/message_reaction.controller.ts

@@ -10,10 +10,10 @@ import { DUser } from '../decorators/user.decorator';
 import { JoinedService } from '../joined/joined.service';
 import { UserService } from '../user/user.service';
 import { MessageReactionService } from './message_reaction.service';
-import { RmqInterceptor } from '../interceptors/rmq.interceptor';
+import { EventsInterceptor } from '@app/common/rmq/interceptors/events.interceptor';
 
 @Controller('message-reaction')
-@UseInterceptors(RmqInterceptor)
+@UseInterceptors(EventsInterceptor)
 export class MessageReactionController {
   private readonly logger = new Logger(MessageReactionController.name);
 
@@ -23,7 +23,7 @@ export class MessageReactionController {
     private readonly userService: UserService,
     private readonly joinedService: JoinedService,
     private readonly messageReactionService: MessageReactionService,
-  ) {}
+  ) { }
 
   @MessagePattern(UpdateEvent.MESSAGE_REACTION)
   async message(

apps/question-service/src/question-service.controller.ts

@@ -1,20 +1,47 @@
-import { Controller, Logger } from '@nestjs/common';
+import { Controller, Inject, Logger } from '@nestjs/common';
 import { QuestionServiceService } from './question-service.service';
-import { MessagePattern, Payload } from '@nestjs/microservices';
-import { UpdateEvent } from '@app/common';
+import { ClientProxy, MessagePattern, Payload } from '@nestjs/microservices';
+import { Services, TelegramAction, UpdateEvent } from '@app/common';
+import { Context } from 'grammy';
+import { ReplyParameters } from 'grammy/types';
+import { UseInterceptors } from '@nestjs/common';
+import { EventsInterceptor } from '@app/common/rmq/interceptors/events.interceptor';
 
 @Controller()
+@UseInterceptors(EventsInterceptor)
 export class QuestionServiceController {
   private readonly logger = new Logger(QuestionServiceController.name);
   constructor(
     private readonly questionServiceService: QuestionServiceService,
+    @Inject(Services.TelegramBot.name)
+    private readonly telegramClient: ClientProxy,
   ) { }
 
   @MessagePattern(UpdateEvent.MESSAGE)
-  async message(@Payload() payload): Promise<void> {
-    const { update } = payload;
-    const { message } = update;
-    const { data } = await this.questionServiceService.test(message.text);
-    this.logger.log('Result', data);
+  async message(@Payload() ctx: Context): Promise<void> {
+    const {
+      message_id,
+      text: msg,
+      chat: { id: chat_id },
+    } = ctx.update?.message;
+    const {
+      data: { label, score },
+    } = await this.questionServiceService.test(msg);
+
+    const text = `${label}: ${score}`;
+
+    const reply_parameters: ReplyParameters = {
+      message_id,
+    };
+
+    const data = {
+      chat_id,
+      text,
+      other: {
+        reply_parameters,
+      },
+    };
+
+    this.telegramClient.emit(TelegramAction.SEND_MESSAGE, data);
   }
 }

apps/question-service/src/question-service.module.ts

@@ -1,7 +1,13 @@
 import { Module } from '@nestjs/common';
 import { QuestionServiceController } from './question-service.controller';
 import { QuestionServiceService } from './question-service.service';
-import { schemaConfig, rmqConfig, mongoConfig, RmqModule } from '@app/common';
+import {
+  schemaConfig,
+  rmqConfig,
+  mongoConfig,
+  RmqModule,
+  Services,
+} from '@app/common';
 import { ConfigModule } from '@nestjs/config';
 import { HttpModule } from '@nestjs/axios';
 
@@ -14,6 +20,7 @@ import { HttpModule } from '@nestjs/axios';
     }),
     RmqModule,
     HttpModule,
+    RmqModule.register(Services.TelegramBot),
   ],
   controllers: [QuestionServiceController],
   providers: [QuestionServiceService],

docker-compose.yml

@@ -13,6 +13,8 @@ x-telegram-common: &telegram-common
       condition: service_healthy
     mongodb:
       condition: service_healthy
+  volumes:
+    - ./:/usr/src/app/
 
 services:
   mongodb:
@@ -75,7 +77,7 @@ services:
   telegram-bot:
     <<: [ *telegram-common ]
     container_name: telegram-bot
-    command: npm run start bot
+    command: npm run start:dev bot
   telegram-events:
     <<: [ *telegram-common ]
     container_name: telegram-events
@@ -87,7 +89,7 @@ services:
   telegram-question:
     <<: [ *telegram-common ]
     container_name: telegram-question
-    command: npm run start question-service
+    command: npm run start:dev question-service
 
   question-service-ext:
     image: ghcr.io/togethercrew/question-service:main