Ignore exec command in home group if not mentioned

teknologi-umum · Feb 4, 2024 · e5b3651 · e5b3651
1 parent ab28e62
commit e5b3651
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/BotNet.CommandHandlers/Exec/ExecCommandHandler.cs b/BotNet.CommandHandlers/Exec/ExecCommandHandler.cs
@@ -1,4 +1,5 @@
 using System.Net;
+using BotNet.Commands.ChatAggregate;
 using BotNet.Commands.Exec;
 using BotNet.Services.MarkdownV2;
 using BotNet.Services.Piston;
@@ -18,6 +19,12 @@ ILogger<ExecCommandHandler> logger
 		private readonly ILogger<ExecCommandHandler> _logger = logger;
 
 		public Task Handle(ExecCommand command, CancellationToken cancellationToken) {
+			// Ignore non-mentioned commands in home group
+			if (command.Chat is HomeGroupChat
+				&& !command.IsMentioned) {
+				return Task.CompletedTask;
+			}
+
 			// Fire and forget
 			Task.Run(async () => {
 				try {

diff --git a/BotNet.Commands/BotUpdate/Message/SlashCommand.cs b/BotNet.Commands/BotUpdate/Message/SlashCommand.cs
@@ -7,6 +7,7 @@
 namespace BotNet.Commands.BotUpdate.Message {
 	public sealed record SlashCommand : HumanMessageBase, ICommand {
 		public string Command { get; }
+		public bool IsMentioned { get; }
 
 		private SlashCommand(
 			MessageId messageId,
@@ -15,7 +16,8 @@ private SlashCommand(
 			string text,
 			string? imageFileId,
 			MessageBase? replyToMessage,
-			string command
+			string command,
+			bool isMentioned
 		) : base(
 			messageId: messageId,
 			chat: chat,
@@ -29,6 +31,7 @@ string command
 			if (command.Length < 2) throw new ArgumentException("Command must have a name.", nameof(command));
 
 			Command = command;
+			IsMentioned = isMentioned;
 		}
 
 		public static bool TryCreate(
@@ -71,7 +74,8 @@ public static bool TryCreate(
 			string arg = text[commandLength..].Trim();
 
 			// Command must be for this bot
-			if (commandText.IndexOf('@') is int ampersandPos and not -1) {
+			if (commandText.IndexOf('@') is int ampersandPos
+				&& ampersandPos != -1) {
 				string targetUsername = commandText[(ampersandPos + 1)..];
 				if (!StringComparer.OrdinalIgnoreCase.Equals(targetUsername, botUsername)) {
 					slashCommand = null;
@@ -91,7 +95,8 @@ public static bool TryCreate(
 				replyToMessage: message.ReplyToMessage is null
 					? null
 					: NormalMessage.FromMessage(message.ReplyToMessage, commandPriorityCategorizer),
-				command: commandText
+				command: commandText,
+				isMentioned: ampersandPos != -1
 			);
 			return true;
 		}

diff --git a/BotNet.Commands/Exec/ExecCommand.cs b/BotNet.Commands/Exec/ExecCommand.cs
@@ -8,19 +8,22 @@ public sealed record ExecCommand : ICommand {
 		public string PistonLanguageIdentifier { get; }
 		public string HighlightLanguageIdentifier { get; }
 		public string Code { get; }
+		public bool IsMentioned { get; }
 		public MessageId CodeMessageId { get; }
 		public ChatBase Chat { get; }
 
 		private ExecCommand(
 			string pistonLanguageIdentifier,
 			string highlightLanguageIdentifier,
 			string code,
+			bool isMentioned,
 			MessageId codeMessageId,
 			ChatBase chat
 		) {
 			PistonLanguageIdentifier = pistonLanguageIdentifier;
 			HighlightLanguageIdentifier = highlightLanguageIdentifier;
 			Code = code;
+			IsMentioned = isMentioned;
 			CodeMessageId = codeMessageId;
 			Chat = chat;
 		}
@@ -108,6 +111,7 @@ public static ExecCommand FromSlashCommand(SlashCommand slashCommand) {
 				pistonLanguageIdentifier: pistonLanguageIdentifier,
 				highlightLanguageIdentifier: highlightLanguageIdentifier,
 				code: code,
+				isMentioned: slashCommand.IsMentioned,
 				codeMessageId: new(codeMessageId),
 				chat: slashCommand.Chat
 			);