fix:recall and rank

Author: Nekoer

build.gradle.kts

@@ -1,19 +1,19 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    val kotlinVersion = "1.6.10"
+    val kotlinVersion = "1.6.21"
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.serialization") version kotlinVersion
 
 
     id("org.jetbrains.kotlin.plugin.noarg") version kotlinVersion
     id("org.jetbrains.kotlin.plugin.allopen") version kotlinVersion
-    id("net.mamoe.mirai-console") version "2.11.0-RC2"
+    id("net.mamoe.mirai-console") version "2.11.1"
     id("me.him188.maven-central-publish") version "1.0.0-dev-3"
 }
 
 group = "com.hcyacg"
-version = "1.7.2"
+version = "1.7.2-fix"
 
 repositories {
 //    mavenLocal()

src/main/kotlin/com/hcyacg/Helper.kt

@@ -57,6 +57,7 @@ object Helper {
             .plus(" ·切换转发开关").plus("\n")
             .plus(" ·切换图片转发开关").plus("\n")
             .plus(" ·切换晶格化开关").plus("\n")
+            .plus(" ·设置撤回").plus("\n")
             .plus(" ·(开启|关闭)(pixiv|yande|lolicon|local|konachan) 例: 开启pixiv").plus("\n")
             .plus(" ·(开启|关闭)(ascii2d|google|saucenao|yandex|iqdb) 例: 开启ascii2d").plus("\n")
         event.subject.sendMessage(message)
@@ -283,4 +284,20 @@ object Helper {
             .plus("saucenao:${Config.enable.search.saucenao}").plus("\n")
             .plus("yandex:${Config.enable.search.yandex}")
     }
+
+    /**
+     * 修改撤回
+     */
+    suspend fun changeRecall(event: GroupMessageEvent){
+        if (!Setting.admins.contains(event.sender.id.toString())) {
+            event.subject.sendMessage(At(event.sender).plus("\n").plus("您没有权限设置"))
+            return
+        }
+
+        var message = event.message.contentToString()
+        message = message.replace("设置撤回", "")
+        Config.recall = message.toLong()
+        Config.save()
+        event.subject.sendMessage("撤回时间已修改,当前为${Config.recall}ms")
+    }
 }

src/main/kotlin/com/hcyacg/Pixiv.kt

@@ -23,7 +23,7 @@ object Pixiv : KotlinPlugin(
     JvmPluginDescription(
         id = "com.hcyacg.pixiv",
         name = "pixiv插画",
-        version = "1.7.2",
+        version = "1.7.2-fix",
     ) {
         author("Nekoer")
         info("""pixiv插画""")
@@ -111,7 +111,11 @@ object Pixiv : KotlinPlugin(
                     this
                 )
             }
-
+            content { message.contentToString().contains("设置撤回") } quoteReply {
+                Helper.changeRecall(
+                    this
+                )
+            }
 
             val enableSetu = Pattern.compile("(?i)^(关闭|开启)(pixiv|yande|lolicon|local|konachan)\$")
             content { enableSetu.matcher(message.contentToString()).find() } quoteReply { Helper.enableSetu(this) }

src/main/kotlin/com/hcyacg/initial/Config.kt

@@ -31,7 +31,7 @@ object Config : AutoSavePluginConfig("Config") {
 
     @ValueName("recall")
     @ValueDescription("自动撤回 涩图专用 单位ms")
-    var recall: Long = 5000
+    var recall: Long by value(5000L)
 
     @ValueName("tlsVersion")
     var tlsVersion: String by value("TLSv1.2")

src/main/kotlin/com/hcyacg/rank/Rank.kt

@@ -122,7 +122,6 @@ object Rank {
             }
             data = TotalProcessing().dealWith("illust", mode, page, perPage, date)
 
-
             /**
              * 针对数据为空进行通知
              */
@@ -131,6 +130,14 @@ object Rank {
                 return
             }
 
+            if (null != data.jsonObject["code"]){
+                if (data.jsonObject["code"].toString().toInt() == 400){
+                    event.subject.sendMessage("需要会员,请购买后使用")
+                    return
+                }
+            }
+
+
 
             var message: Message = At(event.sender).plus("\n").plus("======插画排行榜($mode)======").plus("\n")
             val illusts = data.jsonObject["illusts"]?.jsonArray