修复非管理员删除别人记录不显示提示的bug & 优化代码

Author: 365daysdreamer

README.md

@@ -39,26 +39,26 @@
 - @机器人<br>
   获取可用指令列表
 
-- 增加管理员 <@某人|对方QQ号><br>
+- 增加管理员 <@某人|QQ号><br>
 
-- 删除管理员 <@某人|对方QQ号><br>
+- 删除管理员 <@某人|QQ号><br>
 
 - 查看管理员<br>
 
 - 随机操作<br>
   获得一串由[↑, ↓, ←, →]组成的随机方向，玩家需要在直播+实录的同时，在关底boss对话过程中通过方向键输入进游戏里<br>
   在设置里可以设置验证码的长度，默认为10位验证码
 
-- 删除记录 <@某人|对方QQ号><br>
+- 删除记录 <@某人|QQ号><br>
   删除该用户申请的随机操作记录，参数为空则是删除自己的，只有管理员才能删除别人的操作记录<br>
   支持同时删除多位用户的记录，用空格隔开
 
-- 查询记录 <@某人|对方QQ号><br>
+- 查询记录 <@某人|QQ号><br>
   查询该用户申请的随机操作记录，参数为空则是查询自己的<br>
   为了防止刷屏，可以设置查询时显示验证码个数的限制，默认显示最后10条验证码<br>
   支持同时查询多位用户的记录，用空格隔开
 
-- 查询全部记录 <@某人|对方QQ号><br>
+- 查询全部记录 <@某人|QQ号><br>
   查询该用户申请的全部随机操作记录，参数为空则是查询自己的，只有管理员才能进行此操作<br>
   支持同时查询多位用户的记录，用空格隔开
 

src/main/kotlin/CommandHandler.kt

@@ -72,8 +72,7 @@ interface CommandHandler {
                 if (isAt) (message.getOrNull(2) as? PlainText)?.content?.trim()
                 else (message.getOrNull(1) as? PlainText)?.content?.trim()
             val msgContent = if (!msg.isNullOrEmpty()) msg else if (isAt) ShowTips.name else return
-            if (msgContent.contains("\n") || msgContent.contains("\r"))
-                return
+            if (msgContent.contains("\n") || msgContent.contains("\r")) return
             val msgSlices = msgContent.split(" ", limit = 2)
             val cmd = msgSlices[0]
             val content = msgSlices.getOrElse(1) { "" }
@@ -85,4 +84,4 @@ interface CommandHandler {
             }
         }
     }
-}
+}

src/main/kotlin/PluginMain.kt

@@ -17,7 +17,7 @@ internal object PluginMain : KotlinPlugin(
     JvmPluginDescription(
         id = "org.stg.verification.bot",
         name = "Touhou Replay Verification Code Generator Bot",
-        version = "1.0.0"
+        version = "1.1.0"
     )
 ) {
     override fun onEnable() {

src/main/kotlin/command/AddAdmin.kt

@@ -10,7 +10,7 @@ import org.stg.verification.bot.storage.TRVGConfig
 object AddAdmin : CommandHandler {
     override val name = "增加管理员"
 
-    override fun showTips(groupCode: Long, senderId: Long) = "$name 对方QQ号"
+    override fun showTips(groupCode: Long, senderId: Long) = "$name <@某人|QQ号>"
 
     override fun checkAuth(groupCode: Long, senderId: Long) = TRVGConfig.isSuperAdmin(senderId)
 
@@ -22,4 +22,4 @@ object AddAdmin : CommandHandler {
             else failed.joinToString(postfix = "已经是管理员了")
         return PlainText(result)
     }
-}
+}

src/main/kotlin/command/DeleteRecord.kt

@@ -10,7 +10,7 @@ import org.stg.verification.bot.storage.RandOperationHistory
 object DeleteRecord : CommandHandler {
     override val name = "删除记录"
 
-    override fun showTips(groupCode: Long, senderId: Long) = "$name 对方QQ号"
+    override fun showTips(groupCode: Long, senderId: Long) = "$name <@某人|QQ号>"
 
     override fun checkAuth(groupCode: Long, senderId: Long) = true
 
@@ -24,8 +24,12 @@ object DeleteRecord : CommandHandler {
             }
         } else {
             val (succeed, failed) = target
-                .filter { it == event.sender.id || PermData.isAdmin(event.sender.id) }
-                .partition { RandOperationHistory.deleteRecord(it) }
+                .partition {
+                    if (it == event.sender.id || PermData.isAdmin(event.sender.id))
+                        RandOperationHistory.deleteRecord(it)
+                    else
+                        false
+                }
             val result =
                 if (succeed.isNotEmpty()) {
                     succeed.joinToString(separator = "\n", prefix = "已清除记录：\n")
@@ -35,4 +39,4 @@ object DeleteRecord : CommandHandler {
             PlainText(result)
         }
     }
-}
+}

src/main/kotlin/command/GetAllRecords.kt

@@ -10,7 +10,7 @@ import org.stg.verification.bot.storage.RandOperationHistory
 object GetAllRecords : CommandHandler {
     override val name = "查询全部记录"
 
-    override fun showTips(groupCode: Long, senderId: Long) = "$name 对方QQ号"
+    override fun showTips(groupCode: Long, senderId: Long) = "$name <@某人|QQ号>"
 
     override fun checkAuth(groupCode: Long, senderId: Long) = PermData.isAdmin(senderId)
 
@@ -23,9 +23,9 @@ object GetAllRecords : CommandHandler {
             } else {
                 PlainText(result.joinToString(separator = "\n", prefix = "随机操作记录：\n"))
             }
-
         } else {
-            val result = target.mapNotNull { qqNumber ->
+            val result = target.mapNotNull {
+                qqNumber ->
                 RandOperationHistory.getAllRecords(qqNumber)?.let { listOf("$qqNumber:", *it.toTypedArray()) }
             }.flatten()
             if (result.isEmpty()) {
@@ -35,4 +35,4 @@ object GetAllRecords : CommandHandler {
             }
         }
     }
-}
+}

src/main/kotlin/command/GetRecord.kt

@@ -9,7 +9,7 @@ import org.stg.verification.bot.storage.RandOperationHistory
 object GetRecord : CommandHandler {
     override val name = "查询记录"
 
-    override fun showTips(groupCode: Long, senderId: Long) = "$name 对方QQ号"
+    override fun showTips(groupCode: Long, senderId: Long) = "$name <@某人|QQ号>"
 
     override fun checkAuth(groupCode: Long, senderId: Long) = true
 
@@ -19,20 +19,19 @@ object GetRecord : CommandHandler {
             val result = RandOperationHistory.getRecord(event.sender.id)
             if (result.isNullOrEmpty()) {
                 PlainText("未查询到记录")
-            }
-            else {
+            } else {
                 PlainText(result.joinToString(separator = "\n", prefix = "随机操作记录：\n"))
             }
         } else {
-            val result = target.mapNotNull { qqNumber ->
+            val result = target.mapNotNull {
+                qqNumber ->
                 RandOperationHistory.getRecord(qqNumber)?.let { listOf("$qqNumber:", *it.toTypedArray()) }
             }.flatten()
             if (result.isEmpty()) {
                 PlainText("未查询到记录")
-            }
-            else {
+            } else {
                 PlainText(result.joinToString(separator = "\n", prefix = "随机操作记录：\n"))
             }
         }
     }
-}
+}

src/main/kotlin/command/ListAllAdmin.kt

@@ -9,12 +9,12 @@ import org.stg.verification.bot.storage.PermData
 object ListAllAdmin : CommandHandler {
     override val name = "查看管理员"
 
-    override fun showTips(groupCode: Long, senderId: Long) = "$name"
+    override fun showTips(groupCode: Long, senderId: Long) = name
 
     override fun checkAuth(groupCode: Long, senderId: Long) = true
 
     override suspend fun execute(event: GroupMessageEvent, content: String): Message {
         val result = PermData.listAdmin().joinToString(separator = "\n", prefix = "管理员列表：\n")
         return PlainText(result)
     }
-}
+}

src/main/kotlin/command/RandOperation.kt

@@ -13,7 +13,7 @@ import kotlin.random.Random
 object RandOperation : CommandHandler {
     override val name = "随机操作"
 
-    override fun showTips(groupCode: Long, senderId: Long) = "$name"
+    override fun showTips(groupCode: Long, senderId: Long) = name
 
     override fun checkAuth(groupCode: Long, senderId: Long) = true
 

src/main/kotlin/command/RemoveAdmin.kt

@@ -10,7 +10,7 @@ import org.stg.verification.bot.storage.TRVGConfig
 object RemoveAdmin : CommandHandler {
     override val name = "删除管理员"
 
-    override fun showTips(groupCode: Long, senderId: Long) = "$name 对方QQ号"
+    override fun showTips(groupCode: Long, senderId: Long) = "$name <@某人|QQ号>"
 
     override fun checkAuth(groupCode: Long, senderId: Long) = TRVGConfig.isSuperAdmin(senderId)
 
@@ -26,4 +26,4 @@ object RemoveAdmin : CommandHandler {
             else failed.joinToString(postfix = "并不是管理员")
         return PlainText(result)
     }
-}
+}