From 1c540476d34cc1cdb88c1d418bcf7cd8140a3270 Mon Sep 17 00:00:00 2001
From: Kwoth <master.kwoth@gmail.com>
Date: Sun, 12 May 2024 19:00:16 +0000
Subject: [PATCH] dev: Fixed a build warning and small cleanup

---
 .../Administration/GreetBye/GreetService.cs   | 14 +--------
 .../Modules/Searches/SearchesService.cs       | 30 +++++++------------
 .../Impl/ReplacementRegistrator.default.cs    |  2 +-
 3 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs b/src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs
index 383bb0446..ffde60a84 100644
--- a/src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs
+++ b/src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs
@@ -202,12 +202,6 @@ public class GreetService : INService, IReadyExecutor
         if (!users.Any())
             return;
 
-        // var rep = new ReplacementBuilder().WithChannel(channel)
-        // .WithClient(_client)
-        // .WithServer(_client, (SocketGuild)channel.Guild)
-        // .WithManyUsers(users)
-        // .Build();
-
         var repCtx = new ReplacementContext(client: _client,
             guild: channel.Guild,
             channel: channel,
@@ -244,17 +238,11 @@ public class GreetService : INService, IReadyExecutor
         if (users.Count == 0)
             return;
 
-        // var rep = new ReplacementBuilder()
-        // .WithChannel(channel)
-        // .WithClient(_client)
-        // .WithServer(_client, (SocketGuild)channel.Guild)
-        // .WithManyUsers(users)
-        // .Build();
-
         var repCtx = new ReplacementContext(client: _client,
             guild: channel.Guild,
             channel: channel,
             users: users.ToArray());
+        
         var text = SmartText.CreateFrom(conf.ChannelGreetMessageText);
         text = await _repSvc.ReplaceAsync(text, repCtx);
         try
diff --git a/src/NadekoBot/Modules/Searches/SearchesService.cs b/src/NadekoBot/Modules/Searches/SearchesService.cs
index 984e5f7f9..f02a1bdd6 100644
--- a/src/NadekoBot/Modules/Searches/SearchesService.cs
+++ b/src/NadekoBot/Modules/Searches/SearchesService.cs
@@ -229,25 +229,15 @@ public class SearchesService : INService
     {
         var subpath = tag.ToString().ToLowerInvariant();
 
-        int max;
-        switch (tag)
+        var max = tag switch
         {
-            case ImageTag.Food:
-                max = 773;
-                break;
-            case ImageTag.Dogs:
-                max = 750;
-                break;
-            case ImageTag.Cats:
-                max = 773;
-                break;
-            case ImageTag.Birds:
-                max = 578;
-                break;
-            default:
-                max = 100;
-                break;
-        }
+            ImageTag.Food => 773,
+            ImageTag.Dogs => 750,
+            ImageTag.Cats => 773,
+            ImageTag.Birds => 578,
+            _ => 100,
+        };
+
 
         return $"https://nadeko-pictures.nyc3.digitaloceanspaces.com/{subpath}/"
                + _rng.Next(1, max).ToString("000")
@@ -427,7 +417,7 @@ public class SearchesService : INService
             async () =>
             {
                 using var http = _httpFactory.CreateClient();
-                
+
                 // https://api.steampowered.com/ISteamApps/GetAppList/v2/
                 var gamesStr = await http.GetStringAsync("https://api.steampowered.com/ISteamApps/GetAppList/v2/");
                 var apps = JsonConvert
@@ -449,7 +439,7 @@ public class SearchesService : INService
 
         if (gamesMap is null)
             return -1;
-        
+
         query = query.Trim();
 
         var keyList = gamesMap.Keys.ToList();
diff --git a/src/NadekoBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs b/src/NadekoBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs
index 52cd00ea9..f7e42ec12 100644
--- a/src/NadekoBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs
+++ b/src/NadekoBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs
@@ -40,7 +40,7 @@ public sealed partial class ReplacementPatternStore
         Register("%server.id%", static (IGuild g) => g.Id.ToString());
         Register("%server.name%", static (IGuild g) => g.Name);
         Register("%server.icon%", static (IGuild g) => g.IconUrl);
-        Register("%server.members%", static async (IGuild g) => (g as SocketGuild)?.MemberCount.ToString() ?? "?");
+        Register("%server.members%", static (IGuild g) => (g as SocketGuild)?.MemberCount.ToString() ?? "?");
         Register("%server.boosters%", static (IGuild g) => g.PremiumSubscriptionCount.ToString());
         Register("%server.boost_level%", static (IGuild g) => ((int)g.PremiumTier).ToString());
     }