+ fix scopes in di

Author: k0dep

Deployf.Botf/BotfProgram.cs

@@ -24,6 +24,7 @@ public static void StartBot(
 
         var botOptions = builder.Configuration.GetSection("bot").Get<BotfOptions>();
         builder.Services.AddBotf(botOptions);
+        builder.Services.AddHttpClient();
 
         onConfigure?.Invoke(builder.Services, builder.Configuration);
 

Deployf.Botf/IBotUserService.cs

@@ -24,6 +24,6 @@ public BotUserService()
         {
             return await _userService.GetUserIdWithRoles(tgUserId);
         }
-        return (null, null); ;
+        return (null, null);
     }
 }

Deployf.Botf/StartupExtensions.cs

@@ -70,15 +70,17 @@ public static IServiceCollection AddBotf(this IServiceCollection services, BotfO
 
         foreach (var type in controllerTypes)
         {
-            services.AddTransient(type);
+            services.AddScoped(type);
         }
 
         services.AddSingleton(routes);
         services.AddSingleton(states);
         services.AddSingleton(handlers);
         services.AddSingleton<PagingService>();
+
         services.AddSingleton<IKeyValueStorage, InMemoryKeyValueStorage>();
         services.AddSingleton<ChainStorage>();
+
         services.AddScoped<BotControllersMiddleware>();
         services.AddScoped<BotControllersChainMiddleware>();
         services.AddScoped<BotControllersFSMMiddleware>();
@@ -88,11 +90,14 @@ public static IServiceCollection AddBotf(this IServiceCollection services, BotfO
         services.AddScoped<BotControllersUnknownMiddleware>();
         services.AddScoped<BotControllersBeforeAllMiddleware>();
         services.AddScoped<BotControllersInvoker>();
+
         services.AddScoped<IBotContextAccessor, BotContextAccessor>();
-        services.AddSingleton<BotUserService>();
+
+        services.AddScoped<BotUserService>();
+
         services.AddTransient<BotfBot>();
         services.AddSingleton(options);
-        services.AddTransient<HttpClient>();
+
         services.AddTransient(ctx => ctx.GetRequiredService<BotfBot>().Client);
         services.AddTransient<MessageSender>();
 

Examples/Deployf.Botf.PingExample/Program.cs

@@ -10,10 +10,4 @@ public async Task Unknown()
         Reply();
         await Send(Context.GetSafeTextPayload()!);
     }
-}
-
-record State1;
-
-class State1Controller : BotControllerState<State1>
-{
 }

Examples/Deployf.Botf.ReminderBot/Program.cs

@@ -3,8 +3,6 @@
 using Hangfire.Storage.SQLite;
 using SQLite;
 
-BackgroundJobServer? hangfireServer = null;
-
 BotfProgram.StartBot(args, onConfigure: (svc, cfg) =>
 {
     var db = new SQLiteConnection("db.sqlite");
@@ -30,8 +28,6 @@
     app.UseHangfireDashboard();
 });
 
-hangfireServer!.Dispose();
-
 class HangfireActivator : JobActivator
 {
     readonly IServiceProvider _serviceProvider;