1
0
mirror of https://github.com/InsanusMokrassar/TelegramBotAPI.git synced 2024-11-23 02:28:45 +00:00

adapt code to new versions

This commit is contained in:
InsanusMokrassar 2019-11-29 12:25:22 +06:00
parent 6c5fc8144b
commit 128e69e3e3
5 changed files with 18 additions and 18 deletions

View File

@ -28,7 +28,9 @@
* `kotlin serialization`: 0.11.1 -> 0.14.0 * `kotlin serialization`: 0.11.1 -> 0.14.0
* `joda time`: 2.10.3 -> 2.10.5 * `joda time`: 2.10.3 -> 2.10.5
* `ktor`: 1.2.3 -> 1.2.5 * `ktor`: 1.2.3 -> 1.2.5
* `BotAction` now will be deserialized in a little bit other way
* `BotActionSerializer` now is internal
* Most part of serializers now are objects (instead of classes as was previously)
## 0.17.0 July 29, 2019 API Update ## 0.17.0 July 29, 2019 API Update

View File

@ -37,7 +37,7 @@ data class Username(
fun String.toUsername(): Username = Username(this) fun String.toUsername(): Username = Username(this)
@Serializer(ChatIdentifier::class) @Serializer(ChatIdentifier::class)
internal class ChatIdentifierSerializer: KSerializer<ChatIdentifier> { internal object ChatIdentifierSerializer : KSerializer<ChatIdentifier> {
override fun deserialize(decoder: Decoder): ChatIdentifier { override fun deserialize(decoder: Decoder): ChatIdentifier {
val id = decoder.decodeString() val id = decoder.decodeString()
return id.toLongOrNull() ?.let { return id.toLongOrNull() ?.let {

View File

@ -27,7 +27,7 @@ typealias Markdown = MarkdownParseMode
typealias HTML = HTMLParseMode typealias HTML = HTMLParseMode
@Serializer(ParseMode::class) @Serializer(ParseMode::class)
internal class ParseModeSerializerObject: KSerializer<ParseMode> { internal object ParseModeSerializerObject : KSerializer<ParseMode> {
override fun deserialize(decoder: Decoder): ParseMode { override fun deserialize(decoder: Decoder): ParseMode {
val mode = decoder.decodeString() val mode = decoder.decodeString()
return when (mode) { return when (mode) {

View File

@ -21,7 +21,7 @@ class TelegramDate(
fun DateTime.toTelegramDate(): TelegramDate = TelegramDate(this) fun DateTime.toTelegramDate(): TelegramDate = TelegramDate(this)
@Serializer(TelegramDate::class) @Serializer(TelegramDate::class)
internal class TelegramDateSerializer: KSerializer<TelegramDate> { internal object TelegramDateSerializer : KSerializer<TelegramDate> {
override fun serialize(encoder: Encoder, obj: TelegramDate) { override fun serialize(encoder: Encoder, obj: TelegramDate) {
encoder.encodeLong( encoder.encodeLong(
TimeUnit.MILLISECONDS.toSeconds(obj.asDate.millis) TimeUnit.MILLISECONDS.toSeconds(obj.asDate.millis)

View File

@ -2,31 +2,29 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.actions
import kotlinx.serialization.* import kotlinx.serialization.*
private val actions = listOf(
TypingAction,
UploadPhotoAction,
RecordVideoAction,
UploadVideoAction,
RecordAudioAction,
UploadAudioAction,
UploadDocumentAction,
FindLocationAction
)
@Serializable(BotActionSerializer::class) @Serializable(BotActionSerializer::class)
sealed class BotAction { sealed class BotAction {
abstract val actionName: String abstract val actionName: String
} }
@Serializer(BotAction::class) @Serializer(BotAction::class)
class BotActionSerializer: KSerializer<BotAction> { internal object BotActionSerializer: KSerializer<BotAction> {
override fun serialize(encoder: Encoder, obj: BotAction) { override fun serialize(encoder: Encoder, obj: BotAction) {
encoder.encodeString(obj.actionName) encoder.encodeString(obj.actionName)
} }
override fun deserialize(decoder: Decoder): BotAction { override fun deserialize(decoder: Decoder): BotAction {
val actionName = decoder.decodeString() return when (val actionName = decoder.decodeString()) {
return actions.firstOrNull { it.actionName == actionName } ?: throw IllegalStateException("Unknown action type: $actionName") TypingAction.actionName -> TypingAction
UploadPhotoAction.actionName -> UploadPhotoAction
RecordVideoAction.actionName -> RecordVideoAction
UploadVideoAction.actionName -> UploadVideoAction
RecordAudioAction.actionName -> RecordAudioAction
UploadAudioAction.actionName -> UploadAudioAction
UploadDocumentAction.actionName -> UploadDocumentAction
FindLocationAction.actionName -> FindLocationAction
else -> throw IllegalStateException("Unknown action type: $actionName")
}
} }
} }