Add a method to directly get the locale without creating the full object and little cleanup

Author: Lounek09

Cyberia.Cytrusaurus/CytrusWatcher.cs

@@ -161,6 +161,7 @@ await _onlineMonitoredFileRepository.UpsertAsync(new OnlineMonitoredFile
         {
             await OnCytrusErroredAsync(new CytrusErroredEventArgs(e, "An error occurred while sending a GET request to the Cytrus URL, see the logs for more details."));
             Log.Error(e, "An error occurred while sending a GET request to {CytrusUrl}", $"{BaseUrl}/{CytrusFileName}");
+
             return;
         }
 
@@ -176,7 +177,6 @@ await _onlineMonitoredFileRepository.UpsertAsync(new OnlineMonitoredFile
         if (cytrus is null)
         {
             await OnCytrusErroredAsync(new CytrusErroredEventArgs("Failed to deserialize the Cytrus data from the response content, see the logs for more details."));
-            Log.Error("Failed to deserialize the Cytrus data from the response content:\n{CytrusJson}", json);
 
             return;
         }
@@ -247,6 +247,7 @@ await _onlineMonitoredFileRepository.UpsertAsync(new OnlineMonitoredFile
 
         return null;
     }
+
     #region Events
 
     public event ICytrusWatcher.NewCytrusFileDetectedEventHandler? NewCytrusFileDetected;

Cyberia.Database/Repositories/DiscordCachedUserRepository.cs

@@ -58,4 +58,22 @@ public async Task<bool> DeleteAsync(ulong id)
         using var connection = await _connectionFactory.CreateConnectionAsync();
         return await connection.ExecuteAsync(query, new { Id = id }) > 0;
     }
+
+    /// <summary>
+    /// Gets the locale of a user by their ID.
+    /// </summary>
+    /// <param name="id">The ID of the user.</param>
+    /// <returns>The locale of the user if found; otherwise, <see langword="null"/>.</returns>
+    public async Task<string?> GetLocaleById(ulong id)
+    {
+        const string query =
+        $"""
+        SELECT {nameof(DiscordCachedUser.Locale)}
+        FROM {nameof(DiscordCachedUser)}
+        WHERE {nameof(DiscordCachedUser.Id)} = @Id
+        """;
+
+        using var connection = await _connectionFactory.CreateConnectionAsync();
+        return await connection.QueryFirstOrDefaultAsync<string>(query, new { Id = id });
+    }
 }

Cyberia.Salamandra/Extensions/ServiceProviderExtensions.cs

@@ -21,14 +21,14 @@ public static class ServiceProviderExtensions
     /// <returns>The service provider.</returns>
     public static IServiceProvider RegisterSalamandraEvents(this IServiceProvider provider)
     {
-        var cytrusWatcher = provider.GetRequiredService<ICytrusWatcher>();
         var cytrusService = provider.GetRequiredService<ICytrusService>();
+        var cytrusWatcher = provider.GetRequiredService<ICytrusWatcher>();
 
         cytrusWatcher.NewCytrusFileDetected += cytrusService.OnNewCytrusFileDetected;
         cytrusWatcher.CytrusErrored += cytrusService.OnCytrusErrored;
 
-        var langsWatcher = provider.GetRequiredService<ILangsWatcher>();
         var langsService = provider.GetRequiredService<ILangsService>();
+        var langsWatcher = provider.GetRequiredService<ILangsWatcher>();
 
         langsWatcher.CheckLangsFinished += langsService.OnCheckLangsFinished;
 

Cyberia.Salamandra/Services/CultureService.cs

@@ -45,18 +45,18 @@ public CultureService(DiscordCachedUserRepository discordCachedUserRepository, D
 
     public async Task<string?> GetLocaleAsync(DiscordInteraction interaction)
     {
-        var user = await _discordCachedUserRepository.GetAsync(interaction.User.Id);
+        var locale = await _discordCachedUserRepository.GetLocaleById(interaction.User.Id);
 
-        return user?.Locale ?? interaction.Locale ?? interaction.GuildLocale;
+        return locale ?? interaction.Locale ?? interaction.GuildLocale;
     }
 
     public async Task<CultureInfo> GetCultureAsync(DiscordInteraction interaction)
     {
-        var user = await _discordCachedUserRepository.GetAsync(interaction.User.Id);
+        var locale = await _discordCachedUserRepository.GetLocaleById(interaction.User.Id);
 
-        return string.IsNullOrEmpty(user?.Locale)
+        return locale is null
             ? GetInteractionCulture(interaction)
-            : CultureInfo.GetCultureInfo(user.Locale);
+            : CultureInfo.GetCultureInfo(locale);
     }
 
     /// <summary>