fix(logging): log stickers in deleted messages

src/main/kotlin/be/duncanc/discordmodbot/logging/GuildLogger.kt

@@ -238,6 +238,9 @@ class GuildLogger
             oldMessage.emotes?.let {
                 logEmbed.addField("Emote(s)", oldMessage.emotes, false)
             }
+            oldMessage.stickers?.let {
+                logEmbed.addField("Sticker(s)", it, false)
+            }
             log(
                 logEmbed,
                 user,
@@ -354,6 +357,9 @@ class GuildLogger
                 message.emotes?.let {
                     entry.append("Emote(s):\n").append(it)
                 }
+                message.stickers?.let {
+                    entry.append("Sticker(s):\n").append(it)
+                }
                 entries[index] = entry.toString()
 
                 if (remainingLookups.decrementAndGet() == 0) {

src/main/kotlin/be/duncanc/discordmodbot/logging/MessageHistory.kt

@@ -3,6 +3,7 @@ package be.duncanc.discordmodbot.logging
 import be.duncanc.discordmodbot.logging.persistence.DiscordMessage
 import be.duncanc.discordmodbot.logging.persistence.DiscordMessageRepository
 import net.dv8tion.jda.api.entities.emoji.CustomEmoji
+import net.dv8tion.jda.api.entities.sticker.StickerItem
 import net.dv8tion.jda.api.entities.MessageReference.MessageReferenceType
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
 import net.dv8tion.jda.api.events.message.MessageUpdateEvent
@@ -53,7 +54,8 @@ constructor(
                 }?.let { messageId ->
                     "https://discord.com/channels/${reference.guildIdLong}/${reference.channelIdLong}/$messageId"
                 }
-            }
+            },
+            linkStickers(message.stickers)
         )
         discordMessageRepository.save(discordMessage)
         if (message.attachments.size > 0) {
@@ -81,7 +83,8 @@ constructor(
                 message.author.idLong,
                 messageContentEncryptor.encrypt(message.contentDisplay),
                 existingMessage?.emotes,
-                existingMessage?.repliedToUrl
+                existingMessage?.repliedToUrl,
+                existingMessage?.stickers
             )
             discordMessageRepository.save(discordMessage)
         }
@@ -116,4 +119,15 @@ constructor(
         }
         return stringBuilder.toString()
     }
+
+    private fun linkStickers(stickers: List<StickerItem>): String? {
+        if (stickers.isEmpty()) {
+            return null
+        }
+        val stringBuilder = StringBuilder()
+        stickers.forEach {
+            stringBuilder.append("[" + it.name + "](" + it.iconUrl + ")\n")
+        }
+        return stringBuilder.toString()
+    }
 }

src/main/kotlin/be/duncanc/discordmodbot/logging/persistence/DiscordMessage.kt

@@ -14,7 +14,8 @@ data class DiscordMessage(
     val userId: Long,
     val content: String,
     val emotes: String? = null,
-    val repliedToUrl: String? = null
+    val repliedToUrl: String? = null,
+    val stickers: String? = null
 ) {
     @Transient
     val jumpUrl = "https://discord.com/channels/$guildId/$channelId/$messageId"

src/test/kotlin/be/duncanc/discordmodbot/logging/GuildLoggerTest.kt

@@ -178,7 +178,8 @@ class GuildLoggerTest {
             channelId = 10L,
             userId = 20L,
             content = "deleted content",
-            repliedToUrl = "https://discord.com/channels/1/10/50"
+            repliedToUrl = "https://discord.com/channels/1/10/50",
+            stickers = "[wave](https://cdn.discordapp.com/sticker.png)"
         )
         whenever(event.guild).thenReturn(guild)
         whenever(event.channel).thenReturn(channel)
@@ -209,6 +210,8 @@ class GuildLoggerTest {
         verify(logChannel).sendMessage(messageCaptor.capture())
         val repliedToField = messageCaptor.firstValue.embeds.single().fields.first { it.name == "Replied to" }
         assertEquals("[Link](https://discord.com/channels/1/10/50)", repliedToField.value)
+        val stickerField = messageCaptor.firstValue.embeds.single().fields.first { it.name == "Sticker(s)" }
+        assertEquals("[wave](https://cdn.discordapp.com/sticker.png)", stickerField.value)
     }
 
     @Test
@@ -220,7 +223,8 @@ class GuildLoggerTest {
             channelId = 10L,
             userId = 20L,
             content = "deleted content",
-            repliedToUrl = "https://discord.com/channels/1/10/50"
+            repliedToUrl = "https://discord.com/channels/1/10/50",
+            stickers = "[wave](https://cdn.discordapp.com/sticker.png)"
         )
         whenever(bulkDeleteEvent.guild).thenReturn(guild)
         whenever(bulkDeleteEvent.channel).thenReturn(bulkChannel)
@@ -247,6 +251,7 @@ class GuildLoggerTest {
         verify(logChannel, timeout(1000)).sendFiles(fileCaptor.capture())
         val logContent = fileCaptor.firstValue.data.use { it.readBytes().toString(Charsets.UTF_8) }
         assertTrue(logContent.contains("Replied to:\nhttps://discord.com/channels/1/10/50"))
+        assertTrue(logContent.contains("Sticker(s):\n[wave](https://cdn.discordapp.com/sticker.png)"))
     }
 
     @Test

src/test/kotlin/be/duncanc/discordmodbot/logging/MessageHistoryTest.kt

@@ -8,6 +8,7 @@ import net.dv8tion.jda.api.entities.MessageReference
 import net.dv8tion.jda.api.entities.Mentions
 import net.dv8tion.jda.api.entities.User
 import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion
+import net.dv8tion.jda.api.entities.sticker.StickerItem
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
 import net.dv8tion.jda.api.events.message.MessageUpdateEvent
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -56,6 +57,9 @@ class MessageHistoryTest {
     @Mock
     private lateinit var messageReference: MessageReference
 
+    @Mock
+    private lateinit var sticker: StickerItem
+
     private lateinit var messageContentEncryptor: MessageContentEncryptor
     private lateinit var messageHistory: MessageHistory
 
@@ -101,6 +105,23 @@ class MessageHistoryTest {
         )
     }
 
+    @Test
+    fun `store message preserves stickers`() {
+        stubReceivedMessage(content = "sticker")
+        whenever(message.stickers).thenReturn(listOf(sticker))
+        whenever(sticker.name).thenReturn("wave")
+        whenever(sticker.iconUrl).thenReturn("https://cdn.discordapp.com/sticker.png")
+
+        messageHistory.storeMessage(receivedEvent)
+
+        val messageCaptor = argumentCaptor<DiscordMessage>()
+        verify(discordMessageRepository).save(messageCaptor.capture())
+        assertEquals(
+            "[wave](https://cdn.discordapp.com/sticker.png)\n",
+            messageCaptor.firstValue.stickers
+        )
+    }
+
     @Test
     fun `update message encrypts content before saving`() {
         stubUpdatedMessage(content = "updated content")
@@ -114,7 +135,8 @@ class MessageHistoryTest {
                     userId = 20L,
                     content = messageContentEncryptor.encrypt("old content"),
                     emotes = "[wave](https://cdn.discordapp.com/emote.png)",
-                    repliedToUrl = "https://discord.com/channels/1/10/50"
+                    repliedToUrl = "https://discord.com/channels/1/10/50",
+                    stickers = "[sticker](https://cdn.discordapp.com/sticker.png)"
                 )
             )
         )
@@ -127,6 +149,7 @@ class MessageHistoryTest {
         assertEquals("updated content", messageContentEncryptor.decrypt(messageCaptor.firstValue.content))
         assertEquals("[wave](https://cdn.discordapp.com/emote.png)", messageCaptor.firstValue.emotes)
         assertEquals("https://discord.com/channels/1/10/50", messageCaptor.firstValue.repliedToUrl)
+        assertEquals("[sticker](https://cdn.discordapp.com/sticker.png)", messageCaptor.firstValue.stickers)
     }
 
     @Test
@@ -201,6 +224,7 @@ class MessageHistoryTest {
         if (includeMentions) {
             whenever(message.mentions).thenReturn(mentions)
             whenever(mentions.customEmojis).thenReturn(emptyList())
+            whenever(message.stickers).thenReturn(emptyList())
         }
         if (includeAttachments) {
             whenever(message.attachments).thenReturn(emptyList())