feat: add handler extensions

Author: GitHub Copilot

Src/TeleFrame/ApplicationBuilder/TelegramBotApplicationBuilder.cs

@@ -3,7 +3,6 @@
 using Microsoft.Extensions.Diagnostics.Metrics;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
-using TeleFrame.Application;
 using TeleFrame.Services;
 using TeleFrame.Services.StateManager;
 using Telegram.Bot.Polling;

Src/TeleFrame/GlobalUsings.cs

@@ -6,6 +6,7 @@
 global using System.Threading.Tasks;
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.DependencyInjection;
+global using TeleFrame.Application;
 global using TeleFrame.Options;
 global using TeleFrame.UpdateHandlers;
 global using TeleFrame.Services;

Src/TeleFrame/Middlewares/UpdateLoggingMiddleware.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using TeleFrame.Application;
 using TeleFrame.Middlewares.Abstractions;
 using TeleFrame.Services;
 

Src/TeleFrame/TeleFrame.csproj

@@ -8,7 +8,7 @@
         <PackageId>TeleFrame</PackageId>
         <Description> </Description>
         <RepositoryUrl>https://github.com/M0BIN-V/TeleFrame</RepositoryUrl>
-        <Version>1.1.3</Version>
+        <Version>1.1.4</Version>
         <PackageIcon>TeleFrame.png</PackageIcon>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageLicenseFile>LICENCE</PackageLicenseFile>

Src/TeleFrame/UpdateHandlers/CommandHandlers/CommandHandlerExtensions.cs

@@ -0,0 +1,24 @@
+using Telegram.Bot.Types.Enums;
+
+namespace TeleFrame.UpdateHandlers.MessageHandlers.CommandHandlers;
+
+public static class CommandHandlerExtensions
+{
+    extension(TelegramBotApplication app)
+    {
+        public MessageHandlerBuilder MapCommand(Func<string, bool> predicate, UpdateHandlerDelegate handler)
+        {
+            return app.MapMessage(m => m.Type is MessageType.Text && predicate(m.Text!), handler);
+        }
+
+        public MessageHandlerBuilder MapCommand(Func<string, bool> predicate, Delegate handler)
+        {
+            return app.MapMessage(m => m.Type is MessageType.Text && predicate(m.Text!), handler);
+        }
+
+        public MessageHandlerBuilder MapCommand(string command, Delegate handler)
+        {
+            return app.MapCommand(c => c.Equals(command, StringComparison.InvariantCultureIgnoreCase), handler);
+        }
+    }
+}

Src/TeleFrame/UpdateHandlers/MessageHandlers/CommandHandlers/CommandHandlerExtensions.cs

@@ -1,8 +1,8 @@
-namespace TeleFrame.UpdateHandlers.CommandHandlers;
+namespace TeleFrame.UpdateHandlers.MessageHandlers;
 
-public class CommandHandlerBuilder : UpdateHandlerBuilder
+public class MessageHandlerBuilder : UpdateHandlerBuilder
 {
-    public CommandHandlerBuilder(UpdateHandlerDelegate handler) : base(handler) { }
+    public MessageHandlerBuilder(UpdateHandlerDelegate handler) : base(handler) { }
 
     public string RequireStateText { get; private set; } = "";
 

…CommandHandlers/CommandHandlerBuilder.cs …MessageHandlers/MessageHandlerBuilder.csSrc/TeleFrame/UpdateHandlers/CommandHandlers/CommandHandlerBuilder.cs renamed to Src/TeleFrame/UpdateHandlers/MessageHandlers/MessageHandlerBuilder.cs Src/TeleFrame/UpdateHandlers/CommandHandlers/CommandHandlerBuilder.cs renamed to Src/TeleFrame/UpdateHandlers/MessageHandlers/MessageHandlerBuilder.cs

@@ -0,0 +1,35 @@
+using TeleFrame.Services.StateManager;
+using Telegram.Bot.Types.Enums;
+
+namespace TeleFrame.UpdateHandlers.MessageHandlers;
+
+public static class MessageHandlerExtensions
+{
+    extension(TelegramBotApplication app)
+    {
+        public MessageHandlerBuilder MapMessage(Func<Message, bool> predicate, UpdateHandlerDelegate handler)
+        {
+            var builder = new MessageHandlerBuilder(handler);
+
+            app.MapUpdate(u =>
+                    u.Update.Type == UpdateType.Message &&
+                    u.Update.Message!.Text != null &&
+                    u.Services.GetRequiredService<IStateManager>().StateIs(builder.RequireStateText) &&
+                    predicate(u.Update.Message),
+                (context, ct) => builder.Build().Invoke(context, ct));
+
+            return builder;
+        }
+
+        public MessageHandlerBuilder MapMessage(Func<Message, bool> predicate, Delegate handler)
+        {
+            var convertedHandler = UpdateHandlerFactory.Create(handler);
+            return app.MapMessage(predicate, convertedHandler);
+        }
+
+        public MessageHandlerBuilder MapMessage(MessageType type, Delegate handler)
+        {
+            return app.MapMessage(m => m.Type == type, handler);
+        }
+    }
+}

Src/TeleFrame/UpdateHandlers/MessageHandlers/MessageHandlerExtensions.cs

@@ -0,0 +1,19 @@
+using Telegram.Bot.Types.Enums;
+
+namespace TeleFrame.UpdateHandlers.MessageHandlers.VoiceHandlers;
+
+public static class VoiceHandlerExtensions
+{
+    extension(TelegramBotApplication app)
+    {
+        public UpdateHandlerBuilder MapVoice(Func<Voice, bool> predicate, UpdateHandlerDelegate handler)
+        {
+            return app.MapMessage(m => m.Type is MessageType.Voice && predicate(m.Voice!), handler);
+        }
+        
+        public UpdateHandlerBuilder MapVoice(Func<Voice, bool> predicate, Delegate handler)
+        {
+            return app.MapMessage(m => m.Type is MessageType.Voice && predicate(m.Voice!), handler);
+        }
+    }
+}

Src/TeleFrame/UpdateHandlers/MessageHandlers/VoiceHandlers/VoiceHandlerExtensions.cs

@@ -1,6 +1,3 @@
-using Microsoft.Extensions.DependencyInjection;
-using TeleFrame.Services;
-
 namespace TeleFrame.UpdateHandlers;
 
 public delegate Task UpdateHandlerFilterDelegate(UpdateContext context, CancellationToken ct);