ARC v2.0 - Squashed commit

* Added Slash commands functionality and utilities commands

* Added modmail system

* Added guild config editing and polished modmail system

* Finished user notes system

* Added ban appeals system

---------

Co-authored-by: Israel Aristide <[email protected]>

ARC/ARC.csproj

@@ -27,14 +27,14 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\DSharpPlus\DSharpPlus.Interactivity\DSharpPlus.Interactivity.csproj" />
       <ProjectReference Include="..\DSharpPlus\DSharpPlus.SlashCommands\DSharpPlus.SlashCommands.csproj" />
       <ProjectReference Include="..\DSharpPlus\DSharpPlus.VoiceNext\DSharpPlus.VoiceNext.csproj" />
       <ProjectReference Include="..\DSharpPlus\DSharpPlus\DSharpPlus.csproj" />
     </ItemGroup>
 
     <ItemGroup>
       <Folder Include="Migrations" />
-      <Folder Include="Modules" />
     </ItemGroup>
 
     <ItemGroup>

ARC/Arc.cs

@@ -2,7 +2,9 @@
 using Arc.Exceptions;
 using Arc.Schema;
 using Arc.Services;
+using ARC.Services;
 using DSharpPlus;
+using DSharpPlus.Entities;
 using DSharpPlus.EventArgs;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -93,26 +95,48 @@ private static async Task StartDiscordBot(IConfigurationRoot settings)
             LoggerFactory = logFactory
         };
 
-        _clientInstance = new DiscordClient(discordConfig);
+        _clientInstance = new DiscordClient(discordConfig)
+        {
+            ClientVersion = "2.0"
+        };
         _serviceProvider = ConfigureServices(settings);
 
         // Run any necessary steps before starting the bot here.
         ServiceProvider.GetRequiredService<UptimeService>();
         ServiceProvider.GetRequiredService<ModMailService>();
+        ServiceProvider.GetRequiredService<SlashCommandsService>();
+        ServiceProvider.GetRequiredService<InteractionService>();
+        ServiceProvider.GetRequiredService<BanAppealService>();
+
 
         // Connect to discord!
         await _clientInstance.ConnectAsync();
         _clientInstance.Ready += ClientInstanceOnReady;
+        _clientInstance.ClientErrored += ClientInstanceOnClientErrored;
 
         await Task.Delay(-1);
     }
 
+    private static async Task ClientInstanceOnClientErrored(DiscordClient sender, ClientErrorEventArgs args)
+    {
+        var debug_log = await ClientInstance.GetChannelAsync(ulong.Parse(GlobalConfig.GetSection("discord:debug_log").Value));
+        var errorEmbed = new DiscordEmbedBuilder()
+            .WithTitle("Error!")
+            .WithColor(DiscordColor.Red)
+            .WithDescription($"***An error occured <t:{DateTimeOffset.Now.ToUnixTimeSeconds()}:R>!***\n```{args.Exception}```");
+
+        await debug_log.SendMessageAsync(errorEmbed);
+
+    }
+
     private static async Task ClientInstanceOnReady(DiscordClient sender, ReadyEventArgs e)
     {
         await Task.Run(() =>
         { 
             Log.Logger.Information($"Logged in as {sender.CurrentUser}");
             Log.Logger.Information($"Ready!");
+            //ClientInstance.BulkOverwriteGlobalApplicationCommandsAsync(new List<DiscordApplicationCommand>() { });
+            //ClientInstance.BulkOverwriteGuildApplicationCommandsAsync(975717691564376084, new List<DiscordApplicationCommand>() { });
         });
     }
 
@@ -139,6 +163,9 @@ private static IServiceProvider ConfigureServices(IConfigurationRoot settings)
             .AddSingleton<IConfigurationRoot>(settings)
             .AddSingleton<UptimeService>()
             .AddSingleton<ModMailService>()
+            .AddSingleton<SlashCommandsService>()
+            .AddSingleton<InteractionService>()
+            .AddSingleton<BanAppealService>()
             .BuildServiceProvider();
 
         return services;

ARC/Exceptions/ArcExceptions.cs

@@ -13,4 +13,9 @@ public ArcNotInitializedException(string? message = null) : base($"ARC was not p
 public class ArcInitFailedException : ArcException
 {
     public ArcInitFailedException(string? message = null) : base($"ARC Initialization failed: {message ?? Empty}") { }
+}
+
+public class ArcModmailFailedException : ArcException
+{
+    public ArcModmailFailedException(string? message = null) : base($"ARC Modmail failed: {message ?? Empty}") { }
 }

ARC/Extensions/ClientExtensions.cs

@@ -1,9 +1,4 @@
 using DSharpPlus;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace ARC.Extensions
 {

ARC/Extensions/EmbedBuilderExtensions.cs

@@ -1,10 +1,6 @@
-using Arc.Schema;
+
 using DSharpPlus.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
 
 namespace ARC.Extensions
 {

ARC/Extensions/GuildExtensions.cs

@@ -0,0 +1,25 @@
+using Arc.Schema;
+using DSharpPlus.Entities;
+using DSharpPlus;
+namespace ARC.Extensions;
+
+public static class GuildExtensions
+{
+
+    private static ArcDbContext DbContext => Arc.Arc.ArcDbContext;
+    private static DiscordClient ClientInstance => Arc.Arc.ClientInstance;
+
+    public static async Task Log(this DiscordGuild guild, DiscordMessageBuilder message)
+    {
+
+        if (!DbContext.Config[guild.Id].ContainsKey("logchannel"))
+           return;
+
+        ulong logChannelSnowflake = ulong.Parse(DbContext.Config[guild.Id]["logchannel"]);
+        var channel = await ClientInstance.GetChannelAsync(logChannelSnowflake);
+
+        await channel.SendMessageAsync(message);
+
+    }
+
+}

ARC/Migrations/20230408134552_ArcV2-1.1.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ARC.Migrations
+{
+    /// <inheritdoc />
+    public partial class ArcV211 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<long>(
+                name: "GuildSnowflake",
+                table: "UserNotes",
+                type: "bigint",
+                nullable: false,
+                defaultValue: 0L);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GuildSnowflake",
+                table: "UserNotes");
+        }
+    }
+}

ARC/Migrations/ArcDbContextModelSnapshot.cs

@@ -101,6 +101,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("DateAdded")
                         .HasColumnType("timestamp with time zone");
 
+                    b.Property<long>("GuildSnowflake")
+                        .HasColumnType("bigint");
+
                     b.Property<string>("Note")
                         .IsRequired()
                         .HasColumnType("text");

ARC/Modules/ArcModule.cs

@@ -0,0 +1,38 @@
+
+using Arc.Schema;
+using DSharpPlus;
+using DSharpPlus.SlashCommands;
+using Microsoft.Extensions.Configuration;
+using Serilog;
+
+
+namespace ARC.Modules
+{
+    internal abstract class ArcModule : ApplicationCommandModule
+    {
+
+        protected static bool _loaded = false;
+        protected readonly ArcDbContext DbContext;
+        protected readonly IServiceProvider ServiceProvider;
+        protected readonly DiscordClient ClientInstance;
+        protected readonly IConfigurationRoot GlobalConfig;
+
+        protected ArcModule(string moduleName)
+        {
+
+            DbContext = Arc.Arc.ArcDbContext;
+            ServiceProvider = Arc.Arc.ServiceProvider;
+            ClientInstance = Arc.Arc.ClientInstance;
+            GlobalConfig = Arc.Arc.GlobalConfig;
+
+            if (_loaded)
+                return;
+            RegisterEvents();
+            Log.Logger.Information($"MODULE LOADED: {moduleName}");
+            _loaded = true;
+        }
+
+        protected abstract void RegisterEvents();
+
+    }
+}