Merge pull request #88 from the-programmers-hangout/feat/add-reset-command

ddivad195 · web-flow · commit b81228bc260b · 2021-06-07T17:57:50.000+01:00
feat: add reset command
diff --git a/commands.md b/commands.md
@@ -19,13 +19,13 @@
 | removeInfo | LowerMemberArg, Info ID      | Remove an information message from a member record. |
 
 ## Infraction
-| Commands         | Arguments                        | Description                                                                                                                           |
-| ---------------- | -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
-| badpfp           | (cancel), LowerMemberArg         | Notifies the user that they should change their profile pic and applies a 30 minute mute. Bans the user if they don't change picture. |
-| cleanse          | LowerUserArg                     | Use this to delete (permanently) as user's infractions.                                                                               |
-| removeInfraction | LowerUserArg, Infraction ID      | Use this to delete (permanently) an infraction from a user.                                                                           |
-| strike, s, S     | LowerMemberArg, (Weight), Reason | Strike a user.                                                                                                                        |
-| warn, w, W       | LowerMemberArg, Reason           | Warn a user.                                                                                                                          |
+| Commands           | Arguments                        | Description                                                                                                                           |
+| ------------------ | -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
+| badpfp             | (cancel), LowerMemberArg         | Notifies the user that they should change their profile pic and applies a 30 minute mute. Bans the user if they don't change picture. |
+| cleanseInfractions | LowerUserArg                     | Use this to delete (permanently) as user's infractions.                                                                               |
+| removeInfraction   | LowerUserArg, Infraction ID      | Use this to delete (permanently) an infraction from a user.                                                                           |
+| strike, s, S       | LowerMemberArg, (Weight), Reason | Strike a user.                                                                                                                        |
+| warn, w, W         | LowerMemberArg, Reason           | Warn a user.                                                                                                                          |
 
 ## Mute
 | Commands | Arguments                    | Description                                             |
@@ -37,7 +37,7 @@
 ## Notes
 | Commands     | Arguments                        | Description                                       |
 | ------------ | -------------------------------- | ------------------------------------------------- |
-| cleansenotes | LowerMemberArg                   | Use this to delete (permanently) as user's notes. |
+| cleanseNotes | LowerMemberArg                   | Use this to delete (permanently) as user's notes. |
 | deleteNote   | LowerMemberArg, Note ID          | Use this to add a delete a note from a user.      |
 | editNote     | User, Note to edit, Note Content | Use this to edit a note.                          |
 | note         | User, Note Content               | Use this to add a note to a user.                 |
@@ -60,6 +60,7 @@
 | getBanReason  | User                                      | Get a ban reason for a banned user                         |
 | history, h, H | User                                      | Use this to view a user's record.                          |
 | link          | Main Account, Alt Account                 | Link a user's alt account with their main                  |
+| reset         | LowerUserArg                              | Reset a user's record, and any linked accounts             |
 | selfHistory   |                                           | View your infraction history (contents will be DM'd)       |
 | setBanReason  | User, Reason                              | Set a ban reason for a banned user                         |
 | unban         | User                                      | Unban a banned member from this guild.                     |
diff --git a/src/main/kotlin/me/ddivad/judgebot/Main.kt b/src/main/kotlin/me/ddivad/judgebot/Main.kt
@@ -57,7 +57,7 @@ suspend fun main(args: Array<String>) {
             field {
                 name = "Build Info"
                 value = "```" +
-                        "Version:   2.0.1\n" +
+                        "Version:   2.1.0\n" +
                         "DiscordKt: ${versions.library}\n" +
                         "Kotlin:    $kotlinVersion" +
                         "```"
diff --git a/src/main/kotlin/me/ddivad/judgebot/commands/InfractionCommands.kt b/src/main/kotlin/me/ddivad/judgebot/commands/InfractionCommands.kt
@@ -96,7 +96,7 @@ fun createInfractionCommands(databaseService: DatabaseService,
         }
     }
 
-    guildCommand("cleanse") {
+    guildCommand("cleanseInfractions") {
         description = "Use this to delete (permanently) as user's infractions."
         requiredPermissionLevel = PermissionLevel.Administrator
         execute(LowerUserArg) {
diff --git a/src/main/kotlin/me/ddivad/judgebot/commands/NoteCommands.kt b/src/main/kotlin/me/ddivad/judgebot/commands/NoteCommands.kt
@@ -52,7 +52,7 @@ fun noteCommands(databaseService: DatabaseService) = commands("Notes") {
         }
     }
 
-    guildCommand("cleansenotes") {
+    guildCommand("cleanseNotes") {
         description = "Use this to delete (permanently) as user's notes."
         requiredPermissionLevel = PermissionLevel.Administrator
         execute(LowerMemberArg) {
diff --git a/src/main/kotlin/me/ddivad/judgebot/commands/UserCommands.kt b/src/main/kotlin/me/ddivad/judgebot/commands/UserCommands.kt
@@ -1,6 +1,8 @@
 package me.ddivad.judgebot.commands
 
 import me.ddivad.judgebot.arguments.LowerUserArg
+import me.ddivad.judgebot.conversations.InfractionConversation
+import me.ddivad.judgebot.conversations.ResetUserConversation
 import me.ddivad.judgebot.dataclasses.*
 import me.ddivad.judgebot.embeds.createHistoryEmbed
 import me.ddivad.judgebot.embeds.createCondensedHistoryEmbed
@@ -14,13 +16,16 @@ import me.ddivad.judgebot.services.requiredPermissionLevel
 import me.jakejmattson.discordkt.api.arguments.*
 import me.jakejmattson.discordkt.api.dsl.commands
 import me.jakejmattson.discordkt.api.extensions.sendPrivateMessage
+import me.jakejmattson.discordkt.api.extensions.toSnowflake
 import java.awt.Color
 
 @Suppress("unused")
-fun createUserCommands(databaseService: DatabaseService,
-                       config: Configuration,
-                       loggingService: LoggingService,
-                       banService: BanService) = commands("User") {
+fun createUserCommands(
+    databaseService: DatabaseService,
+    config: Configuration,
+    loggingService: LoggingService,
+    banService: BanService
+) = commands("User") {
     guildCommand("history", "h", "H") {
         description = "Use this to view a user's record."
         requiredPermissionLevel = PermissionLevel.Moderator
@@ -43,7 +48,7 @@ fun createUserCommands(databaseService: DatabaseService,
             databaseService.users.incrementUserHistory(user, guild)
             val linkedAccounts = user.getLinkedAccounts(guild)
 
-            if(linkedAccounts.isEmpty()) {
+            if (linkedAccounts.isEmpty()) {
                 respond("User ${target.mention} has no alt accounts recorded.")
                 return@execute
             }
@@ -166,4 +171,15 @@ fun createUserCommands(databaseService: DatabaseService,
             respond("Unlinked accounts ${main.mention} and ${alt.mention}")
         }
     }
+
+    guildCommand("reset") {
+        description = "Reset a user's record, and any linked accounts"
+        requiredPermissionLevel = PermissionLevel.Administrator
+        execute(LowerUserArg) {
+            val target = args.first
+            ResetUserConversation(databaseService, config)
+                .createResetConversation(guild, target)
+                .startPublicly(discord, author, channel)
+        }
+    }
 }
diff --git a/src/main/kotlin/me/ddivad/judgebot/conversations/ResetUserConversation.kt b/src/main/kotlin/me/ddivad/judgebot/conversations/ResetUserConversation.kt
@@ -0,0 +1,57 @@
+package me.ddivad.judgebot.conversations
+
+import com.gitlab.kordlib.core.entity.Guild
+import com.gitlab.kordlib.core.entity.User
+import com.gitlab.kordlib.kordx.emoji.Emojis
+import com.gitlab.kordlib.kordx.emoji.toReaction
+import com.gitlab.kordlib.rest.Image
+import me.ddivad.judgebot.dataclasses.Configuration
+import me.ddivad.judgebot.embeds.createHistoryEmbed
+import me.ddivad.judgebot.services.DatabaseService
+import me.jakejmattson.discordkt.api.dsl.conversation
+import me.jakejmattson.discordkt.api.extensions.toSnowflake
+import java.awt.Color
+
+class ResetUserConversation(private val databaseService: DatabaseService, private val configuration: Configuration) {
+    fun createResetConversation(guild: Guild, target: User) = conversation("cancel") {
+        val user = databaseService.users.getOrCreateUser(target, guild)
+        val guildMember = databaseService.users.resetUserRecord(guild, user)
+        var response = "Reset ${target.mention}"
+        val linkedAccounts = user.getLinkedAccounts(guild)
+        if (linkedAccounts.isNotEmpty()) {
+            val linkedUsers = linkedAccounts.map { guild.kord.getUser(it.toSnowflake()) }
+            val resetLinked = promptReaction(
+                mapOf(
+                    Emojis.whiteCheckMark.toReaction() to true,
+                    Emojis.x.toReaction() to false
+                )
+            ) {
+                title = "Reset linked accounts"
+                color = Color.MAGENTA
+                thumbnail {
+                    url = target.asUser().avatar.url
+                }
+                description = """
+                    ${target.mention} has linked accounts ${linkedUsers.joinToString { "${it?.mention}" }}
+                    
+                    Reset linked accounts too? (${Emojis.whiteCheckMark.unicode} / ${Emojis.x.unicode})
+                      """.trimIndent()
+                footer {
+                    icon = guild.getIconUrl(Image.Format.PNG) ?: ""
+                    text = guild.name
+                }
+            }
+            if (resetLinked) {
+                linkedUsers.forEach {
+                    val altRecord = it?.let { record -> databaseService.users.getOrCreateUser(record, guild) }
+                    if (altRecord != null) {
+                        databaseService.users.resetUserRecord(guild, altRecord)
+                        response += ", ${it.mention}"
+                    }
+                }
+            }
+        }
+        respond(response)
+        respondMenu { createHistoryEmbed(target, guildMember, guild, configuration, databaseService) }
+    }
+}
diff --git a/src/main/kotlin/me/ddivad/judgebot/dataclasses/GuildMember.kt b/src/main/kotlin/me/ddivad/judgebot/dataclasses/GuildMember.kt
@@ -78,6 +78,10 @@ data class GuildMember(
         this.notes.clear()
     }
 
+    private fun cleanseInfo(guild: Guild) = with(this.getGuildInfo(guild.id.value)) {
+        this.info.clear()
+    }
+
     fun cleanseInfractions(guild: Guild) = with(this.getGuildInfo(guild.id.value)) {
         this.infractions.clear()
         this.points = 0
@@ -121,6 +125,15 @@ data class GuildMember(
         return@with this.points
     }
 
+    fun reset(guild: Guild) = with(this.getGuildInfo(guild.id.value)) {
+        this.points = 0
+        this.historyCount = 0
+        this.deletedMessageCount.deleteReaction = 0
+        cleanseInfo(guild)
+        cleanseInfractions(guild)
+        cleanseNotes(guild)
+    }
+
     fun ensureGuildDetailsPresent(guildId: String) {
         if (this.guilds.any { it.guildId == guildId }) return
         this.guilds.add(GuildMemberDetails(guildId))
diff --git a/src/main/kotlin/me/ddivad/judgebot/services/database/JoinLeaveOperations.kt b/src/main/kotlin/me/ddivad/judgebot/services/database/JoinLeaveOperations.kt
@@ -1,6 +1,7 @@
 package me.ddivad.judgebot.services.database
 
 import com.gitlab.kordlib.core.entity.Member
+import com.gitlab.kordlib.core.entity.User
 import me.ddivad.judgebot.dataclasses.JoinLeave
 import me.jakejmattson.discordkt.api.annotations.Service
 import org.joda.time.DateTime
@@ -36,4 +37,11 @@ class JoinLeaveOperations(connection: ConnectionService) {
             )
         ).toList()
     }
+
+    suspend fun createJoinLeaveRecordIfNotRecorded(guildId: String, target: Member) {
+        if (this.getMemberJoinLeaveDataForGuild(guildId, target.id.value).isNotEmpty()) {
+            return
+        }
+        this.createJoinLeaveRecord(guildId, target)
+    }
 }
diff --git a/src/main/kotlin/me/ddivad/judgebot/services/database/UserOperations.kt b/src/main/kotlin/me/ddivad/judgebot/services/database/UserOperations.kt
@@ -11,14 +11,21 @@ import me.jakejmattson.discordkt.api.annotations.Service
 import org.litote.kmongo.eq
 
 @Service
-class UserOperations(connection: ConnectionService, private val configuration: Configuration) {
+class UserOperations(
+    connection: ConnectionService,
+    private val configuration: Configuration,
+    private val joinLeaveService: JoinLeaveOperations
+) {
     private val userCollection = connection.db.getCollection<GuildMember>("Users")
 
     suspend fun getOrCreateUser(target: User, guild: Guild): GuildMember {
         val userRecord = userCollection.findOne(GuildMember::userId eq target.id.value)
         return if (userRecord != null) {
             userRecord.ensureGuildDetailsPresent(guild.id.value)
             userRecord.checkPointDecay(guild, configuration[guild.id.longValue]!!)
+            target.asMemberOrNull(guild.id)?.let {
+                joinLeaveService.createJoinLeaveRecordIfNotRecorded(guild.id.value, it)
+            }
             userRecord
         } else {
             val guildMember = GuildMember(target.id.value)
@@ -37,7 +44,13 @@ class UserOperations(connection: ConnectionService, private val configuration: C
         return this.updateUser(user)
     }
 
-    suspend fun editNote(guild: Guild, user: GuildMember, noteId: Int, newContent: String, moderator: String): GuildMember {
+    suspend fun editNote(
+        guild: Guild,
+        user: GuildMember,
+        noteId: Int,
+        newContent: String,
+        moderator: String
+    ): GuildMember {
         user.editNote(guild, noteId, newContent, moderator)
         return this.updateUser(user)
     }
@@ -99,6 +112,11 @@ class UserOperations(connection: ConnectionService, private val configuration: C
         return this.updateUser(user)
     }
 
+    suspend fun resetUserRecord(guild: Guild, user: GuildMember): GuildMember {
+        user.reset(guild)
+        return this.updateUser(user)
+    }
+
     private suspend fun updateUser(user: GuildMember): GuildMember {
         userCollection.updateOne(GuildMember::userId eq user.userId, user)
         return user

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ fun createInfractionCommands(databaseService: DatabaseService,`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
`99`		`- guildCommand("cleanse") {`
	`99`	`+ guildCommand("cleanseInfractions") {`
`100`	`100`	`description = "Use this to delete (permanently) as user's infractions."`
`101`	`101`	`requiredPermissionLevel = PermissionLevel.Administrator`
`102`	`102`	`execute(LowerUserArg) {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ fun noteCommands(databaseService: DatabaseService) = commands("Notes") {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- guildCommand("cleansenotes") {`
	`55`	`+ guildCommand("cleanseNotes") {`
`56`	`56`	`description = "Use this to delete (permanently) as user's notes."`
`57`	`57`	`requiredPermissionLevel = PermissionLevel.Administrator`
`58`	`58`	`execute(LowerMemberArg) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package me.ddivad.judgebot.services.database`
`2`	`2`
`3`	`3`	`import com.gitlab.kordlib.core.entity.Member`
	`4`	`+import com.gitlab.kordlib.core.entity.User`
`4`	`5`	`import me.ddivad.judgebot.dataclasses.JoinLeave`
`5`	`6`	`import me.jakejmattson.discordkt.api.annotations.Service`
`6`	`7`	`import org.joda.time.DateTime`
`@@ -36,4 +37,11 @@ class JoinLeaveOperations(connection: ConnectionService) {`
`36`	`37`	`)`
`37`	`38`	`).toList()`
`38`	`39`	`}`
	`40`	`+`
	`41`	`+ suspend fun createJoinLeaveRecordIfNotRecorded(guildId: String, target: Member) {`
	`42`	`+ if (this.getMemberJoinLeaveDataForGuild(guildId, target.id.value).isNotEmpty()) {`
	`43`	`+ return`
	`44`	`+ }`
	`45`	`+ this.createJoinLeaveRecord(guildId, target)`
	`46`	`+ }`
`39`	`47`	`}`