github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-02 12:50:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix getRawGroupHonorListData, getRawGroupActiveData (#1616)

Browse Source
This commit is contained in:
Karlatemp 2021-10-28 20:44:00 +08:00 committed by GitHub
parent 527fe08446
commit e61fbbcc70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
binary-compatibility-validator/android/api/binary-compatibility-validator-android.api
View File

@ -1201,9 +1201,7 @@ public final class net/mamoe/mirai/data/GroupHonorListData$GroupHonorTypeSeriali
} }
public final class net/mamoe/mirai/data/GroupHonorListData$Language { public final class net/mamoe/mirai/data/GroupHonorListData$Language {
public static final field Companion Lnet/mamoe/mirai/data/GroupHonorListData$Language$Companion;
public fun <init> ()V public fun <init> ()V
public synthetic fun <init> (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;)V public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;)V
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Ljava/lang/String; 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 final fun getScript ()Ljava/lang/String;
public fun hashCode ()I public fun hashCode ()I
public fun toString ()Ljava/lang/String; 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 { public final class net/mamoe/mirai/data/GroupHonorListData$LevelName {

19
binary-compatibility-validator/api/binary-compatibility-validator.api
View File

@ -1201,9 +1201,7 @@ public final class net/mamoe/mirai/data/GroupHonorListData$GroupHonorTypeSeriali
} }
public final class net/mamoe/mirai/data/GroupHonorListData$Language { public final class net/mamoe/mirai/data/GroupHonorListData$Language {
public static final field Companion Lnet/mamoe/mirai/data/GroupHonorListData$Language$Companion;
public fun <init> ()V public fun <init> ()V
public synthetic fun <init> (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;)V public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;)V
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Ljava/lang/String; 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 final fun getScript ()Ljava/lang/String;
public fun hashCode ()I public fun hashCode ()I
public fun toString ()Ljava/lang/String; 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 { public final class net/mamoe/mirai/data/GroupHonorListData$LevelName {

16
mirai-core-api/src/commonMain/kotlin/data/GroupHonorListData.kt
View File

@ -42,8 +42,6 @@ public enum class GroupHonorType(public val value: Int) {
@MiraiExperimentalApi @MiraiExperimentalApi
@Serializable @Serializable
public data class GroupHonorListData( public data class GroupHonorListData(
@SerialName("acceptLanguages")
val acceptLanguages: List<Language?>? = null,
@SerialName("gc") @SerialName("gc")
val gc: String?, val gc: String?,
@ -106,7 +104,19 @@ public data class GroupHonorListData(
@SerialName("hwExcellentList") @SerialName("hwExcellentList")
val hwExcellentList: List<Actor?>? = null val hwExcellentList: List<Actor?>? = null
) { ) {
@Serializable
@Deprecated(
message = "Meaningless response",
level = DeprecationLevel.ERROR,
replaceWith = ReplaceWith("error(\"Delete me\")"),
)
@Suppress("DEPRECATION_ERROR")
val acceptLanguages: List<Language?>? get() = null
@Deprecated(
message = "Meaningless response",
level = DeprecationLevel.ERROR,
)
public data class Language( public data class Language(
@SerialName("code") @SerialName("code")
val code: String? = null, val code: String? = null,

2
mirai-core/src/commonMain/kotlin/MiraiImpl.kt
View File

@ -585,7 +585,7 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor {
@OptIn(InternalAPI::class) // ktor bug @OptIn(InternalAPI::class) // ktor bug
append( append(
"cookie", "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")};"
) )
} }
} }