Add attachments to embed fields

Author: InfinityGhost

TabletBot.Discord/Formatting.cs

@@ -1,3 +1,5 @@
+using Discord;
+
 namespace TabletBot.Discord
 {
     public static class Formatting
@@ -8,5 +10,7 @@ public static class Formatting
         public const string CODE_AFFIX = "`";
         public const string QUOTE_PREFIX = "> ";
         public const string CODE_BLOCK = "```";
+
+        public static string UrlString(IAttachment attachment) => $"[{attachment.Filename}]({attachment.Url})";
     }
 }

TabletBot.Discord/Watchers/DirectMessage/ModMailMessageWatcher.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Discord;
@@ -18,28 +20,62 @@ public ModMailMessageWatcher(DiscordSocketClient client, Settings settings)
             _settings = settings;
         }
 
-        private IMessageChannel? _directMessageLogChannel;
+        private ITextChannel? _directMessageLogChannel;
 
         public async Task Receive(IMessage message)
         {
             if (message.Channel is IDMChannel dmChannel)
             {
-                if (_directMessageLogChannel == null)
+                await DirectMessage(message, dmChannel);
+            }
+        }
+
+        private async Task DirectMessage(IMessage message, IDMChannel dmChannel)
+        {
+            var embed = new EmbedBuilder
+            {
+                Description = message.Content,
+                Timestamp = message.Timestamp,
+                Author = dmChannel.Recipient.ToEmbedAuthor(),
+                Color = Color.Blue,
+                Fields = GetFieldForAttachments(message),
+                Footer = new EmbedFooterBuilder
                 {
-                    var channel = await _client.Rest.GetChannelAsync(_settings.ModMailChannelID);
-                    _directMessageLogChannel = (IMessageChannel) channel;
+                    Text = dmChannel.Id.ToString()
                 }
+            };
 
-                var embed = new EmbedBuilder
-                {
-                    Description = message.Content,
-                    Timestamp = message.Timestamp,
-                    Author = dmChannel.Recipient.ToEmbedAuthor(),
-                    Color = Color.Blue
-                };
+            var existingEmbeds = message.Embeds.Any() ? message.Embeds : Array.Empty<IEmbed>();
 
-                await _directMessageLogChannel.SendMessageAsync(embed: embed.Build());
-            }
+            var embeds = from emb in existingEmbeds.Prepend(embed.Build())
+                where emb is Embed
+                select emb as Embed;
+
+            var channel = await GetModMailChannel();
+            await channel.SendMessageAsync(embeds: embeds.ToArray());
+        }
+
+        private async Task<ITextChannel> GetModMailChannel()
+        {
+            if (_directMessageLogChannel != null)
+                return _directMessageLogChannel;
+
+            var channel = await _client.Rest.GetChannelAsync(_settings.ModMailChannelID);
+            return _directMessageLogChannel = (ITextChannel) channel;
+        }
+
+        private static List<EmbedFieldBuilder> GetFieldForAttachments(IMessage message)
+        {
+            return message.Attachments.Select(GetFieldForAttachment).ToList();
+        }
+
+        private static EmbedFieldBuilder GetFieldForAttachment(IAttachment attachment)
+        {
+            return new EmbedFieldBuilder
+            {
+                Name = attachment.Filename,
+                Value = Formatting.UrlString(attachment)
+            };
         }
 
         public Task Deleted(Cacheable<IMessage, ulong> message, Cacheable<IMessageChannel, ulong> channel) => Task.CompletedTask;