Merge branch 'dev' into stable

StarWishsama · Oct 24, 2021 · 4045767 · 4045767
2 parents 92c3827 + 36ce2c8
commit 4045767
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -56,8 +56,8 @@ dependencies {
 
     implementation("net.mamoe:mirai-core-all:$miraiVersion")
 
-    implementation 'cn.hutool:hutool-http:5.7.13'
-    implementation 'cn.hutool:hutool-crypto:5.7.13'
+    implementation 'cn.hutool:hutool-http:5.7.15'
+    implementation 'cn.hutool:hutool-crypto:5.7.15'
 
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'org.apache.commons:commons-io:1.3.2'
@@ -84,7 +84,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-jackson:2.9.0'
 
     // Jline a Java library for handling console input @ https://github.com/jline/jline3
-    implementation 'org.jline:jline:3.20.0'
+    implementation 'org.jline:jline:3.21.0'
 
     // Jansi needed by JLine
     implementation 'org.fusesource.jansi:jansi:2.4.0'

diff --git a/src/main/kotlin/io/github/starwishsama/comet/commands/chats/ArkNightCommand.kt b/src/main/kotlin/io/github/starwishsama/comet/commands/chats/ArkNightCommand.kt
@@ -30,7 +30,7 @@ class ArkNightCommand : ChatCommand {
     override suspend fun execute(event: MessageEvent, args: List<String>, user: CometUser): MessageChain {
         if (!GachaService.isArkNightUsable()) {
             return if (GachaService.isDownloading()) {
-                "正在下载明日方舟数据, 请稍后...".toChain()
+                "正在下载明日方舟数据, 请稍候...".toChain()
             } else {
                 GachaService.downloadArkNightData()
                 "还未下载明日方舟数据, 开始自动下载...".toChain()

diff --git a/src/main/kotlin/io/github/starwishsama/comet/commands/chats/BiliBiliCommand.kt b/src/main/kotlin/io/github/starwishsama/comet/commands/chats/BiliBiliCommand.kt
@@ -93,7 +93,7 @@ class BiliBiliCommand : ChatCommand {
                         }
                     }
 
-                    return "正在刷新动态, 请稍后".toChain()
+                    return "正在刷新动态, 请稍候".toChain()
                 } else {
                     toChain("抱歉, 该命令仅限群聊使用!")
                 }

diff --git a/src/main/kotlin/io/github/starwishsama/comet/service/command/JikiPediaService.kt b/src/main/kotlin/io/github/starwishsama/comet/service/command/JikiPediaService.kt
@@ -20,6 +20,6 @@ object JikiPediaService {
     fun searchJiki(event: MessageEvent, input: String): MessageChain {
         NetworkRequestManager.addTask(JikiPediaRequestTask(event.subject, input))
 
-        return "请稍后...".toChain()
+        return "请稍候...".toChain()
     }
 }
diff --git a/src/main/kotlin/io/github/starwishsama/comet/service/command/NoAbbrService.kt b/src/main/kotlin/io/github/starwishsama/comet/service/command/NoAbbrService.kt
@@ -20,6 +20,6 @@ object NoAbbrService {
     fun parseAbbr(event: MessageEvent, input: String): MessageChain {
         NetworkRequestManager.addTask(NoAbbrRequestTask(event.subject, input))
 
-        return "请稍后...".toChain()
+        return "请稍候...".toChain()
     }
 }