feat: implement various changes and updates

ddivad195 · ddivad195 · commit e7dbb0b13c3f · 2021-08-04T19:47:42.000+01:00
diff --git a/src/main/kotlin/me/ddivad/judgebot/Main.kt b/src/main/kotlin/me/ddivad/judgebot/Main.kt
@@ -33,6 +33,13 @@ suspend fun main(args: Array<String>) {
             theme = Color.MAGENTA
             entitySupplyStrategy = EntitySupplyStrategy.cacheWithCachingRestFallback
             permissions(Permissions.NONE)
+            intents = Intents(
+                Intent.GuildMembers,
+                Intent.DirectMessages,
+                Intent.GuildBans,
+                Intent.Guilds,
+                Intent.GuildMessageReactions
+            )
         }
 
         mentionEmbed {
diff --git a/src/main/kotlin/me/ddivad/judgebot/arguments/LowerMemberArg.kt b/src/main/kotlin/me/ddivad/judgebot/arguments/LowerMemberArg.kt
@@ -19,7 +19,7 @@ open class LowerMemberArg(override val name: String = "LowerMemberArg") : Argume
         val author = event.author.asMember(event.guild!!.id)
 
         return when {
-            event.discord.permissions.isHigherLevel(event.discord, author, member) ->
+            event.discord.permissions.isHigherLevel(event.discord, member, author) ->
                 Error("You don't have the permission to use this command on the target user.")
             else -> Success(member)
         }
diff --git a/src/main/kotlin/me/ddivad/judgebot/arguments/LowerUserArg.kt b/src/main/kotlin/me/ddivad/judgebot/arguments/LowerUserArg.kt
@@ -20,7 +20,7 @@ open class LowerUserArg(override val name: String = "LowerUserArg") : ArgumentTy
         val author = event.author.asMember(event.guild!!.id)
 
         return when {
-            event.discord.permissions.isHigherLevel(event.discord, author, member) ->
+            event.discord.permissions.isHigherLevel(event.discord, member, author) ->
                 Error("You don't have the permission to use this command on the target user.")
             else -> Success(member.asUser())
         }
diff --git a/src/main/kotlin/me/ddivad/judgebot/dataclasses/GuildMember.kt b/src/main/kotlin/me/ddivad/judgebot/dataclasses/GuildMember.kt
@@ -99,6 +99,7 @@ data class GuildMember(
         infraction.id = nextId
         this.infractions.add(infraction)
         this.points += infraction.points
+        this.pointDecayTimer = DateTime().millis.plus(infraction.punishment?.duration ?: 0)
         this.lastInfraction = DateTime().millis
     }
 
@@ -112,7 +113,7 @@ data class GuildMember(
     }
 
     fun checkPointDecay(guild: Guild, configuration: GuildConfiguration) = with(this.getGuildInfo(guild.id.asString)) {
-        val weeksSincePointsDecayed = Weeks.weeksBetween(DateTime(this.pointDecayTimer), DateTime()).weeks
+        val weeksSincePointsDecayed = Weeks.weeksBetween(DateTime(this.pointDecayTimer), DateTime().plusWeeks(6)).weeks
         if (weeksSincePointsDecayed > 0) {
             val pointsToRemove = configuration.infractionConfiguration.pointDecayPerWeek * weeksSincePointsDecayed
             this.points -= pointsToRemove
diff --git a/src/main/kotlin/me/ddivad/judgebot/listeners/JoinLeaveListener.kt b/src/main/kotlin/me/ddivad/judgebot/listeners/JoinLeaveListener.kt
@@ -1,23 +1,15 @@
 package me.ddivad.judgebot.listeners
 
-import dev.kord.core.event.guild.GuildCreateEvent
 import dev.kord.core.event.guild.MemberJoinEvent
 import dev.kord.core.event.guild.MemberLeaveEvent
-import dev.kord.gateway.PrivilegedIntent
-import dev.kord.gateway.RequestGuildMembers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import me.ddivad.judgebot.services.DatabaseService
 import me.jakejmattson.discordkt.api.dsl.listeners
 
-@OptIn(PrivilegedIntent::class)
 @Suppress("unused")
 fun onGuildMemberLeave(databaseService: DatabaseService) = listeners {
-    on<GuildCreateEvent> {
-        gateway.send(RequestGuildMembers(guildId = guild.id))
-    }
-
     on<MemberLeaveEvent> {
         databaseService.joinLeaves.addLeaveData(guildId.asString, user.id.asString)
     }
diff --git a/src/main/kotlin/me/ddivad/judgebot/listeners/MemberReactionListeners.kt b/src/main/kotlin/me/ddivad/judgebot/listeners/MemberReactionListeners.kt
@@ -12,27 +12,26 @@ import me.jakejmattson.discordkt.api.extensions.toSnowflake
 
 @Suppress("unused")
 fun onMemberReactionAdd(configuration: Configuration) = listeners {
-//    on<ReactionAddEvent> {
-//        println(emoji.name + " added")
-//        val guild = guild?.asGuildOrNull() ?: return@on
-//        val guildConfiguration = configuration[guild.asGuild().id.value]
-//        if (!guildConfiguration?.reactions!!.enabled) return@on
-//
-//        when (this.emoji.name) {
-//            guildConfiguration.reactions.flagMessageReaction -> {
-//                message.deleteReaction(this.emoji)
-//                guild.asGuild()
-//                    .getChannelOf<TextChannel>(guildConfiguration.loggingConfiguration.alertChannel.toSnowflake())
-//                    .asChannel()
-//                    .createMessage(
-//                        "**Message Flagged**" +
-//                                "\n**User**: ${user.mention}" +
-//                                "\n**Channel**: ${message.channel.mention}" +
-//                                "\n**Author:** ${message.asMessage().author?.mention}" +
-//                                "\n**Message:** ${message.asMessage().jumpLink()}"
-//                    )
-//                    .addReaction(Emojis.question)
-//            }
-//        }
-//    }
+    on<ReactionAddEvent> {
+        val guild = guild?.asGuildOrNull() ?: return@on
+        val guildConfiguration = configuration[guild.asGuild().id.value]
+        if (!guildConfiguration?.reactions!!.enabled) return@on
+
+        when (this.emoji.name) {
+            guildConfiguration.reactions.flagMessageReaction -> {
+                message.deleteReaction(this.emoji)
+                guild.asGuild()
+                    .getChannelOf<TextChannel>(guildConfiguration.loggingConfiguration.alertChannel.toSnowflake())
+                    .asChannel()
+                    .createMessage(
+                        "**Message Flagged**" +
+                                "\n**User**: ${user.mention}" +
+                                "\n**Channel**: ${message.channel.mention}" +
+                                "\n**Author:** ${message.asMessage().author?.mention}" +
+                                "\n**Message:** ${message.asMessage().jumpLink()}"
+                    )
+                    .addReaction(Emojis.question)
+            }
+        }
+    }
 }
diff --git a/src/main/kotlin/me/ddivad/judgebot/listeners/StaffReactionListeners.kt b/src/main/kotlin/me/ddivad/judgebot/listeners/StaffReactionListeners.kt
@@ -5,6 +5,7 @@ import dev.kord.core.event.message.ReactionAddEvent
 import dev.kord.x.emoji.Emojis
 import dev.kord.x.emoji.addReaction
 import me.ddivad.judgebot.dataclasses.Configuration
+import me.ddivad.judgebot.dataclasses.Permissions
 import me.ddivad.judgebot.embeds.createMessageDeleteEmbed
 import me.ddivad.judgebot.embeds.createCondensedHistoryEmbed
 import me.ddivad.judgebot.services.DatabaseService
@@ -23,64 +24,64 @@ fun onStaffReactionAdd(
     configuration: Configuration
 ) = listeners {
     on<ReactionAddEvent> {
-        println("listener")
-//        val guild = guild?.asGuildOrNull() ?: return@on
-//        val guildConfiguration = configuration[guild.asGuild().id.value]
-//        if (!guildConfiguration?.reactions!!.enabled) return@on
-//        val staffMember = user.asMemberOrNull(guild.id) ?: return@on
-//        val messageAuthor = message.asMessage().author?.asMemberOrNull(guild.id) ?: return@on
-//        val msg = message.asMessage()
-//        println(discord.permissions.isHigherLevel(discord, staffMember, messageAuthor))
-//        if (discord.permissions.isHigherLevel(discord, staffMember, messageAuthor)) {
-//            when (this.emoji.name) {
-//                guildConfiguration.reactions.gagReaction -> {
-//                    msg.deleteReaction(this.emoji)
-//                    if (muteService.checkRoleState(guild, messageAuthor) == RoleState.Tracked) {
-//                        staffMember.sendPrivateMessage("${messageAuthor.mention} is already muted.")
-//                        return@on
-//                    }
-//                    muteService.gag(guild, messageAuthor, staffMember)
-//                    staffMember.sendPrivateMessage("${messageAuthor.mention} gagged.")
-//                    loggingService.staffReactionUsed(guild, staffMember, messageAuthor, this.emoji)
-//                }
-//                guildConfiguration.reactions.historyReaction -> {
-//                    msg.deleteReaction(this.emoji)
-//                    staffMember.sendPrivateMessage {
-//                        createCondensedHistoryEmbed(
-//                            messageAuthor,
-//                            databaseService.users.getOrCreateUser(messageAuthor, guild.asGuild()),
-//                            guild.asGuild(),
-//                            configuration
-//                        )
-//                    }
-//                    loggingService.staffReactionUsed(guild, staffMember, messageAuthor, this.emoji)
-//                }
-//                guildConfiguration.reactions.deleteMessageReaction -> {
-//                    msg.deleteReaction(this.emoji)
-//                    msg.delete()
-//                    databaseService.users.addMessageDelete(
-//                        guild,
-//                        databaseService.users.getOrCreateUser(messageAuthor, guild.asGuild()),
-//                        true
-//                    )
-//                    try {
-//                        messageAuthor.sendPrivateMessage {
-//                            createMessageDeleteEmbed(guild, msg)
-//                        }
-//                    } catch (ex: RequestException) {
-//                        staffMember.sendPrivateMessage(
-//                            "User ${messageAuthor.mention} has DM's disabled." +
-//                                    " Message deleted without notification."
-//                        )
-//                    }
-//                    loggingService.staffReactionUsed(guild, staffMember, messageAuthor, this.emoji)
-//                }
-//                Emojis.question.unicode -> {
-//                    if (this.user.isSelf() || msg.author != this.message.kord.getSelf()) return@on
-//                    msg.deleteReaction(this.emoji)
-//                    msg.addReaction(Emojis.whiteCheckMark)
-//                }
-//            }
-//        }
+        val guild = guild?.asGuildOrNull() ?: return@on
+        val guildConfiguration = configuration[guild.asGuild().id.value]
+        if (!guildConfiguration?.reactions!!.enabled) return@on
+        val staffMember = user.asMemberOrNull(guild.id) ?: return@on
+        val msg = message.asMessage()
+        val messageAuthor = msg.author?.asMemberOrNull(guild.id) ?: return@on
+        if (discord.permissions.hasPermission(discord, staffMember, Permissions.MODERATOR)
+            && discord.permissions.isHigherLevel(discord, staffMember, messageAuthor)
+        ) {
+            when (this.emoji.name) {
+                guildConfiguration.reactions.gagReaction -> {
+                    msg.deleteReaction(this.emoji)
+                    if (muteService.checkRoleState(guild, messageAuthor) == RoleState.Tracked) {
+                        staffMember.sendPrivateMessage("${messageAuthor.mention} is already muted.")
+                        return@on
+                    }
+                    muteService.gag(guild, messageAuthor, staffMember)
+                    staffMember.sendPrivateMessage("${messageAuthor.mention} gagged.")
+                    loggingService.staffReactionUsed(guild, staffMember, messageAuthor, this.emoji)
+                }
+                guildConfiguration.reactions.historyReaction -> {
+                    msg.deleteReaction(this.emoji)
+                    staffMember.sendPrivateMessage {
+                        createCondensedHistoryEmbed(
+                            messageAuthor,
+                            databaseService.users.getOrCreateUser(messageAuthor, guild.asGuild()),
+                            guild.asGuild(),
+                            configuration
+                        )
+                    }
+                    loggingService.staffReactionUsed(guild, staffMember, messageAuthor, this.emoji)
+                }
+                guildConfiguration.reactions.deleteMessageReaction -> {
+                    msg.deleteReaction(this.emoji)
+                    msg.delete()
+                    databaseService.users.addMessageDelete(
+                        guild,
+                        databaseService.users.getOrCreateUser(messageAuthor, guild.asGuild()),
+                        true
+                    )
+                    try {
+                        messageAuthor.sendPrivateMessage {
+                            createMessageDeleteEmbed(guild, msg)
+                        }
+                    } catch (ex: RequestException) {
+                        staffMember.sendPrivateMessage(
+                            "User ${messageAuthor.mention} has DM's disabled." +
+                                    " Message deleted without notification."
+                        )
+                    }
+                    loggingService.staffReactionUsed(guild, staffMember, messageAuthor, this.emoji)
+                }
+                Emojis.question.unicode -> {
+                    if (this.user.isSelf() || msg.author != this.message.kord.getSelf()) return@on
+                    msg.deleteReaction(this.emoji)
+                    msg.addReaction(Emojis.whiteCheckMark)
+                }
+            }
+        }
     }
 }
diff --git a/src/main/kotlin/me/ddivad/judgebot/services/database/UserOperations.kt b/src/main/kotlin/me/ddivad/judgebot/services/database/UserOperations.kt
@@ -86,8 +86,8 @@ class UserOperations(
     }
 
     suspend fun addInfraction(guild: Guild, user: GuildMember, infraction: Infraction): Infraction {
-        user.addInfraction(infraction, guild)
         infraction.punishment = getPunishmentForPoints(guild, user)
+        user.addInfraction(infraction, guild)
         this.updateUser(user)
         return infraction
     }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ open class LowerMemberArg(override val name: String = "LowerMemberArg") : Argume`
`19`	`19`	`val author = event.author.asMember(event.guild!!.id)`
`20`	`20`
`21`	`21`	`return when {`
`22`		`- event.discord.permissions.isHigherLevel(event.discord, author, member) ->`
	`22`	`+ event.discord.permissions.isHigherLevel(event.discord, member, author) ->`
`23`	`23`	`Error("You don't have the permission to use this command on the target user.")`
`24`	`24`	`else -> Success(member)`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ open class LowerUserArg(override val name: String = "LowerUserArg") : ArgumentTy`
`20`	`20`	`val author = event.author.asMember(event.guild!!.id)`
`21`	`21`
`22`	`22`	`return when {`
`23`		`- event.discord.permissions.isHigherLevel(event.discord, author, member) ->`
	`23`	`+ event.discord.permissions.isHigherLevel(event.discord, member, author) ->`
`24`	`24`	`Error("You don't have the permission to use this command on the target user.")`
`25`	`25`	`else -> Success(member.asUser())`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ data class GuildMember(`
`99`	`99`	`infraction.id = nextId`
`100`	`100`	`this.infractions.add(infraction)`
`101`	`101`	`this.points += infraction.points`
	`102`	`+ this.pointDecayTimer = DateTime().millis.plus(infraction.punishment?.duration ?: 0)`
`102`	`103`	`this.lastInfraction = DateTime().millis`
`103`	`104`	`}`
`104`	`105`
`@@ -112,7 +113,7 @@ data class GuildMember(`
`112`	`113`	`}`
`113`	`114`
`114`	`115`	`fun checkPointDecay(guild: Guild, configuration: GuildConfiguration) = with(this.getGuildInfo(guild.id.asString)) {`
`115`		`- val weeksSincePointsDecayed = Weeks.weeksBetween(DateTime(this.pointDecayTimer), DateTime()).weeks`
	`116`	`+ val weeksSincePointsDecayed = Weeks.weeksBetween(DateTime(this.pointDecayTimer), DateTime().plusWeeks(6)).weeks`
`116`	`117`	`if (weeksSincePointsDecayed > 0) {`
`117`	`118`	`val pointsToRemove = configuration.infractionConfiguration.pointDecayPerWeek * weeksSincePointsDecayed`
`118`	`119`	`this.points -= pointsToRemove`
Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,8 @@ class UserOperations(`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`suspend fun addInfraction(guild: Guild, user: GuildMember, infraction: Infraction): Infraction {`
`89`		`- user.addInfraction(infraction, guild)`
`90`	`89`	`infraction.punishment = getPunishmentForPoints(guild, user)`
	`90`	`+ user.addInfraction(infraction, guild)`
`91`	`91`	`this.updateUser(user)`
`92`	`92`	`return infraction`
`93`	`93`	`}`