Merge pull request #63 from InfinityGhost/feature/direct-message-modmail

Add direct message mod mail

Author: InfinityGhost

TabletBot.Common/Settings.cs

@@ -11,11 +11,13 @@ public sealed class Settings
     {
         private const ulong MAIN_GUILD_ID = 615607687467761684;
         private const ulong LOG_MESSAGE_CHANNEL_ID = 715344685853442198;
+        private const ulong MOD_MAIL_CHANNEL_ID = 958916136966193182;
         private const ulong MODERATOR_ROLE_ID = 644180151755735060;
         private const ulong MUTED_ROLE_ID = 715342682293010452;
 
         public ulong GuildID { set; get; } = MAIN_GUILD_ID;
         public ulong LogMessageChannelID { set; get; } = LOG_MESSAGE_CHANNEL_ID;
+        public ulong ModMailChannelID { set; get; } = MOD_MAIL_CHANNEL_ID;
         public ulong ModeratorRoleID { set; get; } = MODERATOR_ROLE_ID;
         public ulong MutedRoleID { set; get; } = MUTED_ROLE_ID;
         public string CommandPrefix { set; get; } = "!";
@@ -30,7 +32,7 @@ public sealed class Settings
         [JsonIgnore]
         public bool RunAsUnit { set; get; } = false;
 
-        private static readonly JsonSerializerOptions options = new JsonSerializerOptions
+        private static readonly JsonSerializerOptions SerializerOptions = new JsonSerializerOptions
         {
             WriteIndented = true
         };
@@ -39,21 +41,21 @@ public async Task Write(FileInfo file)
         {
             if (!file.Directory.Exists)
                 file.Directory.Create();
-            using (var fs = file.Create())
-                await JsonSerializer.SerializeAsync<Settings>(fs, this, options);
+            await using (var fs = file.Create())
+                await JsonSerializer.SerializeAsync<Settings>(fs, this, SerializerOptions);
         }
 
         public static async Task<Settings> Read(FileInfo file)
         {
-            using (var fs = file.OpenRead())
+            await using (var fs = file.OpenRead())
                 return await JsonSerializer.DeserializeAsync<Settings>(fs);
         }
 
         public async Task<string> ExportAsync()
         {
-            using (var ms = new MemoryStream())
+            await using (var ms = new MemoryStream())
             {
-                await JsonSerializer.SerializeAsync<Settings>(ms, this, options);
+                await JsonSerializer.SerializeAsync<Settings>(ms, this, SerializerOptions);
                 ms.Position = 0;
                 using (var sr = new StreamReader(ms))
                     return await sr.ReadToEndAsync();

TabletBot.Discord/BotServiceCollection.cs

@@ -7,6 +7,7 @@
 using TabletBot.Discord.SlashCommands;
 using TabletBot.Discord.Watchers;
 using TabletBot.Discord.Watchers.Commands;
+using TabletBot.Discord.Watchers.DirectMessage;
 using TabletBot.Discord.Watchers.GitHub;
 using TabletBot.Discord.Watchers.ReactionRoles;
 using TabletBot.Discord.Watchers.Spam;
@@ -32,6 +33,7 @@ public static IServiceCollection Build(Settings settings, DiscordSocketClient di
                 .AddMessageWatcher<CommandMessageWatcher>()
                 .AddMessageWatcher<IssueMessageWatcher>()
                 .AddMessageWatcher<SpamMessageWatcher>()
+                .AddMessageWatcher<ModMailMessageWatcher>()
                 // Reaction watchers
                 .AddReactionWatcher<RoleReactionWatcher>()
                 // Interaction watchers

TabletBot.Discord/TabletBot.Discord.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

TabletBot.Discord/Watchers/DirectMessage/ModMailMessageWatcher.cs

@@ -0,0 +1,47 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Discord;
+using Discord.WebSocket;
+using TabletBot.Common;
+using TabletBot.Discord.Commands;
+
+namespace TabletBot.Discord.Watchers.DirectMessage
+{
+    public class ModMailMessageWatcher : IMessageWatcher
+    {
+        private readonly DiscordSocketClient _client;
+        private readonly Settings _settings;
+
+        public ModMailMessageWatcher(DiscordSocketClient client, Settings settings)
+        {
+            _client = client;
+            _settings = settings;
+        }
+
+        private IMessageChannel? _directMessageLogChannel;
+
+        public async Task Receive(IMessage message)
+        {
+            if (message.Channel is IDMChannel dmChannel)
+            {
+                if (_directMessageLogChannel == null)
+                {
+                    var channel = await _client.Rest.GetChannelAsync(_settings.ModMailChannelID);
+                    _directMessageLogChannel = (IMessageChannel) channel;
+                }
+
+                var embed = new EmbedBuilder
+                {
+                    Description = message.Content,
+                    Timestamp = message.Timestamp,
+                    Author = dmChannel.Recipient.ToEmbedAuthor(),
+                    Color = Color.Blue
+                };
+
+                await _directMessageLogChannel.SendMessageAsync(embed: embed.Build());
+            }
+        }
+
+        public Task Deleted(Cacheable<IMessage, ulong> message, Cacheable<IMessageChannel, ulong> channel) => Task.CompletedTask;
+    }
+}