inject CommandContext

Author: azhe403

ZiziBot.TelegramBot.Framework/Extensions/ClientExtension.cs

@@ -103,6 +103,7 @@ public static IServiceCollection AddZiziBotTelegramBot(this IServiceCollection s
         services.AddSingleton<BotEngineHandler>();
         services.AddSingleton<BotClientCollection>();
         services.AddScoped<BotUpdateHandler>();
+        services.AddScoped<CommandContext>();
 
         return services;
     }

ZiziBot.TelegramBot.Framework/Handlers/BotUpdateHandler.cs

@@ -0,0 +1,12 @@
+namespace ZiziBot.TelegramBot.Framework.Models;
+
+public partial class CommandContext
+{
+    internal void SetContext(CommandContext commandContext)
+    {
+        BotToken = commandContext.BotToken;
+        BotClient = commandContext.BotClient;
+        Update = commandContext.Update;
+        EngineConfig = commandContext.EngineConfig;
+    }
+}

ZiziBot.TelegramBot.Framework/Models/Context/CommandContext.Mutate.cs

@@ -28,7 +28,8 @@ public async Task<Message> SendMessage(
         ArgumentNullException.ThrowIfNull(Chat);
         ArgumentException.ThrowIfNullOrEmpty(text);
 
-        replyParameters ??= new ReplyParameters() {
+        replyParameters ??= new ReplyParameters()
+        {
             AllowSendingWithoutReply = true
         };
 

…amework/Models/CommandContext.Request.cs …Models/Context/CommandContext.Request.csZiziBot.TelegramBot.Framework/Models/CommandContext.Request.cs renamed to ZiziBot.TelegramBot.Framework/Models/Context/CommandContext.Request.cs ZiziBot.TelegramBot.Framework/Models/CommandContext.Request.cs renamed to ZiziBot.TelegramBot.Framework/Models/Context/CommandContext.Request.cs

@@ -8,10 +8,10 @@ namespace ZiziBot.TelegramBot.Framework.Models;
 
 public partial class CommandContext
 {
-    public string? BotToken { get; init; }
-    public ITelegramBotClient? BotClient { get; set; }
-    public Update? Update { get; set; }
-    public BotEngineConfig? EngineConfig { get; set; }
+    public string? BotToken { get; internal set; }
+    public ITelegramBotClient? BotClient { get; internal set; }
+    public Update? Update { get; internal set; }
+    public BotEngineConfig? EngineConfig { get; internal set; }
 
     #region Join Request
 

…amBot.Framework/Models/CommandContext.cs …amework/Models/Context/CommandContext.csZiziBot.TelegramBot.Framework/Models/CommandContext.cs renamed to ZiziBot.TelegramBot.Framework/Models/Context/CommandContext.cs ZiziBot.TelegramBot.Framework/Models/CommandContext.cs renamed to ZiziBot.TelegramBot.Framework/Models/Context/CommandContext.cs

@@ -1,15 +1,16 @@
-using Telegram.Bot.Types.InlineQueryResults;
+using Telegram.Bot.Types.InlineQueryResults;
 using ZiziBot.TelegramBot.Framework.Attributes;
 using ZiziBot.TelegramBot.Framework.Models;
 
 namespace ZiziBot.TelegramBot.Sample.Commands;
 
-public class InlineQueryCommands : BotCommandController
+public class InlineQueryCommands(CommandContext context) : BotCommandController
 {
     [InlineQuery]
     public async Task InlineQueryCommand()
     {
-        await AnswerInlineQuery(new List<InlineQueryResult>() {
+        await AnswerInlineQuery(new List<InlineQueryResult>()
+        {
             new InlineQueryResultArticle("default-inline", "Default Inline", new InputTextMessageContent("Default Inline Content")),
             new InlineQueryResultArticle("hello-inline", "Hello Inline", new InputTextMessageContent("Hello Inline Content"))
         });
@@ -18,18 +19,20 @@ await AnswerInlineQuery(new List<InlineQueryResult>() {
     [InlineQuery("hello")]
     public async Task InlineQueryCommandHello()
     {
-        await AnswerInlineQuery(new List<InlineQueryResult>() {
+        await AnswerInlineQuery(new List<InlineQueryResult>()
+        {
             new InlineQueryResultArticle("aa576dec-0727-4ea1-99ae-3c7cb20ea3c8", "Hello Inline", new InputTextMessageContent("Hello Inline Content"))
         });
     }
-    
+
     [InlineQuery("id")]
     public async Task InlineQueryCommandId()
     {
         var message = $"ID: {Context.UserId}" +
                       $"\nUsername: {Context.UserUsername}";
-        
-        await AnswerInlineQuery(new List<InlineQueryResult>() {
+
+        await AnswerInlineQuery(new List<InlineQueryResult>()
+        {
             new InlineQueryResultArticle("aa576dec-0727-4ea1-99ae-3c7cb20ea3c8", "Select to see your ID", new InputTextMessageContent(message))
         });
     }

ZiziBot.TelegramBot.Sample/Commands/InlineQueryCommands.cs

@@ -4,21 +4,24 @@
 
 namespace ZiziBot.TelegramBot.Sample.Commands;
 
-public class SampleCommands : BotCommandController
+public class SampleCommands(CommandContext context) : BotCommandController
 {
     [Command("ping")]
     [TextCommand("ping")]
     public async Task PingCommand()
     {
         var replyMarkup = new InlineKeyboardMarkup([
             [
-                new InlineKeyboardButton("Ping") {
+                new InlineKeyboardButton("Ping")
+                {
                     CallbackData = "ping"
                 },
-                new InlineKeyboardButton("Foo Bar") {
+                new InlineKeyboardButton("Foo Bar")
+                {
                     CallbackData = "foo bar"
                 },
-                new InlineKeyboardButton("lorem ipsum") {
+                new InlineKeyboardButton("lorem ipsum")
+                {
                     CallbackData = "lorem ipsum dolor sit amet"
                 }
             ]