Fix HomeGroupChat handling

teknologi-umum · Jan 31, 2024 · e493b6f · e493b6f
1 parent eaf500d
commit e493b6f
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 22 deletions.
diff --git a/BotNet.CommandHandlers/Privilege/PrivilegeCommandHandler.cs b/BotNet.CommandHandlers/Privilege/PrivilegeCommandHandler.cs
@@ -73,6 +73,20 @@ await _telegramBotClient.SendTextMessageAsync(
 								cancellationToken: cancellationToken
 							);
 							break;
+						case { Chat: HomeGroupChat }:
+							await _telegramBotClient.SendTextMessageAsync(
+								chatId: command.Chat.Id,
+								text: $$"""
+									👑 Group {{command.Chat.Title}} (ID: {{command.Chat.Id}}) adalah home group
+									👑 GPT-4 tersedia
+									👑 GPT-4 Vision tersedia
+									✅ SDXL tersedia
+									""",
+								replyToMessageId: command.CommandMessageId,
+								parseMode: ParseMode.Markdown,
+								cancellationToken: cancellationToken
+							);
+							break;
 						case { Chat: GroupChat, Sender: VIPSender }:
 							await _telegramBotClient.SendTextMessageAsync(
 								chatId: command.Chat.Id,
@@ -92,20 +106,6 @@ await _telegramBotClient.SendTextMessageAsync(
 								cancellationToken: cancellationToken
 							);
 							break;
-						case { Chat: HomeGroupChat }:
-							await _telegramBotClient.SendTextMessageAsync(
-								chatId: command.Chat.Id,
-								text: $$"""
-									👑 Group {{command.Chat.Title}} (ID: {{command.Chat.Id}}) adalah home group
-									👑 GPT-4 tersedia
-									👑 GPT-4 Vision tersedia
-									✅ SDXL tersedia
-									""",
-								replyToMessageId: command.CommandMessageId,
-								parseMode: ParseMode.Markdown,
-								cancellationToken: cancellationToken
-							);
-							break;
 						case { Chat: GroupChat }:
 							await _telegramBotClient.SendTextMessageAsync(
 								chatId: command.Chat.Id,

diff --git a/BotNet.Commands/ChatAggregate/Chat.cs b/BotNet.Commands/ChatAggregate/Chat.cs
@@ -76,8 +76,27 @@ Telegram.Bot.Types.Chat telegramChat
 		}
 	}
 
-	public sealed record HomeGroupChat(
-		ChatId Id,
-		string Title
-	) : GroupChat(Id, Title);
+	public sealed record HomeGroupChat : GroupChat {
+		private HomeGroupChat(
+			ChatId id,
+			string title
+		) : base(id, title) { }
+
+		public static new HomeGroupChat FromTelegramChat(
+			Telegram.Bot.Types.Chat telegramChat
+		) {
+			if (telegramChat is not {
+				Id: long chatId,
+				Title: string chatTitle,
+				Type: ChatType.Group or ChatType.Supergroup
+			}) {
+				throw new ArgumentException("Telegram chat must be either a group or a supergroup.");
+			}
+
+			return new(
+				id: new ChatId(chatId),
+				title: chatTitle
+			);
+		}
+	}
 }
diff --git a/BotNet.Commands/CommandPrioritization/CommandPriorityCategorizer.cs b/BotNet.Commands/CommandPrioritization/CommandPriorityCategorizer.cs
@@ -26,12 +26,12 @@ IOptions<CommandPrioritizationOptions> optionsAccessor
 				.ToImmutableHashSet();
 		}
 
-		public bool IsHomeGroup(long ChatId) {
-			return _homeGroupChatIds.Contains(ChatId);
+		public bool IsHomeGroup(long chatId) {
+			return _homeGroupChatIds.Contains(chatId);
 		}
 
-		public bool IsVIPUser(long UserId) {
-			return _vipUserIds.Contains(UserId);
+		public bool IsVIPUser(long userId) {
+			return _vipUserIds.Contains(userId);
 		}
 	}
 }
diff --git a/BotNet.Commands/SenderAggregate/SenderId.cs b/BotNet.Commands/SenderAggregate/SenderId.cs
@@ -2,5 +2,6 @@
 	public readonly record struct SenderId(long Value) {
 		public static implicit operator long(SenderId senderId) => senderId.Value;
 		public static implicit operator SenderId(long senderId) => new(senderId);
+		public override string ToString() => Value.ToString();
 	}
 }