build: 1.3.2

cssxsh · Oct 28, 2021 · d86e9ec · d86e9ec
1 parent 30a2129
commit d86e9ec
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "xyz.cssxsh"
-version = "1.3.1"
+version = "1.3.2"
 
 mavenCentralPublish {
     useCentralS01()

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,10 +1,10 @@
 
 object Versions {
     // mirai
-    const val mirai = "2.6.7"
+    const val mirai = "2.7.1"
     // kotlin
-    const val kotlin = "1.5.21"
-    const val ktor = "1.5.1"
+    const val kotlin = "1.5.31"
+    const val ktor = "1.5.4"
     // other
     const val junit = "5.2.0"
 }
diff --git a/src/main/kotlin/xyz/cssxsh/arknights/penguin/Data.kt b/src/main/kotlin/xyz/cssxsh/arknights/penguin/Data.kt
@@ -176,7 +176,7 @@ fun <V : TimePeriod> Iterable<V>.now() = time(OffsetDateTime.now())
 typealias I18n<T> = Map<String, T>
 
 object OffsetDataTimeSerializer : KSerializer<OffsetDateTime> {
-    @OptIn(InternalSerializationApi::class)
+    @OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
     override val descriptor: SerialDescriptor
         get() = buildSerialDescriptor(OffsetDateTime::class.qualifiedName!!, PrimitiveKind.LONG)
 

diff --git a/src/main/kotlin/xyz/cssxsh/arknights/weibo/Status.kt b/src/main/kotlin/xyz/cssxsh/arknights/weibo/Status.kt
@@ -18,7 +18,11 @@ const val BLOG_API = "https://m.weibo.cn/api/container/getIndex"
 const val CONTENT_API = "https://m.weibo.cn/statuses/extend"
 
 private fun File.readMicroBlogHistory(type: BlogUser): List<MicroBlog> {
-    return read<Temp<WeiboData>>(type).data().cards.map { it.blog }
+    return if (type == BlogUser.PICTURE) {
+        emptyList()
+    } else {
+        read<Temp<WeiboData>>(type).data().cards.map { it.blog }
+    }
 }
 
 private fun File.readMicroBlogPicture(type: BlogUser): List<MicroBlog> {
@@ -192,13 +196,13 @@ private val PictureData.blogs get() = cards.flatMap { it.group }.flatMap { it.pi
 @Serializable
 private data class PictureData(
     @SerialName("cards")
-    val cards: List<PictureCard>
+    val cards: List<PictureCard> = emptyList()
 )
 
 @Serializable
 private data class PictureCard(
     @SerialName("card_group")
-    val group: List<PictureCardGroup>,
+    val group: List<PictureCardGroup> = emptyList()
 )
 
 @Serializable

diff --git a/src/main/kotlin/xyz/cssxsh/mirai/plugin/ArknightsHelperPlugin.kt b/src/main/kotlin/xyz/cssxsh/mirai/plugin/ArknightsHelperPlugin.kt
@@ -7,7 +7,7 @@ import xyz.cssxsh.arknights.*
 import xyz.cssxsh.mirai.plugin.command.*
 
 object ArknightsHelperPlugin : KotlinPlugin(
-    JvmPluginDescription("xyz.cssxsh.mirai.plugin.arknights-helper", "1.3.1") {
+    JvmPluginDescription("xyz.cssxsh.mirai.plugin.arknights-helper", "1.3.2") {
         name("arknights-helper")
         author("cssxsh")
     }