Update starboard and update d#+

Plerx2493 · Oct 8, 2023 · de1ea69 · de1ea69
1 parent 94e4242
commit de1ea69
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 99 deletions.
diff --git a/ModularAssistentForDiscordServer/Commands/Slash/Purge.cs b/ModularAssistentForDiscordServer/Commands/Slash/Purge.cs
@@ -39,10 +39,12 @@ public async Task PurgeMessages
         await ctx.CreateResponseAsync(InteractionResponseType.DeferredChannelMessageWithSource,
             new DiscordInteractionResponseBuilder());
         var response = await ctx.GetOriginalResponseAsync();
-
-        var messagesApi = await ctx.Channel.GetMessagesAsync((int) amount);
+
         List<DiscordMessage> messages = new();
-        messages.AddRange(messagesApi);
+        await foreach (var msg in ctx.Channel.GetMessagesAsync((int) amount))
+        {
+            messages.Add(msg);
+        }
 
         messages.RemoveAll(x => (DateTime.UtcNow - x.Timestamp).TotalDays >= 14);
         messages.Remove(response);

diff --git a/ModularAssistentForDiscordServer/Commands/Text/Base/ExitGuild.cs b/ModularAssistentForDiscordServer/Commands/Text/Base/ExitGuild.cs
@@ -15,7 +15,9 @@
 using DSharpPlus;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
+using DSharpPlus.Entities;
 using MADS.Extensions;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace MADS.Commands.Text.Base;
 
@@ -36,9 +38,22 @@ public async Task LeaveGuildOwner(CommandContext ctx)
     }
 
     [Command("test"), Description("Leave given server"), RequireGuild, Hidden, RequireOwner]
-    public async Task Test(CommandContext ctx)
+    public async Task Test(CommandContext ctx, DiscordChannel chnl, int limit)
     {
-        var usr1 = await ctx.Client.GetUserAsync(262722553380864011);
-        await ctx.RespondAsync(usr1.Username);
+        var client = ModularDiscordBot.Services.GetRequiredService<DiscordRestClient>();
+        var channel = await client.GetChannelAsync(chnl.Id);
+        var messages = channel.GetMessagesAfterAsync(ctx.Message.Id + 1221);
+
+        messages.ToBlockingEnumerable().Count();
+
+
+        int i = 0;
+        await foreach (var message in messages)
+        {
+            i++;
+        }
+
+        await ctx.RespondAsync($"Found {i} messages");
+
     }
 }
diff --git a/ModularAssistentForDiscordServer/Extensions/ExtensionMethods.cs b/ModularAssistentForDiscordServer/Extensions/ExtensionMethods.cs
@@ -49,7 +49,8 @@ public static IServiceCollection AddDiscordRestClient(this IServiceCollection se
     {
         var discordRestConfig = new DiscordConfiguration
         {
-            Token = config.Token
+            Token = config.Token,
+            LoggerFactory = new LoggerFactory().AddSerilog()
         };
 
         serviceCollection.AddSingleton(new DiscordRestClient(discordRestConfig));

diff --git a/ModularAssistentForDiscordServer/ModularAssistentForDiscordServer.csproj b/ModularAssistentForDiscordServer/ModularAssistentForDiscordServer.csproj
@@ -31,22 +31,22 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0-preview.2.23128.3" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0-preview.7.23375.6" />
         <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
-        <PackageReference Include="Quartz" Version="3.6.2" />
-        <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.6.2" />
-        <PackageReference Include="Quartz.Extensions.Hosting" Version="3.6.2" />
-        <PackageReference Include="Quartz.Jobs" Version="3.6.2" />
-        <PackageReference Include="Quartz.Serialization.Json" Version="3.6.2" />
-        <PackageReference Include="Serilog" Version="3.0.0-dev-02022" />
+        <PackageReference Include="Quartz" Version="3.7.0" />
+        <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.7.0" />
+        <PackageReference Include="Quartz.Extensions.Hosting" Version="3.7.0" />
+        <PackageReference Include="Quartz.Jobs" Version="3.7.0" />
+        <PackageReference Include="Quartz.Serialization.Json" Version="3.7.0" />
+        <PackageReference Include="Serilog" Version="3.1.0-dev-02071" />
         <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="4.1.1-dev-00910" />
-        <PackageReference Include="DSharpPlus" Version="5.0.0-nightly-01717" />
-        <PackageReference Include="DSharpPlus.CommandsNext" Version="5.0.0-nightly-01717" />
-        <PackageReference Include="DSharpPlus.Interactivity" Version="5.0.0-nightly-01717" />
-        <PackageReference Include="DSharpPlus.Rest" Version="5.0.0-nightly-01717" />
-        <PackageReference Include="DSharpPlus.SlashCommands" Version="5.0.0-nightly-01717" />
-        <PackageReference Include="DSharpPlus.VoiceNext" Version="5.0.0-nightly-01717" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="4.2.0-dev-00918" />
+        <PackageReference Include="DSharpPlus" Version="5.0.0-nightly-01826" />
+        <PackageReference Include="DSharpPlus.CommandsNext" Version="5.0.0-nightly-01815" />
+        <PackageReference Include="DSharpPlus.Interactivity" Version="5.0.0-nightly-01815" />
+        <PackageReference Include="DSharpPlus.Rest" Version="5.0.0-nightly-01815" />
+        <PackageReference Include="DSharpPlus.SlashCommands" Version="5.0.0-nightly-01815" />
+        <PackageReference Include="DSharpPlus.VoiceNext" Version="5.0.0-nightly-01815" />
     </ItemGroup>
 </Project>
diff --git a/ModularAssistentForDiscordServer/ModularDiscordBot.cs b/ModularAssistentForDiscordServer/ModularDiscordBot.cs
@@ -28,6 +28,7 @@ public class ModularDiscordBot
 {
     public static IServiceProvider Services;
     public static DateTimeOffset StartTime = DateTimeOffset.Now;
+    public static ILogger<ModularDiscordBot> Logger;
     private readonly ConfigJson _config;
 
     public ModularDiscordBot()
@@ -89,6 +90,7 @@ await Host.CreateDefaultBuilder()
                         .AddHostedService(s => s.GetRequiredService<VoiceAlertService>());
 
                     Services = services.BuildServiceProvider();
+                    Logger = Services.GetRequiredService<ILogger<ModularDiscordBot>>();
                 }
             )
             .RunConsoleAsync();