Merge branch 'v4' into v5

src/Nadeko.Bot.Modules.Administration/ServerLog/ServerLogCommandService.cs

@@ -97,7 +97,8 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
 
         if (!GuildLogSettings.TryGetValue(gu.Guild.Id, out var logSetting)
             || before is null
-            || after is null)
+            || after is null
+            || logSetting.LogIgnores.Any(ilc => ilc.LogItemId == gu.Id && ilc.ItemType == IgnoredItemType.User))
             return;
 
         ITextChannel? logChannel;
@@ -349,7 +350,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
 
                 var g = after.Guild;
 
-                if (!GuildLogSettings.TryGetValue(g.Id, out var logSetting) || logSetting.UserUpdatedId is null)
+                if (!GuildLogSettings.TryGetValue(g.Id, out var logSetting) || logSetting.UserUpdatedId is null || logSetting.LogIgnores.Any(ilc => ilc.LogItemId == after.Id && ilc.ItemType == IgnoredItemType.User))
                     return;
 
                 ITextChannel? logChannel;
@@ -1355,4 +1356,4 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
         GuildLogSettings.AddOrUpdate(guildId, newLogSetting, (_, _) => newLogSetting);
         uow.SaveChanges();
     }
-}
+}

src/Nadeko.Bot.Modules.Gambling/Gambling/Waifus/WaifuClaimCommands.cs

@@ -284,11 +284,10 @@ public partial class Gambling
 
             var fansList = await _service.GetFansNames(wi.WaifuId);
             var fansStr = fansList
-                            .Shuffle()
-                            .Take(30)
-                            .Select((x) => claimsNames.Contains(x) ? $"{x} 💞" : x)
-                            .Join('\n');
-
+                .Shuffle()
+                .Take(30)
+                .Select((x) => claimsNames.Contains(x) ? $"{x} 💞" : x)
+                .Join('\n');
 
             if (string.IsNullOrWhiteSpace(fansStr))
                 fansStr = "-";

src/NadekoBot/data/aliases.yml

@@ -1360,7 +1360,7 @@ medusainfo:
   - meinfo
 medusasearch:
   - medusasearch
-  - mesearch
+  - mesearchW
 # Bank stuff
 bankdeposit:
   - deposit