change: improved .xplb -c, it will now correctly work only on users who are still in the server, isntead of only top 1k

fix: Fixed medusa error on bot startup

src/NadekoBot/Db/Extensions/UserXpExtensions.cs

@@ -26,17 +26,6 @@ public static class UserXpExtensions
         return usr;
     }
 
-    public static async Task<IReadOnlyCollection<UserXpStats>> GetUsersFor(
-        this DbSet<UserXpStats> xps,
-        ulong guildId,
-        int page)
-        => await xps.ToLinqToDBTable()
-                    .Where(x => x.GuildId == guildId)
-                    .OrderByDescending(x => x.Xp + x.AwardedXp)
-                    .Skip(page * 9)
-                    .Take(9)
-                    .ToArrayAsyncLinqToDB();
-
     public static async Task<List<UserXpStats>> GetTopUserXps(this DbSet<UserXpStats> xps, ulong guildId, int count)
         => await xps.ToLinqToDBTable()
                     .Where(x => x.GuildId == guildId)

src/NadekoBot/Modules/Xp/Xp.cs

@@ -183,27 +183,26 @@ public partial class Xp : NadekoModule<XpService>
 
         await ctx.Channel.TriggerTypingAsync();
 
+
+        async Task<IReadOnlyCollection<UserXpStats>> GetPageItems(int curPage)
+        {
             var socketGuild = (SocketGuild)ctx.Guild;
-        var allCleanUsers = new List<UserXpStats>();
             if (opts.Clean)
             {
                 await ctx.Channel.TriggerTypingAsync();
                 await _tracker.EnsureUsersDownloadedAsync(ctx.Guild);
 
-            allCleanUsers = (await _service.GetTopUserXps(ctx.Guild.Id, 1000))
+                return await _service.GetTopUserXps(ctx.Guild.Id,
-                            .Where(user => socketGuild.GetUser(user.UserId) is not null)
+                    socketGuild.Users.Select(x => x.Id).ToList(),
-                            .ToList();
+                    curPage);
             }
 
-        var res = opts.Clean
+            return await _service.GetUserXps(ctx.Guild.Id, curPage);
-            ? Response()
+        }
-              .Paginated()
-              .Items(allCleanUsers)
-            : Response()
-              .Paginated()
-              .PageItems((curPage) => _service.GetUserXps(ctx.Guild.Id, curPage));
 
-        await res
+        await Response()
+              .Paginated()
+              .PageItems(GetPageItems)
               .PageSize(9)
               .CurrentPage(page)
               .Page((users, curPage) =>

src/NadekoBot/Modules/Xp/XpService.cs

@@ -12,6 +12,7 @@ using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using System.Threading.Channels;
 using LinqToDB.EntityFrameworkCore;
+using LinqToDB.Tools;
 using NadekoBot.Modules.Patronage;
 using Color = SixLabors.ImageSharp.Color;
 using Exception = System.Exception;
@@ -566,13 +567,24 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
     public async Task<IReadOnlyCollection<UserXpStats>> GetUserXps(ulong guildId, int page)
     {
         await using var uow = _db.GetDbContext();
-        return await uow.Set<UserXpStats>().GetUsersFor(guildId, page);
+        return await uow
+                     .UserXpStats
+                     .Where(x => x.GuildId == guildId)
+                     .OrderByDescending(x => x.Xp + x.AwardedXp)
+                     .Skip(page * 9)
+                     .Take(9)
+                     .ToArrayAsyncLinqToDB();
     }
 
-    public async Task<IReadOnlyCollection<UserXpStats>> GetTopUserXps(ulong guildId, int count)
+    public async Task<IReadOnlyCollection<UserXpStats>> GetTopUserXps(ulong guildId, List<ulong> users, int curPage)
     {
         await using var uow = _db.GetDbContext();
-        return await uow.Set<UserXpStats>().GetTopUserXps(guildId, count);
+        return await uow.Set<UserXpStats>()
+                        .Where(x => x.GuildId == guildId && x.UserId.In(users))
+                        .OrderByDescending(x => x.Xp + x.AwardedXp)
+                        .Skip(curPage * 9)
+                        .Take(9)
+                        .ToArrayAsyncLinqToDB();
     }
 
     public Task<IReadOnlyCollection<DiscordUser>> GetUserXps(int page, int perPage = 9)

src/NadekoBot/data/medusae/medusa.yml

@@ -1,5 +1,4 @@
 # DO NOT CHANGE
 version: 1
 # List of medusae automatically loaded at startup
-loaded:
+loaded: []
-  - ngrpc