InsanusMokrassar/tgbotapi
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/TelegramBotAPI.git synced 2024-11-26 03:58:44 +00:00
Code Releases Activity

fixes in passport errors serialization and replacing of PassportElementError

Browse Source
This commit is contained in:
InsanusMokrassar 2021-01-22 23:14:24 +06:00
parent f3590762f3
commit cdcfaf5a29
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/SetPassportDataErrors.kt
View File

@ -2,7 +2,7 @@ package dev.inmo.tgbotapi.requests
import dev.inmo.tgbotapi.requests.abstracts.Request import dev.inmo.tgbotapi.requests.abstracts.Request
import dev.inmo.tgbotapi.types.* import dev.inmo.tgbotapi.types.*
import dev.inmo.tgbotapi.types.passport.errors.PassportElementError import dev.inmo.tgbotapi.types.passport.PassportElementError
import kotlinx.serialization.* import kotlinx.serialization.*
import kotlinx.serialization.builtins.serializer import kotlinx.serialization.builtins.serializer

38
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/errors/PassportElementError.kt → tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/PassportElementError.kt
View File

@ -1,11 +1,17 @@
package dev.inmo.tgbotapi.types.passport.errors @file:Suppress("unused", "EXPERIMENTAL_API_USAGE")
package dev.inmo.tgbotapi.types.passport
import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer import dev.inmo.micro_utils.serialization.base64.Base64StringSerializer
import dev.inmo.tgbotapi.types.* import dev.inmo.tgbotapi.types.*
import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.* import dev.inmo.tgbotapi.types.passport.encrypted_data.abstracts.*
import dev.inmo.tgbotapi.types.passport.encrypted_data.type import dev.inmo.tgbotapi.types.passport.encrypted_data.type
import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
import kotlinx.serialization.* import kotlinx.serialization.*
import kotlinx.serialization.descriptors.SerialDescriptor
import kotlinx.serialization.encoding.Decoder
import kotlinx.serialization.encoding.Encoder import kotlinx.serialization.encoding.Encoder
import kotlinx.serialization.json.*
@Serializable(PassportElementErrorSerializer::class) @Serializable(PassportElementErrorSerializer::class)
sealed class PassportElementError { sealed class PassportElementError {
@ -14,8 +20,33 @@ sealed class PassportElementError {
abstract val message: String abstract val message: String
} }
@Serializer(PassportElementError::class) data class UnknownPassportElementError(
internal object PassportElementErrorSerializer : KSerializer<PassportElementError> { val raw: JsonObject
) : PassportElementError() {
override val source: String = raw[sourceField] ?.jsonPrimitive ?.contentOrNull ?: ""
override val type: String = raw[typeField] ?.jsonPrimitive ?.contentOrNull ?: ""
override val message: String = raw[messageField] ?.jsonPrimitive ?.contentOrNull ?: ""
}
object PassportElementErrorSerializer : KSerializer<PassportElementError> {
private val jsonObjectSerializer = JsonObject.serializer()
override val descriptor: SerialDescriptor
get() = jsonObjectSerializer.descriptor
override fun deserialize(decoder: Decoder): PassportElementError {
val json = jsonObjectSerializer.deserialize(decoder)
return when (json[sourceField] ?.jsonPrimitive ?.content) {
"dataField" -> nonstrictJsonFormat.decodeFromJsonElement(PassportElementErrorDataField.serializer(), json)
"frontSideField" -> nonstrictJsonFormat.decodeFromJsonElement(PassportElementErrorFrontSide.serializer(), json)
"reverseSideField" -> nonstrictJsonFormat.decodeFromJsonElement(PassportElementErrorReverseSide.serializer(), json)
"selfieField" -> nonstrictJsonFormat.decodeFromJsonElement(PassportElementErrorSelfie.serializer(), json)
"fileField" -> nonstrictJsonFormat.decodeFromJsonElement(PassportElementFileError.serializer(), json)
"filesField" -> nonstrictJsonFormat.decodeFromJsonElement(PassportElementFilesError.serializer(), json)
"translationFileField" -> nonstrictJsonFormat.decodeFromJsonElement(PassportElementErrorTranslationFile.serializer(), json)
"translationFilesField" -> nonstrictJsonFormat.decodeFromJsonElement(PassportElementErrorTranslationFiles.serializer(), json)
"unspecifiedField" -> nonstrictJsonFormat.decodeFromJsonElement(PassportElementErrorUnspecified.serializer(), json)
else -> UnknownPassportElementError(json)
}
}
override fun serialize(encoder: Encoder, value: PassportElementError) { override fun serialize(encoder: Encoder, value: PassportElementError) {
val neverMindAboutThisVariable = when (value) { val neverMindAboutThisVariable = when (value) {
is PassportElementErrorFrontSide -> PassportElementErrorFrontSide.serializer().serialize(encoder, value) is PassportElementErrorFrontSide -> PassportElementErrorFrontSide.serializer().serialize(encoder, value)
@ -27,6 +58,7 @@ internal object PassportElementErrorSerializer : KSerializer<PassportElementErro
is PassportElementErrorDataField -> PassportElementErrorDataField.serializer().serialize(encoder, value) is PassportElementErrorDataField -> PassportElementErrorDataField.serializer().serialize(encoder, value)
is PassportElementErrorFiles -> PassportElementErrorFiles.serializer().serialize(encoder, value) is PassportElementErrorFiles -> PassportElementErrorFiles.serializer().serialize(encoder, value)
is PassportElementErrorTranslationFiles -> PassportElementErrorTranslationFiles.serializer().serialize(encoder, value) is PassportElementErrorTranslationFiles -> PassportElementErrorTranslationFiles.serializer().serialize(encoder, value)
is UnknownPassportElementError -> jsonObjectSerializer.serialize(encoder, value.raw)
} }
} }
} }