feat: adapt to Lolicon API v2

BREAKING CHANGE: Simple getting is now adapted to Lolicon API v2. Upgrade mirai-console to 2.7-M2

Author: Samarium150

build.gradle.kts

@@ -5,22 +5,22 @@ plugins {
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.serialization") version kotlinVersion
 
-    id("net.mamoe.mirai-console") version "2.7-M1"
-    id("org.jetbrains.dokka") version "1.4.32"
+    id("net.mamoe.mirai-console") version "2.7-M2"
+    id("org.jetbrains.dokka") version "1.5.0"
     id("com.geoffgranum.gradle-conventional-changelog") version "0.3.1"
 }
 
 group = "com.github.samarium150"
-version = "3.4.1"
+version = "4.0.0-beta.1"
 
 repositories {
     mavenLocal()
+    maven(url="https://maven.aliyun.com/repository/public")
     mavenCentral()
 }
 
 dependencies {
-    implementation("com.google.code.gson:gson:+")
-    implementation("com.github.kittinunf.fuel:fuel:+")
+    implementation("io.ktor:ktor-client-serialization:1.5.4")
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {

src/main/kotlin/APIException.kt

@@ -3,7 +3,6 @@ package com.github.samarium150.mirai.plugin
 import net.mamoe.mirai.console.data.AutoSavePluginConfig
 import net.mamoe.mirai.console.data.ValueDescription
 import net.mamoe.mirai.console.data.value
-import net.mamoe.mirai.console.util.ConsoleExperimentalApi
 
 /**
  * Command config
@@ -19,9 +18,7 @@ object CommandConfig: AutoSavePluginConfig("CommandConfig") {
      * Composite command secondary names
      * <br>
      * 复合命令的别名
-     * 目前还是实验性配置
      */
-    @ConsoleExperimentalApi
     @ValueDescription("复合命令的别名")
     val lolicon: Array<String> by value(arrayOf("涩图"))
 }

src/main/kotlin/CommandConfig.kt

@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable
  * <br>
  * 执行get命令时的配置
  *
- * @property apikey [PluginConfig.apikey]
+// * @property apikey [PluginConfig.apikey]
  * @property r18 [PluginData.customR18Users] and [PluginData.customR18Groups]
  * @property recall [PluginConfig.recall]
  * @property cooldown [PluginConfig.cooldown]
@@ -36,21 +36,21 @@ import org.jetbrains.annotations.Nullable
  * @see PluginData
  */
 data class ExecutionConfig(
-    var apikey: String = PluginConfig.apikey,
+//    var apikey: String = PluginConfig.apikey,
     var r18: Int = 0,
     var recall: Int = PluginConfig.recall,
     var cooldown: Int = PluginConfig.cooldown
 ) {
-    /**
-     * Set [apikey] to [value]
-     * <br>
-     * 将 [apikey] 的值设置为 [value]
-     *
-     * @param value Input value <br> 输入的值
-     */
-    private fun setAPIKey(@Nullable value: String?) {
-        if (value != null) apikey = value
-    }
+//    /**
+//     * Set [apikey] to [value]
+//     * <br>
+//     * 将 [apikey] 的值设置为 [value]
+//     *
+//     * @param value Input value <br> 输入的值
+//     */
+//    private fun setAPIKey(@Nullable value: String?) {
+//        if (value != null) apikey = value
+//    }
 
     /**
      * Set [r18] to [value]
@@ -100,13 +100,13 @@ data class ExecutionConfig(
             val config = ExecutionConfig()
             when (subject) {
                 is User -> {
-                    config.setAPIKey(PluginData.customAPIKeyUsers[subject.id])
+//                    config.setAPIKey(PluginData.customAPIKeyUsers[subject.id])
                     config.setR18(PluginData.customR18Users[subject.id])
                     config.setRecall(PluginData.customRecallUsers[subject.id])
                     config.setCooldown(PluginData.customCooldownUsers[subject.id])
                 }
                 is Group -> {
-                    config.setAPIKey(PluginData.customAPIKeyGroups[subject.id])
+//                    config.setAPIKey(PluginData.customAPIKeyGroups[subject.id])
                     config.setR18(PluginData.customR18Groups[subject.id])
                     config.setRecall(PluginData.customRecallGroups[subject.id])
                     config.setCooldown(PluginData.customCooldownGroups[subject.id])

src/main/kotlin/ExecutionConfig.kt

@@ -16,7 +16,9 @@
  */
 package com.github.samarium150.mirai.plugin
 
-import kotlin.reflect.full.memberProperties
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 
 /**
  * The image information returned by Lolicon API
@@ -28,41 +30,32 @@ import kotlin.reflect.full.memberProperties
  * @property uid Author UID <br> 作者UID
  * @property title Image title <br> 图片标题
  * @property author Author's name <br> 作者名字
- * @property url Link to the image <br> 图片链接
  * @property r18 R18 category <br> 是否为R18
  * @property width Width of the image <br> 宽度
  * @property height Height of the image <br> 高度
  * @property tags Image tags <br> 标签
+ * @property urls Image urls <br> 链接
  * @constructor Create an Image data instance <br> 实例化图片数据
- * @see Response
+ * @see ResponseBody
  */
-data class ImageData (
+@Serializable
+data class ImageData(
     val pid: Int,
     val p: Int,
     val uid: Int,
     val title: String,
     val author: String,
-    val url: String,
     val r18: Boolean,
     val width: Int,
     val height: Int,
-    val tags: ArrayList<String>
+    val tags: List<String>,
+    val ext: String,
+    val uploadDate: Long,
+    val urls: Map<String, String>
 ) {
 
-    /**
-     * Return the string representation
-     * <br>
-     * 字符串化该类
-     *
-     * @return the string representation <br> 类的字符串表示
-     */
     override fun toString(): String {
-        var result = "ImageData({"
-        for (props in ImageData::class.memberProperties) {
-            result += "${props.name}: ${props.get(this)}, "
-        }
-        result = result.dropLast(2) + "})"
-        return result
+        return "ImageData" + Json.encodeToString(this)
     }
 
     /**
@@ -73,7 +66,7 @@ data class ImageData (
      * @return [String] readable information <br> 具有可读性的信息
      */
     fun toReadable(): String {
-        return(
+        return (
             "标题: ${title}\n" +
             "作者: $author (uid: ${uid})\n" +
             "标签: ${tags}\n" +