InlineQueryResult#id type change

This commit is contained in:
InsanusMokrassar 2020-09-20 20:16:14 +06:00
parent e4f305b3ec
commit 89dc7a4b2a
22 changed files with 27 additions and 21 deletions

View File

@ -44,6 +44,10 @@
### 0.28.3 ### 0.28.3
* `TelegramBotAPI-core`:
* All `InlineQueryResult` has changed their type of id for more obvious relation between `InlineQueryResult#id` and
`ChosenInlineResult#resultId`: `String` -> `InlineQueryIdentifier`
### 0.28.2 ### 0.28.2
* `TelegramBotAPI-extensions-utils`: * `TelegramBotAPI-extensions-utils`:

View File

@ -10,7 +10,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
class InlineQueryResultArticle( class InlineQueryResultArticle(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(titleField) @SerialName(titleField)
override val title: String, override val title: String,
@SerialName(inputMessageContentField) @SerialName(inputMessageContentField)

View File

@ -14,7 +14,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultAudioCachedImpl( data class InlineQueryResultAudioCachedImpl(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(audioFileIdField) @SerialName(audioFileIdField)
override val fileId: FileId, override val fileId: FileId,
@SerialName(captionField) @SerialName(captionField)

View File

@ -13,7 +13,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultAudioImpl( data class InlineQueryResultAudioImpl(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(audioUrlField) @SerialName(audioUrlField)
override val url: String, override val url: String,
@SerialName(titleField) @SerialName(titleField)

View File

@ -11,7 +11,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultContact( data class InlineQueryResultContact(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(phoneNumberField) @SerialName(phoneNumberField)
override val phoneNumber: String, override val phoneNumber: String,
@SerialName(firstNameField) @SerialName(firstNameField)

View File

@ -14,7 +14,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultDocumentCachedImpl( data class InlineQueryResultDocumentCachedImpl(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(documentFileIdField) @SerialName(documentFileIdField)
override val fileId: FileId, override val fileId: FileId,
@SerialName(titleField) @SerialName(titleField)

View File

@ -15,7 +15,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultDocumentImpl( data class InlineQueryResultDocumentImpl(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(documentUrlField) @SerialName(documentUrlField)
override val url: String, override val url: String,
@SerialName(titleField) @SerialName(titleField)

View File

@ -1,6 +1,7 @@
package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueryIdentifier
import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
import com.github.insanusmokrassar.TelegramBotAPI.types.gameShortNameField import com.github.insanusmokrassar.TelegramBotAPI.types.gameShortNameField
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
@ -8,7 +9,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
class InlineQueryResultGame( class InlineQueryResultGame(
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(gameShortNameField) @SerialName(gameShortNameField)
val gameShortName: String, val gameShortName: String,
override val replyMarkup: InlineKeyboardMarkup? = null override val replyMarkup: InlineKeyboardMarkup? = null

View File

@ -14,7 +14,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultGifCachedImpl( data class InlineQueryResultGifCachedImpl(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(gifFileIdField) @SerialName(gifFileIdField)
override val fileId: FileId, override val fileId: FileId,
@SerialName(titleField) @SerialName(titleField)

View File

@ -14,7 +14,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultGifImpl( data class InlineQueryResultGifImpl(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(gifUrlField) @SerialName(gifUrlField)
override val url: String, override val url: String,
@SerialName(thumbUrlField) @SerialName(thumbUrlField)

View File

@ -12,7 +12,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultLocation( data class InlineQueryResultLocation(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(latitudeField) @SerialName(latitudeField)
override val latitude: Double, override val latitude: Double,
@SerialName(longitudeField) @SerialName(longitudeField)

View File

@ -14,7 +14,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultMpeg4GifCachedImpl( data class InlineQueryResultMpeg4GifCachedImpl(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(mpeg4GifFileIdField) @SerialName(mpeg4GifFileIdField)
override val fileId: FileId, override val fileId: FileId,
@SerialName(titleField) @SerialName(titleField)

View File

@ -14,7 +14,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultMpeg4GifImpl( data class InlineQueryResultMpeg4GifImpl(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(mpeg4GifUrlField) @SerialName(mpeg4GifUrlField)
override val url: String, override val url: String,
@SerialName(thumbUrlField) @SerialName(thumbUrlField)

View File

@ -14,7 +14,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultPhotoCachedImpl( data class InlineQueryResultPhotoCachedImpl(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(photoFileIdField) @SerialName(photoFileIdField)
override val fileId: FileId, override val fileId: FileId,
@SerialName(titleField) @SerialName(titleField)

View File

@ -13,7 +13,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultPhotoImpl( data class InlineQueryResultPhotoImpl(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(photoUrlField) @SerialName(photoUrlField)
override val url: String, override val url: String,
@SerialName(thumbUrlField) @SerialName(thumbUrlField)

View File

@ -11,7 +11,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultStickerCached( data class InlineQueryResultStickerCached(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(stickerFileIdField) @SerialName(stickerFileIdField)
override val fileId: FileId, override val fileId: FileId,
@SerialName(replyMarkupField) @SerialName(replyMarkupField)

View File

@ -12,7 +12,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultVenue( data class InlineQueryResultVenue(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(latitudeField) @SerialName(latitudeField)
override val latitude: Double, override val latitude: Double,
@SerialName(longitudeField) @SerialName(longitudeField)

View File

@ -14,7 +14,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultVideoCachedImpl( data class InlineQueryResultVideoCachedImpl(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(videoFileIdField) @SerialName(videoFileIdField)
override val fileId: FileId, override val fileId: FileId,
@SerialName(titleField) @SerialName(titleField)

View File

@ -15,7 +15,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultVideoImpl( data class InlineQueryResultVideoImpl(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(videoUrlField) @SerialName(videoUrlField)
override val url: String, override val url: String,
@SerialName(thumbUrlField) @SerialName(thumbUrlField)

View File

@ -14,7 +14,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultVoiceCachedImpl( data class InlineQueryResultVoiceCachedImpl(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(voiceFileIdField) @SerialName(voiceFileIdField)
override val fileId: FileId, override val fileId: FileId,
@SerialName(titleField) @SerialName(titleField)

View File

@ -13,7 +13,7 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class InlineQueryResultVoiceImpl( data class InlineQueryResultVoiceImpl(
@SerialName(idField) @SerialName(idField)
override val id: String, override val id: InlineQueryIdentifier,
@SerialName(voiceUrlField) @SerialName(voiceUrlField)
override val url: String, override val url: String,
@SerialName(titleField) @SerialName(titleField)

View File

@ -1,12 +1,13 @@
package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts
import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.serializers.InlineQueryResultSerializer import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.serializers.InlineQueryResultSerializer
import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueryIdentifier
import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@Serializable(InlineQueryResultSerializer::class) @Serializable(InlineQueryResultSerializer::class)
interface InlineQueryResult { interface InlineQueryResult {
val type: String val type: String
val id: String val id: InlineQueryIdentifier
val replyMarkup: InlineKeyboardMarkup? val replyMarkup: InlineKeyboardMarkup?
} }