mirror of
https://github.com/InsanusMokrassar/TelegramBotAPI.git
synced 2024-11-26 03:58:44 +00:00
fix in chat member deserializing
This commit is contained in:
parent
1a1fd926dd
commit
6273990b00
@ -4,6 +4,7 @@ import dev.inmo.tgbotapi.abstracts.WithUser
|
|||||||
import dev.inmo.tgbotapi.types.statusField
|
import dev.inmo.tgbotapi.types.statusField
|
||||||
import dev.inmo.tgbotapi.utils.RiskFeature
|
import dev.inmo.tgbotapi.utils.RiskFeature
|
||||||
import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
|
import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
|
||||||
|
import kotlinx.serialization.DeserializationStrategy
|
||||||
import kotlinx.serialization.KSerializer
|
import kotlinx.serialization.KSerializer
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
import kotlinx.serialization.descriptors.SerialDescriptor
|
import kotlinx.serialization.descriptors.SerialDescriptor
|
||||||
@ -15,13 +16,13 @@ import kotlinx.serialization.json.jsonPrimitive
|
|||||||
@Serializable(ChatMemberSerializer::class)
|
@Serializable(ChatMemberSerializer::class)
|
||||||
sealed interface ChatMember : WithUser {
|
sealed interface ChatMember : WithUser {
|
||||||
@Serializable
|
@Serializable
|
||||||
enum class Status(val status: String) {
|
enum class Status(val status: String, val deserializationStrategy: DeserializationStrategy<ChatMember>) {
|
||||||
Creator("creator"),
|
Creator("creator", OwnerChatMember.serializer()),
|
||||||
Administrator("administrator"),
|
Administrator("administrator", AdministratorChatMemberImpl.serializer()),
|
||||||
Member("member"),
|
Member("member", MemberChatMemberImpl.serializer()),
|
||||||
Restricted("restricted"),
|
Restricted("restricted", RestrictedChatMember.serializer()),
|
||||||
Left("left"),
|
Left("left", LeftChatMemberImpl.serializer()),
|
||||||
Kicked("kicked")
|
Kicked("kicked", KickedChatMember.serializer())
|
||||||
}
|
}
|
||||||
val status: Status
|
val status: Status
|
||||||
}
|
}
|
||||||
@ -32,17 +33,14 @@ object ChatMemberSerializer : KSerializer<ChatMember> {
|
|||||||
|
|
||||||
override fun deserialize(decoder: Decoder): ChatMember {
|
override fun deserialize(decoder: Decoder): ChatMember {
|
||||||
val json = JsonObject.serializer().deserialize(decoder)
|
val json = JsonObject.serializer().deserialize(decoder)
|
||||||
val status = ChatMember.Status.valueOf(
|
val status = json[statusField] ?.jsonPrimitive ?.content ?: error("Status field of chat member must be specified, but incoming json contains next: $json")
|
||||||
json[statusField] ?.jsonPrimitive ?.content ?: error("Status field of chat member must be specified, but incoming json contains next: $json")
|
return ChatMember.Status.values().firstNotNullOfOrNull {
|
||||||
)
|
if (it.status == status) {
|
||||||
return when (status) {
|
nonstrictJsonFormat.decodeFromJsonElement(it.deserializationStrategy, json)
|
||||||
ChatMember.Status.Creator -> nonstrictJsonFormat.decodeFromJsonElement(OwnerChatMember.serializer(), json)
|
} else {
|
||||||
ChatMember.Status.Administrator -> nonstrictJsonFormat.decodeFromJsonElement(AdministratorChatMemberImpl.serializer(), json)
|
null
|
||||||
ChatMember.Status.Member -> nonstrictJsonFormat.decodeFromJsonElement(MemberChatMemberImpl.serializer(), json)
|
}
|
||||||
ChatMember.Status.Restricted -> nonstrictJsonFormat.decodeFromJsonElement(RestrictedChatMember.serializer(), json)
|
} ?: error("Unknown type of chat member in json: $json")
|
||||||
ChatMember.Status.Left -> nonstrictJsonFormat.decodeFromJsonElement(LeftChatMemberImpl.serializer(), json)
|
|
||||||
ChatMember.Status.Kicked -> nonstrictJsonFormat.decodeFromJsonElement(KickedChatMember.serializer(), json)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun serialize(encoder: Encoder, value: ChatMember) {
|
override fun serialize(encoder: Encoder, value: ChatMember) {
|
||||||
|
Loading…
Reference in New Issue
Block a user