Feature/interactions

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "src/Mmcc.Bot.Polychat/Protos"]
 	path = src/Mmcc.Bot.Polychat/Protos
 	url = https://github.com/ModdedMinecraftClub/protos
+[submodule "src/porbeagle"]
+	path = src/porbeagle
+	url = https://github.com/TraceLD/porbeagle

src/Mmcc.Bot.Common.Extensions/Database/Entities/ModerationActionExtensions.cs

@@ -29,6 +29,22 @@ public static IEnumerable<EmbedField> GetEmbedFields(this IEnumerable<Moderation
             return new[] {warningsField, mutesField, bansField};
         }
 
+        public static string GetUserDataDisplayString(this ModerationAction ma)
+            => ma switch
+            {
+                { UserDiscordId: { } dId, UserIgn: { } ign } =>
+                    $$"""
+                    Discord user: <@{{dId}}>
+                    IGN: `{{ign}}`
+                    """,
+
+                { UserDiscordId: { } dId } => $"Discord user: <@{dId}>",
+
+                { UserIgn: { } ign } => $"IGN: `{ign}`",
+
+                _ => "No Discord ID/IGN data."
+            };
+
         private static EmbedField GetEmbedFieldForActionsOfType(this IEnumerable<ModerationAction> moderationActions, ModerationActionType type, bool showAssociatedDiscord, bool showAssociatedIgn)
         {
             var list = moderationActions.Where(ma => ma.ModerationActionType == type).ToList();

src/Mmcc.Bot.Common.Extensions/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs

@@ -1,4 +1,5 @@
-using FluentValidation;
+using System;
+using FluentValidation;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -33,6 +34,11 @@ IConfigurationSection configurationSection
             where TValidator : AbstractValidator<TConfig>, new()
         {
             var config = configurationSection.Get<TConfig>();
+            if (config is null)
+            {
+                throw new Exception($"Could not match a configuration section to {typeof(TConfig)}");
+            }
+
             var validator = new TValidator();
 
             validator.ValidateAndThrow(config);

src/Mmcc.Bot.Common.Extensions/Mmcc.Bot.Common.Extensions.csproj

@@ -1,22 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
-        <LangVersion>10</LangVersion>
+        <LangVersion>11</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Mmcc.Bot.Caching\Mmcc.Bot.Caching.csproj" />
       <ProjectReference Include="..\Mmcc.Bot.Common\Mmcc.Bot.Common.csproj" />
       <ProjectReference Include="..\Mmcc.Bot.Database\Mmcc.Bot.Database.csproj" />
       <ProjectReference Include="..\Mmcc.Bot.Mojang\Mmcc.Bot.Mojang.csproj" />
-      <ProjectReference Include="..\Mmcc.Bot.RemoraAbstractions\Mmcc.Bot.RemoraAbstractions.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="FluentValidation" Version="10.3.3" />
-      <PackageReference Include="Remora.Discord" Version="2022.3.0" />
+      <PackageReference Include="FluentValidation" Version="11.2.2" />
+      <PackageReference Include="Remora.Discord" Version="2022.48.0" />
     </ItemGroup>
 
 </Project>

src/Mmcc.Bot.Common.Extensions/Remora/Discord/API/Abstractions/Rest/DiscordRestGuildApiExtensions.cs

@@ -33,7 +33,7 @@ public static async Task<Result<IChannel>> FindGuildChannelByName(this IDiscordR
             var guildChannels = getGuildChannelsResult.Entity;
             var channel = guildChannels
                 .Where(c => c.Name.HasValue)
-                .FirstOrDefault(c => c.Name.Value.Equals(channelName));
+                .FirstOrDefault(c => c.Name.Value!.Equals(channelName));
             if (channel is null)
             {
                 return new NotFoundError(

src/Mmcc.Bot.Common.Extensions/System/KeyValuePairDiscordExtensions.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.Linq;
+using Remora.Discord.API.Abstractions.Objects;
+using Remora.Discord.API.Objects;
+
+namespace Mmcc.Bot.Common.Extensions.System;
+
+public static class KeyValuePairDiscordExtensions
+{
+    public static IEnumerable<IEmbedField> ToEmbedFields(this IEnumerable<KeyValuePair<string, string>> kvEnumerable)
+        => kvEnumerable.Select(x => new EmbedField(x.Key, x.Value, false));
+
+    public static EmbedField ToEmbedField(this KeyValuePair<string, string> kv)
+        => new(kv.Key, kv.Value, false);
+}