fixed build errors

src/Nadeko.Bot.Common/Nadeko.Bot.Common.csproj

@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Discord.Net" Version="3.202.0" />
+        <PackageReference Include="Discord.Net" Version="3.203.0" />
     </ItemGroup>
 
     <ItemGroup>

src/Nadeko.Bot.Db/Extensions/DiscordUserExtensions.cs

@@ -8,54 +8,6 @@ namespace NadekoBot.Db;
 
 public static class DiscordUserExtensions
 {
-    /// <summary>
-    /// Adds the specified <paramref name="users"/> to the database. If a database user with placeholder name
-    /// and discriminator is present in <paramref name="users"/>, their name and discriminator get updated accordingly.
-    /// </summary>
-    /// <param name="ctx">This database context.</param>
-    /// <param name="users">The users to add or update in the database.</param>
-    /// <returns>A tuple with the amount of new users added and old users updated.</returns>
-    public static async Task<(long UsersAdded, long UsersUpdated)> RefreshUsersAsync(this NadekoContext ctx, List<IUser> users)
-    {
-        var presentDbUsers = await ctx.DiscordUser
-            .Select(x => new { x.UserId, x.Username, x.Discriminator })
-            .Where(x => users.Select(y => y.Id).Contains(x.UserId))
-            .ToArrayAsyncEF();
-
-        var usersToAdd = users
-            .Where(x => !presentDbUsers.Select(x => x.UserId).Contains(x.Id))
-            .Select(x => new DiscordUser()
-            {
-                UserId = x.Id,
-                AvatarId = x.AvatarId,
-                Username = x.Username,
-                Discriminator = x.Discriminator
-            });
-
-        var added = (await ctx.BulkCopyAsync(usersToAdd)).RowsCopied;
-        var toUpdateUserIds = presentDbUsers
-            .Where(x => x.Username == "Unknown" && x.Discriminator == "????")
-            .Select(x => x.UserId)
-            .ToArray();
-
-        foreach (var user in users.Where(x => toUpdateUserIds.Contains(x.Id)))
-        {
-            await ctx.DiscordUser
-                .Where(x => x.UserId == user.Id)
-                .UpdateAsync(x => new DiscordUser()
-                {
-                    Username = user.Username,
-                    Discriminator = user.Discriminator,
-
-                    // .award tends to set AvatarId and DateAdded to NULL, so account for that.
-                    AvatarId = user.AvatarId,
-                    DateAdded = x.DateAdded ?? DateTime.UtcNow
-                });
-        }
-
-        return (added, toUpdateUserIds.Length);
-    }
-
     public static Task<DiscordUser> GetByUserIdAsync(
         this IQueryable<DiscordUser> set,
         ulong userId)

src/Nadeko.Bot.Modules.Administration/Nadeko.Bot.Modules.Administration.csproj

@@ -7,7 +7,7 @@
     </PropertyGroup>
     
     <ItemGroup>
-        <PackageReference Include="Discord.Net" Version="3.202.0" />
+        <PackageReference Include="Discord.Net" Version="3.203.0" />
         <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
     </ItemGroup>
     

src/Nadeko.Bot.Modules.Administration/Self/SelfCommands.cs

@@ -60,7 +60,7 @@ public partial class Administration
                 .Cast<IUser>()
                 .ToList();
 
-            var (added, updated) = await dbContext.RefreshUsersAsync(users);
+            var (added, updated) = await _service.RefreshUsersAsync(users);
 
             await message.ModifyAsync(x =>
                 x.Embed = _eb.Create()

src/Nadeko.Bot.Modules.Administration/Self/SelfService.cs

@@ -3,6 +3,9 @@ using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
 using Nadeko.Bot.Db.Models;
 using System.Collections.Immutable;
+using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
+using NadekoBot.Db.Models;
 
 namespace NadekoBot.Modules.Administration.Services;
 
@@ -396,4 +399,54 @@ public sealed class SelfService : IExecNoCommand, IReadyExecutor, INService
         public string Link { get; init; }
         public ActivityType Type { get; init; }
     }
+    
+    
+    /// <summary>
+    /// Adds the specified <paramref name="users"/> to the database. If a database user with placeholder name
+    /// and discriminator is present in <paramref name="users"/>, their name and discriminator get updated accordingly.
+    /// </summary>
+    /// <param name="ctx">This database context.</param>
+    /// <param name="users">The users to add or update in the database.</param>
+    /// <returns>A tuple with the amount of new users added and old users updated.</returns>
+    public async Task<(long UsersAdded, long UsersUpdated)> RefreshUsersAsync(List<IUser> users)
+    {
+        await using var ctx = _db.GetDbContext(); 
+        var presentDbUsers = await ctx.GetTable<DiscordUser>()
+            .Select(x => new { x.UserId, x.Username, x.Discriminator })
+            .Where(x => users.Select(y => y.Id).Contains(x.UserId))
+            .ToArrayAsyncEF();
+
+        var usersToAdd = users
+            .Where(x => !presentDbUsers.Select(x => x.UserId).Contains(x.Id))
+            .Select(x => new DiscordUser()
+            {
+                UserId = x.Id,
+                AvatarId = x.AvatarId,
+                Username = x.Username,
+                Discriminator = x.Discriminator
+            });
+
+        var added = (await ctx.BulkCopyAsync(usersToAdd)).RowsCopied;
+        var toUpdateUserIds = presentDbUsers
+            .Where(x => x.Username == "Unknown" && x.Discriminator == "????")
+            .Select(x => x.UserId)
+            .ToArray();
+
+        foreach (var user in users.Where(x => toUpdateUserIds.Contains(x.Id)))
+        {
+            await ctx.GetTable<DiscordUser>()
+                .Where(x => x.UserId == user.Id)
+                .UpdateAsync(x => new DiscordUser()
+                {
+                    Username = user.Username,
+                    Discriminator = user.Discriminator,
+
+                    // .award tends to set AvatarId and DateAdded to NULL, so account for that.
+                    AvatarId = user.AvatarId,
+                    DateAdded = x.DateAdded ?? DateTime.UtcNow
+                });
+        }
+
+        return (added, toUpdateUserIds.Length);
+    }
 }

src/Nadeko.Bot.Modules.Expresssions/Nadeko.Bot.Modules.Expresssions.csproj

@@ -14,7 +14,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Discord.Net" Version="3.202.0" />
+        <PackageReference Include="Discord.Net" Version="3.203.0" />
         <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
     </ItemGroup>
 

src/Nadeko.Bot.Modules.Permisssions/Nadeko.Bot.Modules.Permisssions.csproj

@@ -14,7 +14,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Discord.Net.Core" Version="3.202.0" />
+        <PackageReference Include="Discord.Net.Core" Version="3.203.0" />
     </ItemGroup>
 
 </Project>

src/Nadeko.Medusa/Nadeko.Medusa.csproj

@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Discord.Net.Core" Version="3.202.0" />
+      <PackageReference Include="Discord.Net.Core" Version="3.203.0" />
       <PackageReference Include="Serilog" Version="2.12.0" />
       <PackageReference Include="YamlDotNet" Version="13.0.2" />
     </ItemGroup>