Telegram.Bot.Framework moved in the repo

Author: k0dep

.gitignore

@@ -6,4 +6,6 @@
 **/**.csproj.user
 **/db.sqlite
 /Examples/Deployf.Botf.ReminderBot/Hangfire.db
-**/publish
+**/publish
+.DS_Store
+**/.DS_Store

Deployf.Botf/Attributes/ActionAttribute.cs

@@ -1,10 +1,14 @@
-namespace Deployf.Botf;
+using Telegram.Bot.Types.Enums;
+
+namespace Deployf.Botf;
 
 [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = true)]
 public sealed class ActionAttribute : Attribute
 {
     public readonly string? Template;
     public readonly string? Desc;
+//    public readonly UpdateType[] UpdateTypes;
+//    public readonly MessageType[] MessageTypes;
 
     public ActionAttribute(string? template = null, string? desc = null)
     {

Deployf.Botf/Attributes/OnAttribute.cs

@@ -1,12 +1,37 @@
-namespace Deployf.Botf;
+using Telegram.Bot.Types.Enums;
+
+namespace Deployf.Botf;
 
 [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = false)]
 public sealed class OnAttribute : Attribute
 {
     public readonly Handle Handler;
+//    public readonly UpdateType[] UpdateTypes;
+//    public readonly MessageType[] MessageTypes;
 
     public OnAttribute(Handle type)
     {
         Handler = type;
     }
-}
+
+/*
+    public OnAttribute(Handle type, params UpdateType[] updateTypes)
+    {
+        Handler = type;
+        UpdateTypes = updateTypes;
+    }
+
+    public OnAttribute(Handle type, params MessageType[] messageTypes)
+    {
+        Handler = type;
+        MessageTypes = messageTypes;
+    }
+
+    public OnAttribute(Handle type, UpdateType[] updateTypes, MessageType[] messageTypes)
+    {
+        Handler = type;
+        MessageTypes = messageTypes;
+        UpdateTypes = updateTypes;
+    }
+*/
+}

Deployf.Botf/BotController.cs

@@ -540,7 +540,7 @@ public string FPath(string controller, string action, params object[] args)
 
     #region chaining
 
-    public async Task<IUpdateContext> AwaitNextUpdate(Action onCanceled = null)
+    public async Task<IUpdateContext> AwaitNextUpdate(Action? onCanceled = null)
     {
         var options = ((BotfBot)Context.Bot).Options;
         var store = Context.Services.GetRequiredService<ChainStorage>();
@@ -572,7 +572,7 @@ public async Task<IUpdateContext> AwaitNextUpdate(Action onCanceled = null)
         }
     }
 
-    public async Task<string> AwaitText(Action onCanceled = null)
+    public async Task<string> AwaitText(Action? onCanceled = null)
     {
         while (true)
         {
@@ -586,7 +586,7 @@ public async Task<string> AwaitText(Action onCanceled = null)
         }
     }
 
-    public async Task<string> AwaitQuery(Action onCanceled = null)
+    public async Task<string> AwaitQuery(Action? onCanceled = null)
     {
         while (true)
         {

Deployf.Botf/BotfProgram.cs

@@ -7,7 +7,7 @@ public static void StartBot(
         bool skipHello = false,
         Action<IServiceCollection, IConfiguration>? onConfigure = null,
         Action<IApplicationBuilder, IConfiguration>? onRun = null,
-        BotfOptions options = null)
+        BotfOptions? options = null)
     {
         if (!skipHello)
         {
@@ -27,15 +27,22 @@ public static void StartBot(
 
         if(botOptions == null && builder.Configuration["bot"] != null)
         {
-            //TODO: check the bot section, it should be an object
-            botOptions = builder.Configuration.GetSection("bot").Get<BotfOptions>();
+            var section = builder.Configuration.GetSection("bot");
+            botOptions = section.Get<BotfOptions>();
         }
 
         var connectionString = builder.Configuration["botf"];
         if (botOptions == null && connectionString != null)
         {
             botOptions = ConnectionString.Parse(connectionString);
         }
+        
+        if(botOptions == null)
+        {
+            throw new BotfException("Configuration is not passed. Check the appsettings*.json.\n" +
+                "There must be configuration object like `{ \"bot\": { \"Token\": \"BotToken...\" } }`\n" +
+                "Or connection string(in root) like `{ \"botf\": \"bot_token?key=value\" }`");
+        }
 
         builder.Services.AddBotf(botOptions);
         builder.Services.AddHttpClient();

Deployf.Botf/Deployf.Botf.csproj

@@ -27,7 +27,6 @@
 
   <ItemGroup>
     <PackageReference Include="Telegram.Bot" Version="18.0.0" />
-    <PackageReference Include="Telegram.Bot.Framework" Version="2.0.0-alpha5" />
   </ItemGroup>
 
   <ItemGroup>

Deployf.Botf/Messages/MessageBuilder.cs

@@ -9,7 +9,7 @@ public class MessageBuilder
     public long ChatId { get; private set; }
     public StringBuilder BufferedMessage { get; private set; } = new StringBuilder();
     public IReplyMarkup? Markup { get; set; }
-    public string PhotoUrl { get; set; }
+    public string? PhotoUrl { get; set; }
     public List<List<InlineKeyboardButton>>? Reply { get; set; }
     public List<List<KeyboardButton>>? Keyboard { get; set; }
     public int ReplyToMessageId { get; set; } = 0;

Deployf.Botf/StartupExtensions.cs

@@ -217,7 +217,7 @@ internal static IApplicationBuilder UseWebhook(this IApplicationBuilder app, IBo
         app.Map((PathString)conf.WebhookPath, builder => 
         {
             var type = Type.GetType("Telegram.Bot.Framework.TelegramBotMiddleware`1[Deployf.Botf.BotfBot], Telegram.Bot.Framework");
-            builder.UseMiddleware(type, new [] { updateDelegate });
+            builder.UseMiddleware(type!, new [] { updateDelegate });
         });
         return app;
     }

Deployf.Botf/System/BotfBot.cs

@@ -8,7 +8,7 @@ public class BotfBot : BotBase
     public readonly BotfOptions Options;
 
     public BotfBot(BotfOptions options)
-        : base(options.Username, new TelegramBotClient(new TelegramBotClientOptions(options.Token!, baseUrl: options.ApiBaseUrl)))
+        : base(options.Username!, new TelegramBotClient(new TelegramBotClientOptions(options.Token!, baseUrl: options.ApiBaseUrl)))
     {
         Options = options;
     }

Deployf.Botf/System/BotfOptions.cs

@@ -18,7 +18,7 @@ public string? Username
     public string? WebhookUrl { get; set; }
     public bool AutoSend { get; set; } = true;
     public bool HandleOnlyMentionedInGroups { get; set; }
-    public string ApiBaseUrl { get; set; }
+    public string? ApiBaseUrl { get; set; }
     public bool AutoCleanReplyKeyboard { get; set; }
     public TimeSpan? ChainTimeout { get; set; } = TimeSpan.FromHours(1);
     public bool UseWebhooks => !string.IsNullOrEmpty(WebhookUrl);