InsanusMokrassar/tgbotapi
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/TelegramBotAPI.git synced 2024-09-27 21:16:09 +00:00
Code Releases Activity

fixes in support of text entities

Browse Source
This commit is contained in:
InsanusMokrassar 2024-05-10 16:31:56 +06:00
parent d56173eceb
commit b843fd9188
9 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tgbotapi.core/api/tgbotapi.core.api
View File

@ -8451,6 +8451,7 @@ public final class dev/inmo/tgbotapi/types/CommonKt {
public static final field temporaryRegistrationField Ljava/lang/String; public static final field temporaryRegistrationField Ljava/lang/String;
public static final field textEntitiesField Ljava/lang/String; public static final field textEntitiesField Ljava/lang/String;
public static final field textField Ljava/lang/String; public static final field textField Ljava/lang/String;
public static final field textParseModeField Ljava/lang/String;
public static final field tgWebAppStartParamField Ljava/lang/String; public static final field tgWebAppStartParamField Ljava/lang/String;
public static final field tgsStickerField Ljava/lang/String; public static final field tgsStickerField Ljava/lang/String;
public static final field themeNameField Ljava/lang/String; public static final field themeNameField Ljava/lang/String;
@ -23544,23 +23545,23 @@ public final class dev/inmo/tgbotapi/types/polls/SimplePollOption$Companion {
public final class dev/inmo/tgbotapi/types/polls/UnknownPollType : dev/inmo/tgbotapi/types/polls/Poll { public final class dev/inmo/tgbotapi/types/polls/UnknownPollType : dev/inmo/tgbotapi/types/polls/Poll {
public static final field Companion Ldev/inmo/tgbotapi/types/polls/UnknownPollType$Companion; public static final field Companion Ldev/inmo/tgbotapi/types/polls/UnknownPollType$Companion;
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;IZZLkotlinx/serialization/json/JsonObject;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;ILjava/util/List;ZZLkotlinx/serialization/json/JsonElement;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1-S5FO_mE ()Ljava/lang/String; public final fun component1-S5FO_mE ()Ljava/lang/String;
public final fun component2 ()Ljava/lang/String; public final fun component2 ()Ljava/lang/String;
public final fun component3 ()Ljava/util/List; public final fun component3 ()Ljava/util/List;
public final fun component4 ()Ljava/util/List; public final fun component4 ()I
public final fun component5 ()I public final fun component5 ()Ljava/util/List;
public final fun component6 ()Z public final fun component6 ()Z
public final fun component7 ()Z public final fun component7 ()Z
public final fun component8 ()Lkotlinx/serialization/json/JsonObject; public final fun component8 ()Lkotlinx/serialization/json/JsonElement;
public final fun copy-KILYFNk (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;IZZLkotlinx/serialization/json/JsonObject;)Ldev/inmo/tgbotapi/types/polls/UnknownPollType; public final fun copy-KILYFNk (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;ILjava/util/List;ZZLkotlinx/serialization/json/JsonElement;)Ldev/inmo/tgbotapi/types/polls/UnknownPollType;
public static synthetic fun copy-KILYFNk$default (Ldev/inmo/tgbotapi/types/polls/UnknownPollType;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;IZZLkotlinx/serialization/json/JsonObject;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/polls/UnknownPollType; public static synthetic fun copy-KILYFNk$default (Ldev/inmo/tgbotapi/types/polls/UnknownPollType;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;ILjava/util/List;ZZLkotlinx/serialization/json/JsonElement;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/polls/UnknownPollType;
public fun equals (Ljava/lang/Object;)Z public fun equals (Ljava/lang/Object;)Z
public fun getId-S5FO_mE ()Ljava/lang/String; public fun getId-S5FO_mE ()Ljava/lang/String;
public fun getOptions ()Ljava/util/List; public fun getOptions ()Ljava/util/List;
public fun getQuestion ()Ljava/lang/String; public fun getQuestion ()Ljava/lang/String;
public fun getQuestionTextSources ()Ljava/util/List; public fun getQuestionTextSources ()Ljava/util/List;
public final fun getRaw ()Lkotlinx/serialization/json/JsonObject; public final fun getRaw ()Lkotlinx/serialization/json/JsonElement;
public fun getScheduledCloseInfo ()Ldev/inmo/tgbotapi/types/polls/ScheduledCloseInfo; public fun getScheduledCloseInfo ()Ldev/inmo/tgbotapi/types/polls/ScheduledCloseInfo;
public fun getText ()Ljava/lang/String; public fun getText ()Ljava/lang/String;
public fun getTextSources ()Ljava/util/List; public fun getTextSources ()Ljava/util/List;
@ -25201,7 +25202,7 @@ public final class dev/inmo/tgbotapi/utils/EntitiesBuilderKt {
} }
public final class dev/inmo/tgbotapi/utils/ExtractDataAndJsonFromDecoderKt { public final class dev/inmo/tgbotapi/utils/ExtractDataAndJsonFromDecoderKt {
public static final fun extractDataAndJson (Lkotlinx/serialization/encoding/Decoder;Lkotlinx/serialization/DeserializationStrategy;)Lkotlin/Pair; public static final fun decodeDataAndJson (Lkotlinx/serialization/encoding/Decoder;Lkotlinx/serialization/DeserializationStrategy;)Lkotlin/Pair;
} }
public final class dev/inmo/tgbotapi/utils/IntProgress100Serializer : kotlinx/serialization/KSerializer { public final class dev/inmo/tgbotapi/utils/IntProgress100Serializer : kotlinx/serialization/KSerializer {

6
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/BackgroundFill.kt
View File

@ -2,15 +2,13 @@ package dev.inmo.tgbotapi.types
import dev.inmo.micro_utils.colors.common.HEXAColor import dev.inmo.micro_utils.colors.common.HEXAColor
import dev.inmo.tgbotapi.utils.IntRGB24HEXAColorSerializer import dev.inmo.tgbotapi.utils.IntRGB24HEXAColorSerializer
import dev.inmo.tgbotapi.utils.extractDataAndJson import dev.inmo.tgbotapi.utils.decodeDataAndJson
import dev.inmo.tgbotapi.utils.internal.ClassCastsIncluded import dev.inmo.tgbotapi.utils.internal.ClassCastsIncluded
import kotlinx.serialization.* import kotlinx.serialization.*
import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.descriptors.SerialDescriptor
import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Decoder
import kotlinx.serialization.encoding.Encoder import kotlinx.serialization.encoding.Encoder
import kotlinx.serialization.json.JsonDecoder
import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonElement
import kotlinx.serialization.json.decodeFromJsonElement
@ClassCastsIncluded @ClassCastsIncluded
@Serializable(BackgroundFill.Companion::class) @Serializable(BackgroundFill.Companion::class)
@ -100,7 +98,7 @@ sealed interface BackgroundFill {
get() = serializer.descriptor get() = serializer.descriptor
override fun deserialize(decoder: Decoder): BackgroundFill { override fun deserialize(decoder: Decoder): BackgroundFill {
val (raw, json) = decoder.extractDataAndJson(serializer) val (raw, json) = decoder.decodeDataAndJson(serializer)
return when (raw.type) { return when (raw.type) {
Solid.type -> Solid(color = raw.color ?: return Unknown(raw.type, json)) Solid.type -> Solid(color = raw.color ?: return Unknown(raw.type, json))
Gradient.type -> Gradient( Gradient.type -> Gradient(

4
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/BackgroundType.kt
View File

@ -3,7 +3,7 @@ package dev.inmo.tgbotapi.types
import dev.inmo.micro_utils.common.Progress import dev.inmo.micro_utils.common.Progress
import dev.inmo.tgbotapi.types.files.DocumentFile import dev.inmo.tgbotapi.types.files.DocumentFile
import dev.inmo.tgbotapi.utils.IntProgress100Serializer import dev.inmo.tgbotapi.utils.IntProgress100Serializer
import dev.inmo.tgbotapi.utils.extractDataAndJson import dev.inmo.tgbotapi.utils.decodeDataAndJson
import dev.inmo.tgbotapi.utils.internal.ClassCastsIncluded import dev.inmo.tgbotapi.utils.internal.ClassCastsIncluded
import kotlinx.serialization.EncodeDefault import kotlinx.serialization.EncodeDefault
import kotlinx.serialization.KSerializer import kotlinx.serialization.KSerializer
@ -138,7 +138,7 @@ sealed interface BackgroundType {
get() = RawBackgroundType.serializer().descriptor get() = RawBackgroundType.serializer().descriptor
override fun deserialize(decoder: Decoder): BackgroundType { override fun deserialize(decoder: Decoder): BackgroundType {
val (raw, json) = decoder.extractDataAndJson(RawBackgroundType.serializer()) val (raw, json) = decoder.decodeDataAndJson(RawBackgroundType.serializer())
val unknown by lazy { Unknown(raw.type, json) } val unknown by lazy { Unknown(raw.type, json) }
return when (raw.type) { return when (raw.type) {
Fill.type -> Fill( Fill.type -> Fill(

1
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/Common.kt
View File

@ -163,6 +163,7 @@ const val canReplyField = "can_reply"
const val supportInlineQueriesField = "supports_inline_queries" const val supportInlineQueriesField = "supports_inline_queries"
const val canConnectToBusinessField = "can_connect_to_business" const val canConnectToBusinessField = "can_connect_to_business"
const val textEntitiesField = "text_entities" const val textEntitiesField = "text_entities"
const val textParseModeField = "text_parse_mode"
const val entitiesField = "entities" const val entitiesField = "entities"
const val stickerSetNameField = "set_name" const val stickerSetNameField = "set_name"
const val customEmojiIdField = "custom_emoji_id" const val customEmojiIdField = "custom_emoji_id"

10
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/InputPollOption.kt
View File

@ -7,10 +7,14 @@ import dev.inmo.tgbotapi.types.message.RawMessageEntity
import dev.inmo.tgbotapi.types.message.asTextSources import dev.inmo.tgbotapi.types.message.asTextSources
import dev.inmo.tgbotapi.types.message.textsources.TextSource import dev.inmo.tgbotapi.types.message.textsources.TextSource
import dev.inmo.tgbotapi.types.message.toRawMessageEntities import dev.inmo.tgbotapi.types.message.toRawMessageEntities
import dev.inmo.tgbotapi.types.textEntitiesField
import dev.inmo.tgbotapi.types.textField
import dev.inmo.tgbotapi.types.textParseModeField
import dev.inmo.tgbotapi.utils.EntitiesBuilder import dev.inmo.tgbotapi.utils.EntitiesBuilder
import dev.inmo.tgbotapi.utils.EntitiesBuilderBody import dev.inmo.tgbotapi.utils.EntitiesBuilderBody
import dev.inmo.tgbotapi.utils.extensions.makeSourceString import dev.inmo.tgbotapi.utils.extensions.makeSourceString
import kotlinx.serialization.KSerializer import kotlinx.serialization.KSerializer
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.descriptors.SerialDescriptor
import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Decoder
@ -18,8 +22,11 @@ import kotlinx.serialization.encoding.Encoder
@Serializable(InputPollOption.Companion::class) @Serializable(InputPollOption.Companion::class)
data class InputPollOption @Warning("This constructor is not recommended to use") constructor( data class InputPollOption @Warning("This constructor is not recommended to use") constructor(
@SerialName(textField)
override val text: String, override val text: String,
@SerialName(textParseModeField)
val parseMode: ParseMode?, val parseMode: ParseMode?,
@SerialName(textEntitiesField)
override val textSources: List<TextSource>, override val textSources: List<TextSource>,
) : TextedInput { ) : TextedInput {
constructor(text: String, parseMode: ParseMode? = null) : this(text, parseMode, emptyList()) constructor(text: String, parseMode: ParseMode? = null) : this(text, parseMode, emptyList())
@ -29,8 +36,11 @@ data class InputPollOption @Warning("This constructor is not recommended to use"
companion object : KSerializer<InputPollOption> { companion object : KSerializer<InputPollOption> {
@Serializable @Serializable
private data class RawPollInputOption( private data class RawPollInputOption(
@SerialName(textField)
val text: String, val text: String,
@SerialName(textParseModeField)
val parseMode: ParseMode? = null, val parseMode: ParseMode? = null,
@SerialName(textEntitiesField)
val textSources: List<RawMessageEntity> = emptyList(), val textSources: List<RawMessageEntity> = emptyList(),
) )
override val descriptor: SerialDescriptor override val descriptor: SerialDescriptor

37
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/Poll.kt
View File

@ -10,7 +10,7 @@ import dev.inmo.tgbotapi.types.message.RawMessageEntity
import dev.inmo.tgbotapi.types.message.textsources.TextSource import dev.inmo.tgbotapi.types.message.textsources.TextSource
import dev.inmo.tgbotapi.types.message.toRawMessageEntities import dev.inmo.tgbotapi.types.message.toRawMessageEntities
import dev.inmo.tgbotapi.utils.RiskFeature import dev.inmo.tgbotapi.utils.RiskFeature
import dev.inmo.tgbotapi.utils.nonstrictJsonFormat import dev.inmo.tgbotapi.utils.decodeDataAndJson
import korlibs.time.seconds import korlibs.time.seconds
import kotlinx.serialization.* import kotlinx.serialization.*
import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.descriptors.SerialDescriptor
@ -74,12 +74,12 @@ private class RawPoll(
val id: PollId, val id: PollId,
@SerialName(questionField) @SerialName(questionField)
val question: String, val question: String,
@SerialName(questionEntitiesField)
val questionEntities: List<RawMessageEntity>,
@SerialName(optionsField) @SerialName(optionsField)
val options: List<PollOption>, val options: List<PollOption>,
@SerialName(totalVoterCountField) @SerialName(totalVoterCountField)
val votesCount: Int, val votesCount: Int,
@SerialName(questionEntitiesField)
val questionEntities: List<RawMessageEntity> = emptyList(),
@SerialName(isClosedField) @SerialName(isClosedField)
val isClosed: Boolean = false, val isClosed: Boolean = false,
@SerialName(isAnonymousField) @SerialName(isAnonymousField)
@ -110,24 +110,26 @@ data class UnknownPollType internal constructor(
override val id: PollId, override val id: PollId,
@SerialName(questionField) @SerialName(questionField)
override val question: String, override val question: String,
@SerialName(questionEntitiesField)
override val textSources: List<TextSource> = emptyList(),
@SerialName(optionsField) @SerialName(optionsField)
override val options: List<PollOption>, override val options: List<PollOption>,
@SerialName(totalVoterCountField) @SerialName(totalVoterCountField)
override val votesCount: Int, override val votesCount: Int,
@SerialName(questionEntitiesField)
override val textSources: List<TextSource> = emptyList(),
@SerialName(isClosedField) @SerialName(isClosedField)
override val isClosed: Boolean = false, override val isClosed: Boolean = false,
@SerialName(isAnonymousField) @SerialName(isAnonymousField)
override val isAnonymous: Boolean = false, override val isAnonymous: Boolean = false,
@Serializable @Serializable
val raw: JsonObject val raw: JsonElement? = null
) : Poll { ) : Poll {
@Transient @Transient
override val scheduledCloseInfo: ScheduledCloseInfo? = (raw[closeDateField] ?: raw[openPeriodField]) override val scheduledCloseInfo: ScheduledCloseInfo? = raw ?.jsonObject ?.let {
?.jsonPrimitive (it[closeDateField] ?: it[openPeriodField])
?.longOrNull ?.jsonPrimitive
?.asApproximateScheduledCloseInfo ?.longOrNull
?.asApproximateScheduledCloseInfo
}
} }
@Serializable(PollSerializer::class) @Serializable(PollSerializer::class)
@ -167,8 +169,7 @@ object PollSerializer : KSerializer<Poll> {
get() = RawPoll.serializer().descriptor get() = RawPoll.serializer().descriptor
override fun deserialize(decoder: Decoder): Poll { override fun deserialize(decoder: Decoder): Poll {
val asJson = JsonObject.serializer().deserialize(decoder) val (rawPoll, asJson) = decoder.decodeDataAndJson(RawPoll.serializer())
val rawPoll = nonstrictJsonFormat.decodeFromJsonElement(RawPoll.serializer(), asJson)
return when (rawPoll.type) { return when (rawPoll.type) {
quizPollType -> QuizPoll( quizPollType -> QuizPoll(
@ -198,9 +199,9 @@ object PollSerializer : KSerializer<Poll> {
else -> UnknownPollType( else -> UnknownPollType(
rawPoll.id, rawPoll.id,
rawPoll.question, rawPoll.question,
rawPoll.questionEntities.asTextSources(rawPoll.question),
rawPoll.options, rawPoll.options,
rawPoll.votesCount, rawPoll.votesCount,
rawPoll.questionEntities.asTextSources(rawPoll.question),
rawPoll.isClosed, rawPoll.isClosed,
rawPoll.isAnonymous, rawPoll.isAnonymous,
asJson asJson
@ -214,9 +215,9 @@ object PollSerializer : KSerializer<Poll> {
is RegularPoll -> RawPoll( is RegularPoll -> RawPoll(
value.id, value.id,
value.question, value.question,
value.textSources.toRawMessageEntities(),
value.options, value.options,
value.votesCount, value.votesCount,
value.textSources.toRawMessageEntities(),
value.isClosed, value.isClosed,
value.isAnonymous, value.isAnonymous,
regularPollType, regularPollType,
@ -227,9 +228,9 @@ object PollSerializer : KSerializer<Poll> {
is QuizPoll -> RawPoll( is QuizPoll -> RawPoll(
value.id, value.id,
value.question, value.question,
value.textSources.toRawMessageEntities(),
value.options, value.options,
value.votesCount, value.votesCount,
value.textSources.toRawMessageEntities(),
value.isClosed, value.isClosed,
value.isAnonymous, value.isAnonymous,
regularPollType, regularPollType,
@ -240,7 +241,11 @@ object PollSerializer : KSerializer<Poll> {
closeDate = (closeInfo as? ExactScheduledCloseInfo) ?.closeDateTime ?.unixMillisLong ?.div(1000L) closeDate = (closeInfo as? ExactScheduledCloseInfo) ?.closeDateTime ?.unixMillisLong ?.div(1000L)
) )
is UnknownPollType -> { is UnknownPollType -> {
JsonObject.serializer().serialize(encoder, value.raw) if (value.raw == null) {
UnknownPollType.serializer().serialize(encoder, value)
} else {
JsonElement.serializer().serialize(encoder, value.raw)
}
return return
} }
} }

4
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/polls/PollOption.kt
View File

@ -48,7 +48,7 @@ data class SimplePollOption (
@SerialName(textField) @SerialName(textField)
override val text: String, override val text: String,
@SerialName(textEntitiesField) @SerialName(textEntitiesField)
override val textSources: List<TextSource>, override val textSources: List<TextSource> = emptyList(),
@SerialName(votesCountField) @SerialName(votesCountField)
override val votes: Int = 0 override val votes: Int = 0
) : PollOption() { ) : PollOption() {
@ -62,7 +62,7 @@ object PollOptionSerializer : KSerializer<PollOption> {
@SerialName(textField) @SerialName(textField)
val text: String, val text: String,
@SerialName(textEntitiesField) @SerialName(textEntitiesField)
val textSources: List<RawMessageEntity>, val textSources: List<RawMessageEntity> = emptyList(),
@SerialName(votesCountField) @SerialName(votesCountField)
val votes: Int = 0 val votes: Int = 0
) )

2
tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/ExtractDataAndJsonFromDecoder.kt
View File

@ -5,7 +5,7 @@ import kotlinx.serialization.encoding.Decoder
import kotlinx.serialization.json.JsonDecoder import kotlinx.serialization.json.JsonDecoder
import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonElement
fun <T> Decoder.extractDataAndJson(serializer: DeserializationStrategy<T>): Pair<T, JsonElement?> { fun <T> Decoder.decodeDataAndJson(serializer: DeserializationStrategy<T>): Pair<T, JsonElement?> {
return if (this is JsonDecoder) { return if (this is JsonDecoder) {
val raw = decodeJsonElement() val raw = decodeJsonElement()
json.decodeFromJsonElement(serializer, raw) to raw json.decodeFromJsonElement(serializer, raw) to raw

3
tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/raw/Poll.kt
View File

@ -6,6 +6,7 @@ import dev.inmo.tgbotapi.types.message.textsources.TextSourcesList
import dev.inmo.tgbotapi.types.polls.* import dev.inmo.tgbotapi.types.polls.*
import dev.inmo.tgbotapi.utils.RiskFeature import dev.inmo.tgbotapi.utils.RiskFeature
import korlibs.time.seconds import korlibs.time.seconds
import kotlinx.serialization.json.jsonObject
import kotlinx.serialization.json.jsonPrimitive import kotlinx.serialization.json.jsonPrimitive
@RiskFeature(RawFieldsUsageWarning) @RiskFeature(RawFieldsUsageWarning)
@ -15,7 +16,7 @@ val Poll.total_voter_count: Int
val Poll.type: String val Poll.type: String
get() = when (this) { get() = when (this) {
is RegularPoll -> "regular" is RegularPoll -> "regular"
is UnknownPollType -> raw["type"]!!.jsonPrimitive.content is UnknownPollType -> raw!!.jsonObject["type"]!!.jsonPrimitive.content
is QuizPoll -> "quiz" is QuizPoll -> "quiz"
} }
@RiskFeature(RawFieldsUsageWarning) @RiskFeature(RawFieldsUsageWarning)