Merge pull request #34 from the-programmers-hangout/develop

release: merge develop into master for v1.2.0

Author: ddivad195

README.md

@@ -1,3 +1,11 @@
+<a href="https://kotlinlang.org/"><img src="https://img.shields.io/badge/Kotlin-1.4.0-blue.svg?logo=Kotlin" alt="Kotlin 1.4.0"></a>
+ <a href="https://github.com/JakeJMattson/DiscordKt">
+    <img alt="DiscordKt 0.21.3" src="https://img.shields.io/badge/DiscordKt-0.21.3-blue.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABmJLR0QA/wD/AP+gvaeTAAAEvElEQVRYw+2Yy2seVRiHn3Ob756kiWlrq7ZqDSJUsSqoK4srQXHjRnShf4ILl/4FrkVcKLgS1FW3FRR05b1IMVXbNG2SJvny5ct3nZkz5+IitpW2giYOFskLA7M4Z+Y57/m9P857YC92F+Lqy/T0M/F2Atvc/EIAyNs9g3uAuw3974lZMFc9jsJwLj+Dj+72ATxSO8KrB1/nHjOHd5q1rM3Hm+/zc/b9f1vFTV3npbuf49k7ThJ9gisM3ulrz5nBj3zSfY+u39hxFe8IUCA4efgRXjv2PA05iXeaiGHyiRa2L+l87SnsNmRaBE53T3F68CnuH2z7jgHvm5rljRPPMTdxz7VMVeemOPTyYSp3JgCMzlt+fWdA71zEO41zmqV0hY823mPBzpcHeKg1wYcvvEJCDe8V1GpMv3iM5qMzN42NEdpfjFn4YETakXinyQt4e/ktLtvz5Rj1s/cfpVWPmEpO88Emh988cUs4ACFg/8k6j707w+wT23NqVc+Tk0+X54ONisBUcnRiqT9/P157vPd/OT7GiFM5B16SJJWcpJJTM6o8m6lVBCaxSBmIaU5sVXGFxXuB1gYpr/48YnNLlmYgInISTDVDFoZ6mYB3tAw6sUjlQVyXbAyRwlqUUiAEaZoSQ7imcCEiSSXHK89krVoeoNEek1i8V3hxc01577F5QSTcIMhtDUrlSYwrD3CyLrcz6BUBzy3LPsuham7gu57BZjUpr0jqFYE2BdoUmIX5bS+5ack3fDKC+2ENnVhMJadqYnkZbA9ztCkIMiCWziJ7bewjTxFmD17nUX8CXB/gv7pAuDTCJBrvFZ1sUB5gp+9Z35LMTjm0CsjxKuarUxQH7iV/+ElivQFCIEYp6odzhF9WiU5jEo2QnvZajc1RiRo0JtIbw3CkmZkKTLX+yGb7POqzRYqDx1AuIi5dIRSCkGikDPQtLK9VGI8jifHlAQ5zi1YFISjWupLeSLN/2lE1AekDanWe4BVBK7xQZCGy1jV0uooQLcoERn5YogZHGd3UMtXQaKmwXnLpimKiEZmddmgp8TIQRaDT1bTbGlsEjLE4qehmlp4dlQfoY6CfFgxTz76mpllVSKkYZprhkqHViOAl3X5CnguEdhgiQ+9pDwNpIfEyLw/w4sYYj0NIxcYwMBgrZiY0iY5EL+mPFdFHoijQJuKjY3Mo2RpFolBECYuD1fJ8sJ85Pp/f4EpvjFKBAsdyz9IeWKJyaO1QxiGVo59nLG9ljIscpR1bdsB36xdJfVZmkXhSF/lmsc++dsrxuxrsq1VIi8jlTqBZUcQg6I8FtpAorcl9wfzGgKWtETEKBkVa4hZ3Uu6cSjg6U6U7Lvjy1x5376vw0KEGiTQMck8MEoREKMFCZ8C59SHOgZSSy70Ri71u+U3T/omEx4+2mKprQJBIwYOHGhyZrkFULG9Zzi6NGeWeGCVjG/hppcul7t+3mF01TVcnHp2t8tiRFonePuNJISAIfIQYBD4IfmuP+Gmlh/NhR13djvviCCy0M1a6OcfvavLAgfr2IUtEBLDSt3y32GeY766B33XjnrvItxcH/LaeMXewipaCC+2M1Z69va4+tsYFX18o9m639gD/d4B7sdv4Hc8YdmfiizvVAAAAAElFTkSuQmCC">
+</a>
+<a href="https://hub.docker.com/repository/docker/theprogrammershangout/judgebot/tags?page=1">
+  <img src="https://img.shields.io/docker/cloud/build/theprogrammershangout/judgebot.svg?label=Docker&logo=docker" alt="Docker">
+</a>
+
 # judgebot
 
 > A Discord bot to manage guild rules, infractions and punishments for guild members that don't play nicely.
@@ -10,5 +18,5 @@ $ cp .env.example .env
 Edit the .env file with your favourite editor, filling out the token, default prefix and mongo configuration.
 
 ```
-$ docker-compose up --build --detach
+$ docker-compose up --detach
 ```

src/main/kotlin/me/ddivad/judgebot/Main.kt

@@ -56,7 +56,7 @@ suspend fun main(args: Array<String>) {
             field {
                 name = "Build Info"
                 value = "```" +
-                        "Version:   1.1.2\n" +
+                        "Version:   1.2.0\n" +
                         "DiscordKt: ${versions.library}\n" +
                         "Kotlin:    $kotlinVersion" +
                         "```"

src/main/kotlin/me/ddivad/judgebot/embeds/InfractionEmbeds.kt

@@ -156,7 +156,10 @@ fun EmbedBuilder.createModeratorInfractionEmbed(guild: Guild, user: Member, infr
     }
 }
 
-fun EmbedBuilder.createMessageDeleteEmbed(guild: Guild, user: User, message: Message) {
+fun EmbedBuilder.createMessageDeleteEmbed(guild: Guild, message: Message) {
+    var messageContent = message.content.take(1010)
+    if (message.content.length > 1024) messageContent += " ..."
+
     title = "Message Deleted"
     thumbnail {
         url = guild.getIconUrl(Image.Format.PNG) ?: ""
@@ -166,7 +169,7 @@ fun EmbedBuilder.createMessageDeleteEmbed(guild: Guild, user: User, message: Mes
         Your ${if (message.attachments.isNotEmpty()) "image" else "message"} was deleted from ${message.channel.mention} 
         as it is against our server rules.
     """.trimIndent()
-    addField("Message", "```${message.content}```")
+    addField("Message", "```${messageContent}```")
     if (message.attachments.isNotEmpty()) {
         addField("Filename", "```${message.attachments.first().filename}```")
     }

src/main/kotlin/me/ddivad/judgebot/listeners/StaffReactionListeners.kt

@@ -1,9 +1,11 @@
 package me.ddivad.judgebot.listeners
 
+import com.gitlab.kordlib.common.exception.RequestException
 import com.gitlab.kordlib.core.event.message.ReactionAddEvent
 import me.ddivad.judgebot.dataclasses.Configuration
 import me.ddivad.judgebot.embeds.createMessageDeleteEmbed
 import me.ddivad.judgebot.embeds.createSelfHistoryEmbed
+import me.ddivad.judgebot.extensions.testDmStatus
 import me.ddivad.judgebot.services.DatabaseService
 import me.ddivad.judgebot.services.PermissionLevel
 import me.ddivad.judgebot.services.PermissionsService
@@ -32,15 +34,22 @@ fun onStaffReactionAdd(muteService: MuteService,
                     }
                     guildConfiguration.reactions.historyReaction -> {
                         message.deleteReaction(this.emoji)
-                        val target = databaseService.users.getOrCreateUser(messageAuthor, guild!!.asGuild())
-                        it.sendPrivateMessage { createSelfHistoryEmbed(messageAuthor, target, guild!!.asGuild(), configuration) }
+                        val target = databaseService.users.getOrCreateUser(messageAuthor, guild.asGuild())
+                        it.sendPrivateMessage { createSelfHistoryEmbed(messageAuthor, target, guild.asGuild(), configuration) }
                     }
                     guildConfiguration.reactions.deleteMessageReaction -> {
+                        val content = message.asMessage()
                         message.deleteReaction(this.emoji)
-                        messageAuthor.sendPrivateMessage {
-                            createMessageDeleteEmbed(guild, messageAuthor, message.asMessage())
-                        }
                         message.delete()
+                        try {
+                            messageAuthor.sendPrivateMessage {
+                                createMessageDeleteEmbed(guild, content)
+                            }
+                        } catch (ex: RequestException) {
+                            this.user.sendPrivateMessage("User ${messageAuthor.mention} has DM's disabled." +
+                                    " Message deleted without notification.")
+                        }
+
                     }
                 }
             }