- refactoring

- appsettings fix
- layouts support in AddTelegramBot() now

Author: Igor Evdokimov

Botticelli.Framework.Telegram/Extensions/ServiceCollectionExtensions.cs

@@ -66,6 +66,7 @@ public static IServiceCollection AddTelegramBot(this IServiceCollection services
     /// <param name="optionsBuilderFunc"></param>
     /// <param name="analyticsOptionsBuilderFunc"></param>
     /// <param name="serverSettingsBuilderFunc"></param>
+    /// <param name="dataAccessSettingsBuilderFunc"></param>
     /// <returns></returns>
     public static IServiceCollection AddTelegramBot(this IServiceCollection services,
                                                     Action<BotSettingsBuilder<TelegramBotSettings>> optionsBuilderFunc,
@@ -88,7 +89,8 @@ public static IServiceCollection AddTelegramBot(this IServiceCollection services
                                            .AddClient(clientBuilder);
         var bot = botBuilder.Build();
         return services.AddSingleton<IBot<TelegramBot>>(bot)
-                       .AddSingleton<IBot>(bot);
+                       .AddSingleton<IBot>(bot)
+                       .AddTelegramLayoutsSupport();
     }
 
     public static IServiceCollection AddTelegramLayoutsSupport(this IServiceCollection services) =>

Samples/AiSample.Common/AiCommandProcessor.cs

@@ -37,16 +37,15 @@ public AiCommandProcessor(ILogger<AiCommandProcessor<TReplyMarkup>> logger,
 
         _bus.OnReceived += async (sender, response) =>
         {
-            if (response != null)
-                await Bot.SendMessageAsync(new SendMessageRequest(response.Uid)
-                    {
-                        Message = response.Message,
-                        ExpectPartialResponse = response.IsPartial,
-                        SequenceNumber = response.SequenceNumber,
-                        IsFinal = response.IsFinal
-                    },
-                    options,
-                    CancellationToken.None);
+            await Bot.SendMessageAsync(new SendMessageRequest(response.Uid)
+                {
+                    Message = response.Message,
+                    ExpectPartialResponse = response.IsPartial,
+                    SequenceNumber = response.SequenceNumber,
+                    IsFinal = response.IsFinal
+                },
+                options,
+                CancellationToken.None);
         };
     }
 

Samples/TelegramCommandChainSample/Program.cs

@@ -3,8 +3,6 @@
 using Botticelli.Framework.Extensions;
 using Botticelli.Framework.Telegram;
 using Botticelli.Framework.Telegram.Extensions;
-using Botticelli.Schedule.Quartz.Extensions;
-using Botticelli.Talks.Extensions;
 using MessagingSample.Common.Commands;
 using MessagingSample.Common.Commands.Processors;
 using NLog.Extensions.Logging;
@@ -17,17 +15,13 @@
 builder.Services
        .AddTelegramBot(builder.Configuration)
        .AddLogging(cfg => cfg.AddNLog())
-       .AddQuartzScheduler(builder.Configuration)
        .AddScoped<StartCommandProcessor<ReplyMarkupBase>>()
        .AddScoped<StopCommandProcessor<ReplyMarkupBase>>()
        .AddScoped<InfoCommandProcessor<ReplyMarkupBase>>()
-       .AddOpenTtsTalks(builder.Configuration)
-       .AddScoped<ILayoutParser, JsonLayoutParser>()
        .AddBotCommand<InfoCommand, InfoCommandProcessor<ReplyMarkupBase>, PassValidator<InfoCommand>>()
        .AddBotCommand<StartCommand, StartCommandProcessor<ReplyMarkupBase>, PassValidator<StartCommand>>()
        .AddBotCommand<StopCommand, StopCommandProcessor<ReplyMarkupBase>, PassValidator<StopCommand>>();
 
-
 // Command processing chain is being initialized here...
 builder.Services.AddBotChainProcessedCommand<GetNameCommand, PassValidator<GetNameCommand>>()
        .AddNext<GetNameCommandProcessor>()

Samples/TelegramCommandChainSample/TelegramCommandChainSample.csproj

@@ -19,8 +19,6 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.*"/>
 		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2"/>
-		<ProjectReference Include="..\..\Botticelli.Scheduler.Quartz\Botticelli.Scheduler.Quartz.csproj" />
-		<ProjectReference Include="..\..\Botticelli.Talks\Botticelli.Talks.csproj" />
 		<ProjectReference Include="..\MessagingSample.Common\MessagingSample.Common.csproj"/>
 	</ItemGroup>
 

Samples/TelegramCommandChainSample/appsettings.json

@@ -6,10 +6,10 @@
     }
   },
   "DataAccess": {
-    "ConnectionString": "Filename=database.db;Password=123;ReadOnly=false"
+    "ConnectionString": "database.db;Password=123"
   },
   "Server": {
-    "ServerUri": "http://113.30.189.83:5042/v1/"
+    "ServerUri": "http://103.252.116.18:5042/v1/"
   },
   "AnalyticsClient": {
     "TargetUrl": "http://localhost:5251/v1/"

Samples/TelegramMessagingSample/Program.cs

@@ -14,8 +14,7 @@
 builder.Services
     .AddTelegramBot(builder.Configuration)
     .AddLogging(cfg => cfg.AddNLog())
-    .AddQuartzScheduler(builder.Configuration)
-    .AddScoped<ILayoutParser, JsonLayoutParser>();
+    .AddQuartzScheduler(builder.Configuration);
 
 builder.Services.AddBotCommand<InfoCommand>()
     .AddProcessor<InfoCommandProcessor<ReplyMarkupBase>>()

Samples/TelegramMessagingSample/TelegramMessagingSample.csproj

@@ -24,7 +24,6 @@
         <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.*"/>
         <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2"/>
         <ProjectReference Include="..\..\Botticelli.Scheduler.Quartz\Botticelli.Scheduler.Quartz.csproj" />
-        <ProjectReference Include="..\..\Botticelli.Talks\Botticelli.Talks.csproj" />
         <ProjectReference Include="..\MessagingSample.Common\MessagingSample.Common.csproj"/>
     </ItemGroup>
 

Samples/TelegramMonadsBasedBot/Program.cs

@@ -8,15 +8,13 @@
 using Botticelli.Framework.Telegram.Layout;
 using NLog.Extensions.Logging;
 using Telegram.Bot.Types.ReplyMarkups;
-using TelegramMonadsBasedBot;
 using TelegramMonadsBasedBot.Commands;
 
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services
     .AddTelegramBot(builder.Configuration)
     .AddLogging(cfg => cfg.AddNLog())
-    .AddScoped<ILayoutParser, JsonLayoutParser>()
     .AddTelegramLayoutsSupport();
 
 builder.Services.AddBotCommand<MathCommand>()

Samples/VkMessagingSample/Program.cs

@@ -1,11 +1,8 @@
 using Botticelli.Framework.Commands.Validators;
-using Botticelli.Framework.Controls.Parsers;
 using Botticelli.Framework.Extensions;
-using Botticelli.Framework.Options;
 using Botticelli.Framework.Vk.Messages;
 using Botticelli.Framework.Vk.Messages.API.Markups;
 using Botticelli.Framework.Vk.Messages.Extensions;
-using Botticelli.Framework.Vk.Messages.Options;
 using Botticelli.Schedule.Quartz.Extensions;
 using Botticelli.Talks.Extensions;
 using MessagingSample.Common.Commands;
@@ -15,15 +12,14 @@
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services
-       .AddVkBot(builder.Configuration)
-       .AddLogging(cfg => cfg.AddNLog())
-       .AddQuartzScheduler(builder.Configuration)
-       .AddScoped<StartCommandProcessor<VkKeyboardMarkup>>()
-       .AddScoped<StopCommandProcessor<VkKeyboardMarkup>>()
-       .AddOpenTtsTalks(builder.Configuration)
-       .AddScoped<ILayoutParser, JsonLayoutParser>()
-       .AddBotCommand<StartCommand, StartCommandProcessor<VkKeyboardMarkup>, PassValidator<StartCommand>>()
-       .AddBotCommand<StopCommand, StopCommandProcessor<VkKeyboardMarkup>, PassValidator<StopCommand>>();
+    .AddVkBot(builder.Configuration)
+    .AddLogging(cfg => cfg.AddNLog())
+    .AddQuartzScheduler(builder.Configuration)
+    .AddScoped<StartCommandProcessor<VkKeyboardMarkup>>()
+    .AddScoped<StopCommandProcessor<VkKeyboardMarkup>>()
+    .AddOpenTtsTalks(builder.Configuration)
+    .AddBotCommand<StartCommand, StartCommandProcessor<VkKeyboardMarkup>, PassValidator<StartCommand>>()
+    .AddBotCommand<StopCommand, StopCommandProcessor<VkKeyboardMarkup>, PassValidator<StopCommand>>();
 
 
 var app = builder.Build();