From d4c8a15f502f13ae1f2597e8ca4a2f65342caec7 Mon Sep 17 00:00:00 2001
From: Stanley Dimant <root.darkarchon@outlook.com>
Date: Fri, 12 Aug 2022 00:26:27 +0200
Subject: [PATCH] update status via task, update nuget packages

---
 .../Discord/DiscordBot.cs                     | 21 ++++++++++++-------
 .../MareSynchronosServer.csproj               | 12 +++++------
 .../MareSynchronosServer/Startup.cs           |  3 ---
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/MareSynchronosServer/MareSynchronosServer/Discord/DiscordBot.cs b/MareSynchronosServer/MareSynchronosServer/Discord/DiscordBot.cs
index 2672b12..a7db726 100644
--- a/MareSynchronosServer/MareSynchronosServer/Discord/DiscordBot.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Discord/DiscordBot.cs
@@ -30,8 +30,8 @@ namespace MareSynchronosServer.Discord
         private string authToken = string.Empty;
         DiscordSocketClient discordClient;
         ConcurrentDictionary<ulong, string> DiscordLodestoneMapping = new();
-        private Timer _timer;
         private CancellationTokenSource verificationTaskCts;
+        private CancellationTokenSource updateStatusCts;
         private readonly string[] LodestoneServers = new[] { "eu", "na", "jp", "fr", "de" };
         private readonly ConcurrentQueue<SocketSlashCommand> verificationQueue = new();
 
@@ -374,9 +374,8 @@ namespace MareSynchronosServer.Discord
                 discordClient.SlashCommandExecuted += DiscordClient_SlashCommandExecuted;
                 discordClient.ModalSubmitted += DiscordClient_ModalSubmitted;
 
-                _timer = new Timer(UpdateStatus, null, TimeSpan.Zero, TimeSpan.FromSeconds(15));
-
                 _ = ProcessQueueWork();
+                _ = UpdateStatusAsync();
             }
         }
 
@@ -404,14 +403,20 @@ namespace MareSynchronosServer.Discord
             }
         }
 
-        private void UpdateStatus(object state)
+        private async Task UpdateStatusAsync()
         {
-            using var scope = services.CreateScope();
-            using var db = scope.ServiceProvider.GetService<MareDbContext>();
+            updateStatusCts = new();
+            while (!updateStatusCts.IsCancellationRequested)
+            {
+                using var scope = services.CreateScope();
+                using var db = scope.ServiceProvider.GetService<MareDbContext>();
 
-            var users = db.Users.Count(c => c.CharacterIdentification != null);
+                var users = db.Users.Count(c => c.CharacterIdentification != null);
 
-            discordClient.SetActivityAsync(new Game("Mare for " + users + " Users"));
+                await discordClient.SetActivityAsync(new Game("Mare for " + users + " Users"));
+
+                await Task.Delay(TimeSpan.FromSeconds(15));
+            }
         }
 
         public async Task StopAsync(CancellationToken cancellationToken)
diff --git a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj
index 9e45326..1b774cf 100644
--- a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj
+++ b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj
@@ -11,18 +11,18 @@
     <PackageReference Include="Bazinga.AspNetCore.Authentication.Basic" Version="2.0.1" />
     <PackageReference Include="Discord.Net" Version="3.7.2" />
     <PackageReference Include="EFCore.NamingConventions" Version="6.0.0" />
-    <PackageReference Include="Karambolo.Extensions.Logging.File" Version="3.3.0" />
+    <PackageReference Include="Karambolo.Extensions.Logging.File" Version="3.3.1" />
     <PackageReference Include="lz4net" Version="1.0.15.93" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.6">
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.5" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.6" />
     <PackageReference Include="prometheus-net" Version="6.0.0" />
     <PackageReference Include="prometheus-net.AspNetCore" Version="6.0.0" />
   </ItemGroup>
diff --git a/MareSynchronosServer/MareSynchronosServer/Startup.cs b/MareSynchronosServer/MareSynchronosServer/Startup.cs
index 1447493..fcf2765 100644
--- a/MareSynchronosServer/MareSynchronosServer/Startup.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Startup.cs
@@ -38,8 +38,6 @@ namespace MareSynchronosServer
         {
             services.AddHttpContextAccessor();
 
-            services.AddMemoryCache();
-
             services.Configure<IpRateLimitOptions>(Configuration.GetSection("IpRateLimiting"));
             services.Configure<IpRateLimitPolicies>(Configuration.GetSection("IpRateLimitPolicies"));
 
@@ -61,7 +59,6 @@ namespace MareSynchronosServer
             services.AddHostedService(provider => provider.GetService<SystemInfoService>());
             services.AddHostedService<DiscordBot>();
 
-            services.AddDatabaseDeveloperPageExceptionFilter();
             services.AddAuthentication(options =>
                 {
                     options.DefaultScheme = SecretKeyAuthenticationHandler.AuthScheme;