From e61fbbcc702cb6dc2eefa74ac6cf7eb1603d5dc5 Mon Sep 17 00:00:00 2001 From: Karlatemp Date: Thu, 28 Oct 2021 20:44:00 +0800 Subject: [PATCH] Fix `getRawGroupHonorListData`, `getRawGroupActiveData` (#1616) --- ...binary-compatibility-validator-android.api | 19 ------------------- .../api/binary-compatibility-validator.api | 19 ------------------- .../kotlin/data/GroupHonorListData.kt | 16 +++++++++++++--- mirai-core/src/commonMain/kotlin/MiraiImpl.kt | 2 +- 4 files changed, 14 insertions(+), 42 deletions(-) diff --git a/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api b/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api index 0056ffc2e..c37336606 100644 --- a/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api +++ b/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api @@ -1201,9 +1201,7 @@ public final class net/mamoe/mirai/data/GroupHonorListData$GroupHonorTypeSeriali } public final class net/mamoe/mirai/data/GroupHonorListData$Language { - public static final field Companion Lnet/mamoe/mirai/data/GroupHonorListData$Language$Companion; public fun ()V - public synthetic fun (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;)V public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ljava/lang/String; @@ -1219,23 +1217,6 @@ public final class net/mamoe/mirai/data/GroupHonorListData$Language { public final fun getScript ()Ljava/lang/String; public fun hashCode ()I public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lnet/mamoe/mirai/data/GroupHonorListData$Language;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V -} - -public final class net/mamoe/mirai/data/GroupHonorListData$Language$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lnet/mamoe/mirai/data/GroupHonorListData$Language$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/data/GroupHonorListData$Language; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/data/GroupHonorListData$Language;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - -public final class net/mamoe/mirai/data/GroupHonorListData$Language$Companion { - public final fun serializer ()Lkotlinx/serialization/KSerializer; } public final class net/mamoe/mirai/data/GroupHonorListData$LevelName { diff --git a/binary-compatibility-validator/api/binary-compatibility-validator.api b/binary-compatibility-validator/api/binary-compatibility-validator.api index 1271f33ef..bfed8b2c8 100644 --- a/binary-compatibility-validator/api/binary-compatibility-validator.api +++ b/binary-compatibility-validator/api/binary-compatibility-validator.api @@ -1201,9 +1201,7 @@ public final class net/mamoe/mirai/data/GroupHonorListData$GroupHonorTypeSeriali } public final class net/mamoe/mirai/data/GroupHonorListData$Language { - public static final field Companion Lnet/mamoe/mirai/data/GroupHonorListData$Language$Companion; public fun ()V - public synthetic fun (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;)V public synthetic fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ljava/lang/String; @@ -1219,23 +1217,6 @@ public final class net/mamoe/mirai/data/GroupHonorListData$Language { public final fun getScript ()Ljava/lang/String; public fun hashCode ()I public fun toString ()Ljava/lang/String; - public static final fun write$Self (Lnet/mamoe/mirai/data/GroupHonorListData$Language;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V -} - -public final class net/mamoe/mirai/data/GroupHonorListData$Language$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lnet/mamoe/mirai/data/GroupHonorListData$Language$$serializer; - public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/data/GroupHonorListData$Language; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/data/GroupHonorListData$Language;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - -public final class net/mamoe/mirai/data/GroupHonorListData$Language$Companion { - public final fun serializer ()Lkotlinx/serialization/KSerializer; } public final class net/mamoe/mirai/data/GroupHonorListData$LevelName { diff --git a/mirai-core-api/src/commonMain/kotlin/data/GroupHonorListData.kt b/mirai-core-api/src/commonMain/kotlin/data/GroupHonorListData.kt index 6907a2e1d..84fcaedb9 100644 --- a/mirai-core-api/src/commonMain/kotlin/data/GroupHonorListData.kt +++ b/mirai-core-api/src/commonMain/kotlin/data/GroupHonorListData.kt @@ -42,8 +42,6 @@ public enum class GroupHonorType(public val value: Int) { @MiraiExperimentalApi @Serializable public data class GroupHonorListData( - @SerialName("acceptLanguages") - val acceptLanguages: List? = null, @SerialName("gc") val gc: String?, @@ -106,7 +104,19 @@ public data class GroupHonorListData( @SerialName("hwExcellentList") val hwExcellentList: List? = null ) { - @Serializable + + @Deprecated( + message = "Meaningless response", + level = DeprecationLevel.ERROR, + replaceWith = ReplaceWith("error(\"Delete me\")"), + ) + @Suppress("DEPRECATION_ERROR") + val acceptLanguages: List? get() = null + + @Deprecated( + message = "Meaningless response", + level = DeprecationLevel.ERROR, + ) public data class Language( @SerialName("code") val code: String? = null, diff --git a/mirai-core/src/commonMain/kotlin/MiraiImpl.kt b/mirai-core/src/commonMain/kotlin/MiraiImpl.kt index ad6ff82cd..a225f5be4 100644 --- a/mirai-core/src/commonMain/kotlin/MiraiImpl.kt +++ b/mirai-core/src/commonMain/kotlin/MiraiImpl.kt @@ -585,7 +585,7 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor { @OptIn(InternalAPI::class) // ktor bug append( "cookie", - "uin=o${bot.id}; skey=${bot.sKey}; p_uin=o${bot.id};" + "uin=o${bot.id}; skey=${bot.sKey}; p_uin=o${bot.id}; p_skey=${bot.psKey("qqweb.qq.com")};" ) } }