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

release: merge develop with master

Author: ddivad195

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

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

src/main/kotlin/me/ddivad/judgebot/dataclasses/GuildMember.kt

@@ -99,14 +99,17 @@ 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
     }
 
     fun incrementHistoryCount(guildId: String) {
         this.getGuildInfo(guildId).historyCount += 1
     }
 
+    fun updatePointDecayDate(guild: Guild, punishmentDuration: Long) = with(this.getGuildInfo(guild.id.asString)) {
+        this.pointDecayTimer = DateTime().millis.plus(punishmentDuration)
+    }
+
     fun addMessageDeleted(guild: Guild, deleteReaction: Boolean) = with(this.getGuildInfo(guild.id.asString)) {
         this.deletedMessageCount.total++
         if (deleteReaction) this.deletedMessageCount.deleteReaction++

src/main/kotlin/me/ddivad/judgebot/services/database/UserOperations.kt

@@ -86,8 +86,9 @@ class UserOperations(
     }
 
     suspend fun addInfraction(guild: Guild, user: GuildMember, infraction: Infraction): Infraction {
-        infraction.punishment = getPunishmentForPoints(guild, user)
         user.addInfraction(infraction, guild)
+        infraction.punishment = getPunishmentForPoints(guild, user)
+        user.updatePointDecayDate(guild, infraction.punishment?.duration ?: 0)
         this.updateUser(user)
         return infraction
     }