Update packages

KubaZ2 · Oct 10, 2024 · da1d83c · da1d83c
1 parent 1ff8bcb
commit da1d83c
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 25 deletions.
diff --git a/Backend/Sandbox/Asm/Asm.csproj b/Backend/Sandbox/Asm/Asm.csproj
@@ -6,7 +6,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="8.0.400" />
+    <PackageReference Include="FSharp.Core" Version="8.0.401" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/Backend/Sandbox/Runner/Runner.csproj b/Backend/Sandbox/Runner/Runner.csproj
@@ -6,7 +6,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="8.0.400" />
+    <PackageReference Include="FSharp.Core" Version="8.0.401" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/Bot/Sharp/Attachments/AttachmentCodeProvider.cs b/Bot/Sharp/Attachments/AttachmentCodeProvider.cs
@@ -6,13 +6,13 @@ namespace Sharp.Attachments;
 
 public class AttachmentCodeProvider(IHttpClientFactory httpClientFactory, IOptions<Options> options) : IAttachmentCodeProvider
 {
-    public async ValueTask<AttachmentCodeResult> GetCodeAsync(IEnumerable<Attachment> attachments)
+    public async ValueTask<AttachmentCodeResult> GetCodeAsync(IReadOnlyList<Attachment> attachments)
     {
-        var attachment = attachments.FirstOrDefault();
-
-        if (attachment is null)
+        if (attachments.Count is 0)
             return new AttachmentCodeResult.CodeNotFound();
 
+        var attachment = attachments[0];
+
         if (attachment.Size > options.Value.MaxFileSize)
             return new AttachmentCodeResult.FileTooLarge();
 

diff --git a/Bot/Sharp/Attachments/IAttachmentCodeProvider.cs b/Bot/Sharp/Attachments/IAttachmentCodeProvider.cs
@@ -13,5 +13,5 @@ public record FileTooLarge : AttachmentCodeResult;
 
 public interface IAttachmentCodeProvider
 {
-    public ValueTask<AttachmentCodeResult> GetCodeAsync(IEnumerable<Attachment> attachments);
+    public ValueTask<AttachmentCodeResult> GetCodeAsync(IReadOnlyList<Attachment> attachments);
 }
diff --git a/Bot/Sharp/CommandHostExtensions.cs b/Bot/Sharp/CommandHostExtensions.cs
@@ -37,7 +37,7 @@ public static IHost AddDecompileCommands(this IHost host)
 
             host.AddCommand<CommandContext>(aliases, async (IServiceProvider services, IAttachmentCodeProvider attachmentCodeProvider, CommandContext context) =>
             {
-                var result = await attachmentCodeProvider.GetCodeAsync(context.Message.Attachments.Values);
+                var result = await attachmentCodeProvider.GetCodeAsync(context.Message.Attachments);
 
                 if (result is not AttachmentCodeResult.Success { Language: var sourceLanguage, Code: var code })
                     return services.GetRequiredService<IResponseProvider>().AttachmentCodeResultResponse<ReplyMessageProperties>(context.Message.Id, result);

diff --git a/Bot/Sharp/Modules/RunCommand.cs b/Bot/Sharp/Modules/RunCommand.cs
@@ -37,7 +37,7 @@ public Task<ReplyMessageProperties> RunAsync([CommandParameter(Remainder = true)
     [Command("run", Priority = 2)]
     public async Task<ReplyMessageProperties> RunAsync(BackendArchitecture architecture)
     {
-        var result = await attachmentCodeProvider.GetCodeAsync(Context.Message.Attachments.Values);
+        var result = await attachmentCodeProvider.GetCodeAsync(Context.Message.Attachments);
 
         if (result is not AttachmentCodeResult.Success { Language: var language, Code: var code })
             return responseProvider.AttachmentCodeResultResponse<ReplyMessageProperties>(Context.Message.Id, result);

diff --git a/Bot/Sharp/Program.cs b/Bot/Sharp/Program.cs
@@ -59,16 +59,13 @@
     .AddSingleton<ILanguageMatcher, LanguageMatcher>()
     .AddSingleton<ICompilationProvider, CompilationProvider>()
     .AddSingleton<IDecompilationProvider, DecompilationProvider>()
-    .AddSingleton<IRateLimiter, RateLimiter>()
+    .AddSingleton<Sharp.RateLimits.IRateLimiter, RateLimiter>()
     .AddCommands<CommandContext>(o => o.ResultHandler = new EnhancedCommandServiceResultHandler<CommandContext>())
     .AddApplicationCommands<SlashCommandInteraction, SlashCommandContext>(o => o.ResultHandler = new EnhancedApplicationCommandServiceResultHandler<SlashCommandContext>())
     .AddComponentInteractions<ButtonInteraction, ButtonInteractionContext>(o => o.ResultHandler = new EnhancedComponentInteractionServiceResultHandler<ButtonInteractionContext>())
     .AddDiscordGateway(o =>
     {
-        o.Configuration = new()
-        {
-            Intents = GatewayIntents.GuildMessages | GatewayIntents.DirectMessages | GatewayIntents.MessageContent,
-        };
+        o.Intents = GatewayIntents.GuildMessages | GatewayIntents.DirectMessages | GatewayIntents.MessageContent;
     });
 
 var host = builder.Build();

diff --git a/Bot/Sharp/Responding/ResponseProvider.cs b/Bot/Sharp/Responding/ResponseProvider.cs
@@ -181,7 +181,7 @@ public class ResponseProvider(IOptions<Options> options, IOptions<CommandService
 
         var discordOptionsValue = discordOptions.Value;
 
-        var prefix = discordOptionsValue.Prefixes is { Count: > 0 } prefixes ? prefixes[0] : discordOptionsValue.Prefix;
+        var prefix = discordOptionsValue.Prefixes?.FirstOrDefault() ?? discordOptionsValue.Prefix;
 
         message.AddEmbeds(new EmbedProperties().WithDescription(
                                                 $"""

diff --git a/Bot/Sharp/Sharp.csproj b/Bot/Sharp/Sharp.csproj
@@ -9,19 +9,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Basic.Reference.Assemblies.Net80" Version="1.7.4" />
+    <PackageReference Include="Basic.Reference.Assemblies.Net80" Version="1.7.9" />
     <PackageReference Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.11.0" />
-    <PackageReference Include="FSharp.Compiler.Service" Version="43.8.400" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="NetCord" Version="1.0.0-alpha.311" />
-    <PackageReference Include="NetCord.Services" Version="1.0.0-alpha.212" />
-    <PackageReference Include="NetCord.Hosting" Version="1.0.0-alpha.81" />
-    <PackageReference Include="NetCord.Hosting.Services" Version="1.0.0-alpha.90" />
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="FSharp.Compiler.Service" Version="43.8.401" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
+    <PackageReference Include="NetCord" Version="1.0.0-alpha.325" />
+    <PackageReference Include="NetCord.Services" Version="1.0.0-alpha.226" />
+    <PackageReference Include="NetCord.Hosting" Version="1.0.0-alpha.95" />
+    <PackageReference Include="NetCord.Hosting.Services" Version="1.0.0-alpha.104" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>