Fix GPT commands

teknologi-umum · Dec 31, 2023 · 03d4653 · 03d4653
1 parent 3a0da7f
commit 03d4653
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 17 deletions.
diff --git a/BotNet.CommandHandlers/AI/OpenAI/AskCommandHandler.cs b/BotNet.CommandHandlers/AI/OpenAI/AskCommandHandler.cs
@@ -91,7 +91,11 @@ select ChatMessage.FromText(
 
 				// Track thread
 				_telegramMessageCache.Add(
-					message: AIResponseMessage.FromMessage(responseMessage, "AI")
+					message: AIResponseMessage.FromMessage(
+						message: responseMessage,
+						replyToMessageId: command.PromptMessageId,
+						callSign: "AI"
+					)
 				);
 			});
 		}

diff --git a/BotNet.CommandHandlers/AI/OpenAI/OpenAITextPromptHandler.cs b/BotNet.CommandHandlers/AI/OpenAI/OpenAITextPromptHandler.cs
@@ -139,8 +139,9 @@ await _telegramBotClient.EditMessageTextAsync(
 				// Track thread
 				_telegramMessageCache.Add(
 					message: AIResponseMessage.FromMessage(
-						responseMessage,
-						command.CallSign
+						message: responseMessage,
+						replyToMessageId: command.PromptMessageId,
+						callSign: command.CallSign
 					)
 				);
 			});

diff --git a/BotNet.CommandHandlers/BotUpdate/Message/AICallCommandHandler.cs b/BotNet.CommandHandlers/BotUpdate/Message/AICallCommandHandler.cs
@@ -17,10 +17,12 @@ public async Task Handle(AICallCommand command, CancellationToken cancellationTo
 					await _commandQueue.DispatchAsync(
 						command: OpenAITextPrompt.FromAICallCommand(
 							aiCallCommand: command,
-							thread: _telegramMessageCache.GetThread(
-								messageId: command.MessageId,
-								chatId: command.ChatId
-							)
+							thread: command.ReplyToMessageId.HasValue
+								? _telegramMessageCache.GetThread(
+									messageId: command.ReplyToMessageId.Value,
+									chatId: command.ChatId
+								)
+								: Enumerable.Empty<MessageBase>()
 						)
 					);
 					break;

diff --git a/BotNet.CommandHandlers/BotUpdate/Message/AIFollowUpMessageHandler.cs b/BotNet.CommandHandlers/BotUpdate/Message/AIFollowUpMessageHandler.cs
@@ -17,10 +17,12 @@ public async Task Handle(AIFollowUpMessage command, CancellationToken cancellati
 					await _commandQueue.DispatchAsync(
 						command: OpenAITextPrompt.FromAIFollowUpMessage(
 							aiFollowUpMessage: command,
-							thread: _telegramMessageCache.GetThread(
-								messageId: command.MessageId,
-								chatId: command.ChatId
-							)
+							thread: command.ReplyToMessageId.HasValue
+								? _telegramMessageCache.GetThread(
+									messageId: command.ReplyToMessageId.Value,
+									chatId: command.ChatId
+								)
+								: Enumerable.Empty<MessageBase>()
 						)
 					);
 					break;

diff --git a/BotNet.Commands/BotUpdate/Message/AIResponseMessage.cs b/BotNet.Commands/BotUpdate/Message/AIResponseMessage.cs
@@ -30,21 +30,17 @@ string callSign
 
 		public static AIResponseMessage FromMessage(
 			Telegram.Bot.Types.Message message,
+			int replyToMessageId,
 			string callSign
 		) {
-			// Message must be a reply
-			if (message.ReplyToMessage is not { } replyToMessage) {
-				throw new ArgumentException("Message must be a reply.", nameof(message));
-			}
-
 			return new(
 				messageId: message.MessageId,
 				chatId: message.Chat.Id,
 				senderId: message.From!.Id,
 				senderName: callSign,
 				text: message.Text ?? message.Caption ?? "",
 				imageFileId: message.Photo?.FirstOrDefault()?.FileId,
-				replyToMessageId: replyToMessage.MessageId,
+				replyToMessageId: replyToMessageId,
 				replyToMessage: null,
 				callSign: callSign
 			);