Fixed xpcurrew breaking xp gain if user gains 0 xp from being in a voice channel while voice xp is enabled

src/EllieBot/Modules/Searches/OsuCommands.cs

@@ -7,7 +7,7 @@ namespace EllieBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class OsuCommands : EllieModule
+    public partial class OsuCommands : EllieModule<OsuService>
     {
         private readonly IBotCredentials _creds;
         private readonly IHttpClientFactory _httpFactory;
@@ -24,9 +24,6 @@ public partial class Searches
             if (string.IsNullOrWhiteSpace(user))
                 return;
 
-            using var http = _httpFactory.CreateClient();
-            var modeNumber = string.IsNullOrWhiteSpace(mode) ? 0 : ResolveGameMode(mode);
-
             try
             {
                 if (string.IsNullOrWhiteSpace(_creds.OsuApiKey))
@@ -35,37 +32,32 @@ public partial class Searches
                     return;
                 }
 
-                var smode = ResolveGameMode(modeNumber);
+                var obj = await _service.GetOsuData(user, mode);
-                var userReq = $"https://osu.ppy.sh/api/get_user?k={_creds.OsuApiKey}&u={user}&m={modeNumber}";
+                if (obj is null)
-                var userResString = await http.GetStringAsync(userReq);
-                var objs = JsonConvert.DeserializeObject<List<OsuUserData>>(userResString);
-
-                if (objs.Count == 0)
                 {
                     await Response().Error(strs.osu_user_not_found).SendAsync();
                     return;
                 }
 
-                var obj = objs[0];
                 var userId = obj.UserId;
+                var smode = ResolveGameMode(obj.ModeNumber);
 
-                await Response().Embed(_sender.CreateEmbed()
+
-                                                .WithOkColor()
+                await Response()
-                                                .WithTitle($"osu! {smode} profile for {user}")
+                      .Embed(_sender.CreateEmbed()
-                                                .WithThumbnailUrl($"https://a.ppy.sh/{userId}")
+                                    .WithOkColor()
-                                                .WithDescription($"https://osu.ppy.sh/u/{userId}")
+                                    .WithTitle($"osu! {smode} profile for {user}")
-                                                .AddField("Official Rank", $"#{obj.PpRank}", true)
+                                    .WithThumbnailUrl($"https://a.ppy.sh/{userId}")
-                                                .AddField("Country Rank",
+                                    .WithDescription($"https://osu.ppy.sh/u/{userId}")
-                                                    $"#{obj.PpCountryRank} :flag_{obj.Country.ToLower()}:",
+                                    .AddField("Official Rank", $"#{obj.PpRank}", true)
-                                                    true)
+                                    .AddField("Country Rank",
-                                                .AddField("Total PP", Math.Round(obj.PpRaw, 2), true)
+                                        $"#{obj.PpCountryRank} :flag_{obj.Country.ToLower()}:",
-                                                .AddField("Accuracy", Math.Round(obj.Accuracy, 2) + "%", true)
+                                        true)
-                                                .AddField("Playcount", obj.Playcount, true)
+                                    .AddField("Total PP", Math.Round(obj.PpRaw, 2), true)
-                                                .AddField("Level", Math.Round(obj.Level), true)).SendAsync();
+                                    .AddField("Accuracy", Math.Round(obj.Accuracy, 2) + "%", true)
-            }
+                                    .AddField("Playcount", obj.Playcount, true)
-            catch (ArgumentOutOfRangeException)
+                                    .AddField("Level", Math.Round(obj.Level), true))
-            {
+                      .SendAsync();
-                await Response().Error(strs.osu_user_not_found).SendAsync();
             }
             catch (Exception ex)
             {
@@ -96,18 +88,18 @@ public partial class Searches
             var userStats = statsResponse.Stats;
 
             var embed = _sender.CreateEmbed()
-                           .WithOkColor()
+                               .WithOkColor()
-                           .WithTitle($"osu!Gatari {modeStr} profile for {user}")
+                               .WithTitle($"osu!Gatari {modeStr} profile for {user}")
-                           .WithThumbnailUrl($"https://a.gatari.pw/{userStats.Id}")
+                               .WithThumbnailUrl($"https://a.gatari.pw/{userStats.Id}")
-                           .WithDescription($"https://osu.gatari.pw/u/{userStats.Id}")
+                               .WithDescription($"https://osu.gatari.pw/u/{userStats.Id}")
-                           .AddField("Official Rank", $"#{userStats.Rank}", true)
+                               .AddField("Official Rank", $"#{userStats.Rank}", true)
-                           .AddField("Country Rank",
+                               .AddField("Country Rank",
-                               $"#{userStats.CountryRank} :flag_{userData.Country.ToLower()}:",
+                                   $"#{userStats.CountryRank} :flag_{userData.Country.ToLower()}:",
-                               true)
+                                   true)
-                           .AddField("Total PP", userStats.Pp, true)
+                               .AddField("Total PP", userStats.Pp, true)
-                           .AddField("Accuracy", $"{Math.Round(userStats.AvgAccuracy, 2)}%", true)
+                               .AddField("Accuracy", $"{Math.Round(userStats.AvgAccuracy, 2)}%", true)
-                           .AddField("Playcount", userStats.Playcount, true)
+                               .AddField("Playcount", userStats.Playcount, true)
-                           .AddField("Level", userStats.Level, true);
+                               .AddField("Level", userStats.Level, true);
 
             await Response().Embed(embed).SendAsync();
         }

src/EllieBot/Modules/Searches/OsuService.cs

@@ -0,0 +1,60 @@
+#nullable disable
+using EllieBot.Modules.Searches.Common;
+using Newtonsoft.Json;
+
+namespace EllieBot.Modules.Searches;
+
+public sealed class OsuService : IEService
+{
+    private readonly IHttpClientFactory _httpFactory;
+    private readonly IBotCredentials _creds;
+
+    public OsuService(IHttpClientFactory httpFactory, IBotCredentials creds)
+    {
+        _httpFactory = httpFactory;
+        _creds = creds;
+    }
+
+    public async Task<OsuUserData> GetOsuData(string username, string mode)
+    {
+        using var http = _httpFactory.CreateClient();
+
+        var modeNumber = string.IsNullOrWhiteSpace(mode) ? 0 : ResolveGameMode(mode);
+        var userReq = $"https://osu.ppy.sh/api/get_user?k={_creds.OsuApiKey}&u={username}&m={modeNumber}";
+        var userResString = await http.GetStringAsync(userReq);
+
+        if (string.IsNullOrWhiteSpace(userResString))
+            return null;
+        var objs = JsonConvert.DeserializeObject<List<OsuUserData>>(userResString);
+
+        if (objs.Count == 0)
+        {
+            return null;
+        }
+
+        var obj = objs[0];
+
+        obj.ModeNumber = modeNumber;
+        return obj;
+    }
+
+    private static int ResolveGameMode(string mode)
+    {
+        switch (mode.ToUpperInvariant())
+        {
+            case "STD":
+            case "STANDARD":
+                return 0;
+            case "TAIKO":
+                return 1;
+            case "CTB":
+            case "CATCHTHEBEAT":
+                return 2;
+            case "MANIA":
+            case "OSU!MANIA":
+                return 3;
+            default:
+                return 0;
+        }
+    }
+}

src/EllieBot/Modules/Searches/_common/OsuUserData.cs

@@ -67,4 +67,7 @@ public class OsuUserData
 
     [JsonProperty("pp_country_rank")]
     public string PpCountryRank { get; set; }
+
+    [JsonIgnore]
+    public int ModeNumber { get; set; }
 }

src/EllieBot/Modules/Xp/XpService.cs

@@ -178,8 +178,9 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
                 {
                     foreach (var user in globalToAdd)
                     {
-                        var amount = user.Value.XpAmount * conf.CurrencyPerXp;
+                        var amount = (long)(user.Value.XpAmount * conf.CurrencyPerXp);
-                        await _cs.AddAsync(user.Key, (long)(amount), null);
+                        if (amount > 0)
+                            await _cs.AddAsync(user.Key, amount, null);
                     }
                 }
 
@@ -422,8 +423,8 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
 
             await _sender.Response(chan)
                          .Confirm(_strings.GetText(strs.level_up_global(user.Mention,
-                                     Format.Bold(newLevel.ToString())),
+                                 Format.Bold(newLevel.ToString())),
-                                 guild.Id))
+                             guild.Id))
                          .SendAsync();
         }
     }
@@ -770,8 +771,9 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
     {
         var channelId = channel.Id;
 
-        if (_excludedChannels.TryGetValue(user.Guild.Id, out var chans) && (chans.Contains(channelId)
+        if (_excludedChannels.TryGetValue(user.Guild.Id, out var chans) 
-            || (channel is SocketThreadChannel tc && chans.Contains(tc.ParentChannel.Id))))
+            && (chans.Contains(channelId)
+                || (channel is SocketThreadChannel tc && chans.Contains(tc.ParentChannel.Id))))
             return false;
 
         if (_excludedServers.Contains(user.Guild.Id))