查询、生成指令回复时At使用者

验证码时间戳格式更改

Author: 365daysdreamer

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "org.stg.verification.bot"
-version = "1.2.3"
+version = "1.2.4"
 
 repositories {
     maven("https://maven.aliyun.com/repository/public")

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.2.3"
+        version = "1.2.4"
     )
 ) {
     /**

src/main/kotlin/command/GetAllRecord.kt

@@ -1,8 +1,7 @@
 package org.stg.verification.bot.command
 
 import net.mamoe.mirai.event.events.GroupMessageEvent
-import net.mamoe.mirai.message.data.Message
-import net.mamoe.mirai.message.data.PlainText
+import net.mamoe.mirai.message.data.*
 import org.stg.verification.bot.CommandHandler
 import org.stg.verification.bot.storage.RandOperationHistory
 
@@ -23,7 +22,8 @@ object GetAllRecord : CommandHandler {
 
     override suspend fun execute(event: GroupMessageEvent, content: String): Message {
         val target = extractQQ(event.message)
-        return if (target.isEmpty()) {
+        val message = MessageChainBuilder()
+        val text = if (target.isEmpty()) {
             val result = RandOperationHistory.getAllRecord(event.sender.id)
             if (result.isNullOrEmpty()) {
                 PlainText("未查询到记录")
@@ -41,5 +41,7 @@ object GetAllRecord : CommandHandler {
                 PlainText(result.joinToString(separator = "\n", prefix = "随机操作记录：\n"))
             }
         }
+        message.addAll(arrayOf(QuoteReply(event.source), text))
+        return message.build()
     }
 }

src/main/kotlin/command/GetRecord.kt

@@ -1,8 +1,7 @@
 package org.stg.verification.bot.command
 
 import net.mamoe.mirai.event.events.GroupMessageEvent
-import net.mamoe.mirai.message.data.Message
-import net.mamoe.mirai.message.data.PlainText
+import net.mamoe.mirai.message.data.*
 import org.stg.verification.bot.CommandHandler
 import org.stg.verification.bot.storage.RandOperationHistory
 import org.stg.verification.bot.storage.TRVGConfig
@@ -25,7 +24,8 @@ object GetRecord : CommandHandler {
 
     override suspend fun execute(event: GroupMessageEvent, content: String): Message {
         val target = extractQQ(event.message)
-        return if (target.isEmpty()) {
+        val message = MessageChainBuilder()
+        val text = if (target.isEmpty()) {
             val result = RandOperationHistory.getRecord(event.sender.id)
             if (result.isNullOrEmpty()) {
                 PlainText("未查询到记录")
@@ -43,5 +43,7 @@ object GetRecord : CommandHandler {
                 PlainText(result.joinToString(separator = "\n", prefix = "随机操作记录：\n"))
             }
         }
+        message.addAll(arrayOf(QuoteReply(event.source), text))
+        return message.build()
     }
 }

src/main/kotlin/command/RandOperation.kt

@@ -1,12 +1,10 @@
 package org.stg.verification.bot.command
 
 import net.mamoe.mirai.event.events.GroupMessageEvent
-import net.mamoe.mirai.message.data.Message
-import net.mamoe.mirai.message.data.PlainText
+import net.mamoe.mirai.message.data.*
 import org.stg.verification.bot.CommandHandler
 import org.stg.verification.bot.storage.RandOperationHistory
 import org.stg.verification.bot.storage.TRVGConfig
-import java.text.DateFormat
 import java.util.*
 import kotlin.random.Random
 
@@ -32,11 +30,12 @@ object RandOperation : CommandHandler {
         val record = StringBuilder()
         for (i in 1..TRVGConfig.randOperation.number)
             record.append(randOperations[Random.nextInt(randOperations.size)])
+        val message = MessageChainBuilder()
         val text = record.toString()
-        val now = Calendar.getInstance()
-        val time = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM, Locale.CHINA)
-        time.timeZone = TimeZone.getTimeZone("GMT+8:00")
-        record.append("\n${time.format(now.time)}")
+        val now = Calendar.getInstance(TimeZone.getTimeZone("GMT+8:00"))
+        val time = "${now.get(Calendar.YEAR)}/${now.get(Calendar.MONTH)}/${now.get(Calendar.DATE)} - " +
+                "${now.get(Calendar.HOUR_OF_DAY)}:${now.get(Calendar.MINUTE)}:${now.get(Calendar.SECOND)}"
+        record.append("\n$time")
         RandOperationHistory.addRecord(
             event.sender.id,
             if (content.split(" ", limit=2)[0].length > TRVGConfig.randOperation.tagLimit)
@@ -45,7 +44,8 @@ object RandOperation : CommandHandler {
                 content.split(" ", limit=2)[0],
             record.toString()
         )
-        return PlainText(text)
+        message.addAll(arrayOf(QuoteReply(event.source), PlainText(text)))
+        return message.build()
     }
 
     private val randOperations = arrayOf("↑", "↓", "←", "→")