Skip to content

Commit 92b36c4

Browse files
authored
Merge pull request #32 from the-programmers-hangout/feat/update-delete-embed
feat: update and polish delete message response to user
2 parents 3b08c71 + 4d2c398 commit 92b36c4

File tree

2 files changed

+25
-6
lines changed

2 files changed

+25
-6
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package me.ddivad.judgebot.embeds
22

33
import com.gitlab.kordlib.core.entity.Guild
44
import com.gitlab.kordlib.core.entity.Member
5+
import com.gitlab.kordlib.core.entity.Message
56
import com.gitlab.kordlib.core.entity.User
67
import com.gitlab.kordlib.rest.Image
78
import com.gitlab.kordlib.rest.builder.message.EmbedBuilder
@@ -153,4 +154,24 @@ fun EmbedBuilder.createModeratorInfractionEmbed(guild: Guild, user: Member, infr
153154
icon = guild.getIconUrl(Image.Format.PNG) ?: ""
154155
text = guild.name
155156
}
157+
}
158+
159+
fun EmbedBuilder.createMessageDeleteEmbed(guild: Guild, user: User, message: Message) {
160+
title = "Message Deleted"
161+
thumbnail {
162+
url = guild.getIconUrl(Image.Format.PNG) ?: ""
163+
}
164+
color = Color.RED
165+
description = """
166+
Your ${if (message.attachments.isNotEmpty()) "image" else "message"} was deleted from ${message.channel.mention}
167+
as it is against our server rules.
168+
""".trimIndent()
169+
addField("Message", "```${message.content}```")
170+
if (message.attachments.isNotEmpty()) {
171+
addField("Filename", "```${message.attachments.first().filename}```")
172+
}
173+
footer {
174+
icon = guild.getIconUrl(Image.Format.PNG) ?: ""
175+
text = guild.name
176+
}
156177
}

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package me.ddivad.judgebot.listeners
22

33
import com.gitlab.kordlib.core.event.message.ReactionAddEvent
4-
import com.gitlab.kordlib.kordx.emoji.Emojis
5-
import com.gitlab.kordlib.rest.route.Route
64
import me.ddivad.judgebot.dataclasses.Configuration
5+
import me.ddivad.judgebot.embeds.createMessageDeleteEmbed
76
import me.ddivad.judgebot.embeds.createSelfHistoryEmbed
87
import me.ddivad.judgebot.services.DatabaseService
9-
import me.ddivad.judgebot.services.LoggingService
108
import me.ddivad.judgebot.services.PermissionLevel
119
import me.ddivad.judgebot.services.PermissionsService
1210
import me.ddivad.judgebot.services.infractions.MuteService
@@ -39,9 +37,9 @@ fun onStaffReactionAdd(muteService: MuteService,
3937
}
4038
guildConfiguration.reactions.deleteMessageReaction -> {
4139
message.deleteReaction(this.emoji)
42-
messageAuthor.sendPrivateMessage("Your message with content \n" +
43-
"```${message.asMessage().content}``` " +
44-
"was deleted as it is against our rules.")
40+
messageAuthor.sendPrivateMessage {
41+
createMessageDeleteEmbed(guild, messageAuthor, message.asMessage())
42+
}
4543
message.delete()
4644
}
4745
}

0 commit comments

Comments
 (0)