Merge pull request #16 from InsanusMokrassar/0.10.0

0.10.0

CHANGELOG.md

@@ -1,5 +1,15 @@
 # TelegramBotAPI changelog
 
+## 0.10.0
+
+* Most part of abstractions was replaced from `requests` and `types` on more high level
+* Added abstraction `CommonVenueData`
+* Added abstraction `CommonContactData`
+* Added `InputMessageContent`
+* Update some types and requests according to abstractions replacing
+* Add all `InlineQueryResult`, `InputMessageContent` and other inline mode types
+* Fixes in edition of inline messages and their result types
+* Replace basic exception and add `ReplyMessageNotFound` exception
 
 ## 0.9.0
 

build.gradle

@@ -1,4 +1,4 @@
-project.version = "0.9.3"
+project.version = "0.10.0"
 project.group = "com.github.insanusmokrassar"
 
 buildscript {

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Captioned.kt

@@ -1,4 +1,4 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.abstracts
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/CommonContactData.kt

@@ -0,0 +1,8 @@
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts
+
+interface CommonContactData {
+    val phoneNumber: String
+    val firstName: String
+    val lastName: String?
+    val vcard: String? // TODO:: Replace by some vCard abstraction
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/CommonVenueData.kt

@@ -0,0 +1,8 @@
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts
+
+interface CommonVenueData : Titled {
+    override val title: String
+    val address: String
+    val foursquareId: String?
+    val foursquareType: String? // TODO:: Rewrite with enum or interface
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Livable.kt

@@ -0,0 +1,8 @@
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts
+
+interface Livable {
+    /**
+     * Period in SECONDS
+     */
+    val livePeriod: Int?
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Locationed.kt

@@ -1,4 +1,4 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.abstracts
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts
 
 interface Locationed {
     val latitude: Double

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/MimeTyped.kt

@@ -0,0 +1,5 @@
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts
+
+interface MimeTyped {
+    val mimeType: String? // TODO::replace by something like enum or interface
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Performerable.kt

@@ -0,0 +1,5 @@
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts
+
+interface Performerable {
+    val performer: String?
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/Titled.kt

@@ -0,0 +1,5 @@
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts
+
+interface Titled {
+    val title: String?
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ByInlineMessageId.kt

@@ -1,4 +1,4 @@
-package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier
 

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ByMessageId.kt

@@ -1,4 +1,4 @@
-package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
 

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ChatRequest.kt

@@ -1,4 +1,4 @@
-package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/DisableNotification.kt

@@ -0,0 +1,5 @@
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types
+
+interface DisableNotification {
+    val disableNotification: Boolean
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/DisableWebPagePreview.kt

@@ -1,4 +1,4 @@
-package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types
 
 interface DisableWebPagePreview {
     val disableWebPagePreview: Boolean?

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ReplyMarkup.kt

@@ -1,4 +1,4 @@
-package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
 

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/ReplyMessageId.kt

@@ -1,4 +1,4 @@
-package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
 

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/CommonAbstracts/types/UntilDate.kt

@@ -1,4 +1,4 @@
-package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types
+package com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.TelegramDate
 

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/KtorRequestsExecutor.kt

@@ -3,7 +3,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor
 import com.github.insanusmokrassar.TelegramBotAPI.bot.BaseRequestsExecutor
 import com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.base.MultipartRequestCallFactory
 import com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.base.SimpleRequestCallFactory
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestException
+import com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.newRequestException
 import com.github.insanusmokrassar.TelegramBotAPI.bot.settings.limiters.EmptyLimiter
 import com.github.insanusmokrassar.TelegramBotAPI.bot.settings.limiters.RequestLimiter
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
@@ -75,7 +75,7 @@ class KtorRequestsExecutor(
                     null
                 }
             } ?: call.let {
-                throw RequestException(
+                throw newRequestException(
                     responseObject,
                     "Can't get result object"
                 )

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/RequestException.kt

@@ -1,13 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.bot
 
-import com.github.insanusmokrassar.TelegramBotAPI.types.Response
-import java.io.IOException
+import com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.RequestException
 
-class RequestException(
-    val response: Response<*>,
-    message: String? = null,
-    cause: Throwable? = null
-) : IOException(
-    message,
-    cause
+@Deprecated(
+    "Replaced to another package",
+    ReplaceWith(
+        "RequestException",
+        "com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.RequestException"
+    )
 )
+typealias RequestException = RequestException

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/RequestsExecutor.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.bot
 
+import com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions.RequestException
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request
 
 interface RequestsExecutor {

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/exceptions/ReplyMessageNotFound.kt

@@ -0,0 +1,6 @@
+package com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.Response
+
+open class ReplyMessageNotFound(response: Response<*>, message: String?, cause: Throwable?) :
+    RequestException(response, message, cause)

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/exceptions/RequestException.kt

@@ -0,0 +1,22 @@
+package com.github.insanusmokrassar.TelegramBotAPI.bot.exceptions
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.Response
+import java.io.IOException
+
+fun newRequestException(
+    response: Response<*>,
+    message: String? = null,
+    cause: Throwable? = null
+) = when (response.description) {
+    "Bad Request: reply message not found" -> ReplyMessageNotFound(response, message, cause)
+    else -> RequestException(response, message, cause)
+}
+
+open class RequestException internal constructor(
+    val response: Response<*>,
+    message: String? = null,
+    cause: Throwable? = null
+) : IOException(
+    message,
+    cause
+)

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/types/DisableNotification.kt

@@ -1,5 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types
-
-interface DisableNotification {
-    val disableNotification: Boolean
-}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/answers/AnswerInlineQuery.kt

@@ -0,0 +1,58 @@
+package com.github.insanusmokrassar.TelegramBotAPI.requests.answers
+
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.serializers.InlineQueryResultSerializer
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InlineQuery
+import kotlinx.serialization.*
+import kotlinx.serialization.internal.ArrayListSerializer
+import kotlinx.serialization.internal.BooleanSerializer
+
+@Serializable
+data class AnswerInlineQuery(
+    @SerialName(inlineQueryIdField)
+    val inlineQueryID: InlineQueryIdentifier,
+    @Serializable(InlineQueryAnswersResultsSerializer::class)
+    @SerialName(resultsField)
+    val results: List<InlineQueryResult> = emptyList(),
+    @SerialName(cachedTimeField)
+    @Optional
+    val cachedTime: Int? = null,
+    @SerialName(isPersonalField)
+    @Optional
+    val isPersonal: Boolean? = null,
+    @SerialName(nextOffsetField)
+    @Optional
+    val nextOffset: String? = null,
+    @SerialName(switchPmTextField)
+    @Optional
+    val switchPmText: String? = null,
+    @SerialName(switchPmParameterField)
+    @Optional
+    val switchPmParameter: String? = null
+): SimpleRequest<Boolean> {
+    override fun method(): String = "answerInlineQuery"
+    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
+}
+
+fun InlineQuery.createAnswer(
+    results: List<InlineQueryResult> = emptyList(),
+    cachedTime: Int? = null,
+    isPersonal: Boolean? = null,
+    nextOffset: String? = null,
+    switchPmText: String? = null,
+    switchPmParameter: String? = null
+) = AnswerInlineQuery(
+    id,
+    results,
+    cachedTime,
+    isPersonal,
+    nextOffset,
+    switchPmText,
+    switchPmParameter
+)
+
+object InlineQueryAnswersResultsSerializer: KSerializer<List<InlineQueryResult>> by ArrayListSerializer(
+    InlineQueryResultSerializer
+)

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/ExportChatInviteLink.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/LeaveChat.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/abstracts/ChatMemberRequest.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.UserId
 
 interface ChatMemberRequest<T: Any> : ChatRequest, SimpleRequest<T> {

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChat.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.RawChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatAdministrators.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember.RawChatMember
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/get/GetChatMembersCount.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/KickChatMember.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.UntilDate
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.UntilDate
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/PromoteChatMember.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.UntilDate
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.UntilDate
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/members/RestrictChatMember.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.UntilDate
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.UntilDate
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.abstracts.ChatMemberRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/DeleteChatPhoto.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/PinChatMessage.kt

@@ -1,8 +1,8 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.DisableNotification
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.DisableNotification
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatDescription.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatPhoto.kt

@@ -1,8 +1,8 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/SetChatTitle.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/modify/UnpinChatMessage.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/stickers/DeleteChatStickerSet.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.stickers
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chatIdField
 import kotlinx.serialization.*

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/chat/stickers/SetChatStickerSet.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.chat.stickers
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.BooleanSerializer

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/EditChatMessageLiveLocation.kt

@@ -6,7 +6,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMa
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
 import kotlinx.serialization.*
 
-// TODO:: Replace return type by RawMessage or Boolean (as in documentation)
 @Serializable
 data class EditChatMessageLiveLocation(
     @SerialName(chatIdField)

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/EditInlineMessageLiveLocation.kt

@@ -3,10 +3,8 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
 import kotlinx.serialization.*
 
-// TODO:: Replace return type by RawMessage or Boolean (as in documentation)
 @Serializable
 data class EditInlineMessageLiveLocation(
     @SerialName(inlineMessageIdField)
@@ -20,5 +18,4 @@ data class EditInlineMessageLiveLocation(
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditReplyMessage, EditLocationMessage {
     override fun method(): String = "editMessageLiveLocation"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/StopChatMessageLiveLocation.kt

@@ -7,7 +7,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMa
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
 import kotlinx.serialization.*
 
-// TODO:: Replace return type by RawMessage or Boolean (as in documentation)
 @Serializable
 data class StopChatMessageLiveLocation(
     @SerialName(chatIdField)

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/LiveLocation/StopInlineMessageLiveLocation.kt

@@ -4,10 +4,8 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditIn
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
 import kotlinx.serialization.*
 
-// TODO:: Replace return type by RawMessage or Boolean (as in documentation)
 @Serializable
 data class StopInlineMessageLiveLocation(
     @SerialName(inlineMessageIdField)
@@ -17,5 +15,4 @@ data class StopInlineMessageLiveLocation(
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditReplyMessage {
     override fun method(): String = "stopMessageLiveLocation"
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt

@@ -4,7 +4,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditIn
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.EditReplyMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
 import kotlinx.serialization.*
 
 @Serializable
@@ -15,7 +14,5 @@ data class EditInlineMessageReplyMarkup(
     @Optional
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditReplyMessage {
-
     override fun method(): String = editMessageReplyMarkupMethod
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditInlineMessage.kt

@@ -2,8 +2,10 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.internal.BooleanSerializer
 
-interface EditInlineMessage : SimpleRequest<RawMessage> {
+interface EditInlineMessage : SimpleRequest<Boolean> {
     val inlineMessageId: InlineMessageIdentifier
+    override fun resultSerializer(): KSerializer<Boolean> = BooleanSerializer
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditReplyMessage.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ReplyMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 
 interface EditReplyMessage : ReplyMarkup {

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/abstracts/EditTextChatMessage.kt

@@ -1,10 +1,8 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
 
-interface EditTextChatMessage : SimpleRequest<RawMessage> {
+interface EditTextChatMessage {
     val text: String
     val parseMode: ParseMode?
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/caption/EditInlineMessageCaption.kt

@@ -5,7 +5,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
 import kotlinx.serialization.*
 
 @Serializable
@@ -21,7 +20,5 @@ data class EditInlineMessageCaption(
     @Optional
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditTextChatMessage, EditReplyMessage {
-
     override fun method(): String = editMessageCaptionMethod
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/media/EditInlineMessageMedia.kt

@@ -1,12 +1,10 @@
-package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.text
+package com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media
 
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.abstracts.*
-import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media.editMessageMediaMethod
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
 import kotlinx.serialization.*
 
 @Serializable
@@ -27,5 +25,4 @@ data class EditInlineMessageMedia(
     }
 
     override fun method(): String = editMessageMediaMethod
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/edit/text/EditInlineMessageText.kt

@@ -6,7 +6,6 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage
 import kotlinx.serialization.*
 
 @Serializable
@@ -25,7 +24,5 @@ data class EditInlineMessageText(
     @Optional
     override val replyMarkup: InlineKeyboardMarkup? = null
 ) : EditInlineMessage, EditTextChatMessage, EditReplyMessage, EditDisableWebPagePreviewMessage {
-
     override fun method(): String = editMessageMediaMethod
-    override fun resultSerializer(): KSerializer<RawMessage> = RawMessage.serializer()
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/GetGameHighScoresByChat.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.games
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ByMessageId
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ByMessageId
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.GetGameHighScores
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.SerialName

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/GetGameHighScoresByInlineMessageId.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.games
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ByInlineMessageId
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ByInlineMessageId
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.GetGameHighScores
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.SerialName

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/SetGameScoreByChatId.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.games
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ByMessageId
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ByMessageId
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.SetGameScore
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/games/SetGameScoreByInlineMessageId.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.games
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ByInlineMessageId
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ByInlineMessageId
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.abstracts.SetGameScore
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import kotlinx.serialization.*

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/SendMessage.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.DisableWebPagePreview
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.DisableWebPagePreview
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/ReplyingMarkupSendMessageRequest.kt

@@ -1,5 +1,5 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ReplyMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMarkup
 
 interface ReplyingMarkupSendMessageRequest<T: Any>: SendMessageRequest<T>, ReplyMarkup

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/SendChatMessageRequest.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ChatRequest
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ChatRequest
 
 interface SendChatMessageRequest<T: Any> : SimpleRequest<T>, ChatRequest

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/abstracts/SendMessageRequest.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.DisableNotification
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ReplyMessageId
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.DisableNotification
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMessageId
 
 interface SendMessageRequest<T: Any> : SendChatMessageRequest<T>, ReplyMessageId, DisableNotification

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/games/SendGame.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.games
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.ReplyMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.ReplyMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendAudio.kt

@@ -1,5 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.media
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Performerable
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.media.base.*
@@ -74,7 +75,7 @@ data class SendAudioData internal constructor(
     override val duration: Long? = null,
     @SerialName(performerField)
     @Optional
-    val performer: String? = null,
+    override val performer: String? = null,
     @SerialName(titleField)
     @Optional
     override val title: String? = null,
@@ -93,7 +94,8 @@ data class SendAudioData internal constructor(
     TextableSendMessageRequest<RawMessage>,
     ThumbedSendMessageRequest<RawMessage>,
     TitledSendMessageRequest<RawMessage>,
-    DuratedSendMessageRequest<RawMessage>
+    DuratedSendMessageRequest<RawMessage>,
+    Performerable
 {
     init {
         text ?.let {

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/payments/SendInvoice.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.requests.send.payments
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.abstracts.SendMessageRequest
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/ChatMember/BannedChatMember.kt

@@ -1,5 +1,5 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.ChatMember
 
-import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.types.UntilDate
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.types.UntilDate
 
 interface BannedChatMember : ChatMember, UntilDate

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Common.kt

@@ -28,6 +28,10 @@ val invoiceTitleLimit = 1 until 32
 val invoiceDescriptionLimit = 1 until 256
 val invoicePayloadBytesLimit = 1 until 128
 
+val livePeriodLimit = 60 .. 86400
+
+val inlineQueryAnswerResultsLimit = 0 .. 50
+
 const val chatIdField = "chat_id"
 const val messageIdField = "message_id"
 const val updateIdField = "update_id"
@@ -52,29 +56,66 @@ const val resultIdField = "result_id"
 const val inlineMessageIdField = "inline_message_id"
 const val callbackDataField = "callback_data"
 const val callbackQueryIdField = "callback_query_id"
+const val inlineQueryIdField = "inline_query_id"
 const val showAlertField = "show_alert"
 const val cachedTimeField = "cached_time"
 const val foursquareIdField = "foursquare_id"
 const val foursquareTypeField = "foursquare_type"
 const val untilDateField = "until_date"
 const val errorMessageField = "error_message"
+const val messageTextField = "message_text"
+const val isPersonalField = "is_personal"
+const val nextOffsetField = "next_offset"
+const val switchPmTextField = "switch_pm_text"
+const val switchPmParameterField = "switch_pm_parameter"
+
 
 const val photoUrlField = "photo_url"
 const val photoSizeField = "photo_size"
 const val photoFileIdField = "photo_file_id"
-const val gifUrlField = "gif_url"
-const val gifFileIdField = "gif_file_id"
-const val thumbUrlField = "thumb_url"
-const val thumbWidthField = "thumb_width"
-const val thumbHeightField = "thumb_height"
 const val photoWidthField = "photo_width"
 const val photoHeightField = "photo_height"
+
+const val gifUrlField = "gif_url"
+const val gifFileIdField = "gif_file_id"
 const val gifWidthField = "gif_width"
 const val gifHeightField = "gif_height"
 const val gifDurationField = "gif_duration"
+
+const val mpeg4GifUrlField = "mpeg4_url"
+const val mpeg4GifFileIdField = "mpeg4_file_id"
+const val mpeg4GifWidthField = "mpeg4_width"
+const val mpeg4GifHeightField = "mpeg4_height"
+const val mpeg4GifDurationField = "mpeg4_duration"
+
+const val videoUrlField = "video_url"
+const val videoFileIdField = "video_file_id"
+const val videoWidthField = "video_width"
+const val videoHeightField = "video_height"
+const val videoDurationField = "video_duration"
+
+const val audioUrlField = "audio_url"
+const val audioFileIdField = "audio_file_id"
+const val audioDurationField = "audio_duration"
+
+const val voiceUrlField = "voice_url"
+const val voiceFileIdField = "voice_file_id"
+const val voiceDurationField = "voice_duration"
+
+const val documentUrlField = "document_url"
+const val documentFileIdField = "document_file_id"
+
+const val stickerFileIdField = "sticker_file_id"
+
+const val gameShortNameField = "game_short_name"
+
+const val thumbUrlField = "thumb_url"
+const val thumbWidthField = "thumb_width"
+const val thumbHeightField = "thumb_height"
+
 const val inputMessageContentField = "input_message_content"
 const val hideUrlField = "hide_url"
-const val gameShortNameField = "game_short_name"
+
 
 const val canSendMessagesField = "can_send_messages"
 const val canSendMediaMessagesField = "can_send_media_messages"
@@ -129,6 +170,8 @@ const val labelField = "label"
 const val amountField = "amount"
 const val pricesField = "prices"
 const val payloadField = "payload"
+const val vcardField = "vcard"
+const val resultsField = "results"
 
 const val pointField = "point"
 const val xShiftField = "x_shift"

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/Contact.kt

@@ -1,19 +1,21 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types
 
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CommonContactData
 import kotlinx.serialization.*
 
 @Serializable
 data class Contact(
     @SerialName(phoneNumberField)
-    val phoneNumber: String,
+    override val phoneNumber: String,
     @SerialName(firstNameField)
-    val firstName: String,
+    override val firstName: String,
     @SerialName(lastNameField)
     @Optional
-    val lastName: String? = null,
+    override val lastName: String? = null,
     @SerialName(userIdField)
     @Optional
     val userId: UserId? = null,
+    @SerialName(vcardField)
     @Optional
-    val vcard: String? = null
-)
+    override val vcard: String? = null
+) : CommonContactData

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultArticle.kt

@@ -18,7 +18,7 @@ class InlineQueryResultArticle(
     override val replyMarkup: InlineKeyboardMarkup? = null,
     @SerialName(urlField)
     @Optional
-    val url: String? = null,
+    override val url: String? = null,
     @SerialName(hideUrlField)
     @Optional
     val hideUrl: Boolean? = null,
@@ -38,6 +38,7 @@ class InlineQueryResultArticle(
     ThumbSizedInlineQueryResult,
     TitledInlineQueryResult,
     DescribedInlineQueryResult,
-    WithInputMessageContentInlineQueryResult {
+    WithInputMessageContentInlineQueryResult,
+    UrlInlineQueryResult {
     override val type: String = "article"
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioCachedImpl.kt

@@ -0,0 +1,33 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.audio.InlineQueryResultAudioCached
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.audio.inlineQueryResultAudioType
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultAudioCachedImpl(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(audioFileIdField)
+    override val fileId: FileId,
+    @SerialName(captionField)
+    @Optional
+    override val caption: String? = null,
+    @SerialName(parseModeField)
+    @Optional
+    override val parseMode: ParseMode? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResultAudioCached {
+    override val type: String = inlineQueryResultAudioType
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioImpl.kt

@@ -0,0 +1,40 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.audio.InlineQueryResultAudio
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.audio.inlineQueryResultAudioType
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultAudioImpl(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(audioUrlField)
+    override val url: String,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(performerField)
+    @Optional
+    override val performer: String? = null,
+    @SerialName(audioDurationField)
+    @Optional
+    override val duration: Int? = null,
+    @SerialName(captionField)
+    @Optional
+    override val caption: String? = null,
+    @SerialName(parseModeField)
+    @Optional
+    override val parseMode: ParseMode? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResultAudio {
+    override val type: String = inlineQueryResultAudioType
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultContact.kt

@@ -0,0 +1,46 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CommonContactData
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultContact(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(phoneNumberField)
+    override val phoneNumber: String,
+    @SerialName(firstNameField)
+    override val firstName: String,
+    @SerialName(lastNameField)
+    @Optional
+    override val lastName: String? = null,
+    @SerialName(vcardField)
+    @Optional
+    override val vcard: String? = null,
+    @SerialName(thumbUrlField)
+    @Optional
+    override val thumbUrl: String? = null,
+    @SerialName(thumbWidthField)
+    @Optional
+    override val thumbWidth: Int? = null,
+    @SerialName(thumbHeightField)
+    @Optional
+    override val thumbHeight: Int? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResult,
+    CommonContactData,
+    WithInputMessageContentInlineQueryResult,
+    ThumbedInlineQueryResult,
+    ThumbSizedInlineQueryResult
+{
+    override val type: String = "contact"
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentCachedImpl.kt

@@ -0,0 +1,38 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.document.InlineQueryResultDocumentCached
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.document.inlineQueryResultDocumentType
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultDocumentCachedImpl(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(documentFileIdField)
+    override val fileId: FileId,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(descriptionField)
+    @Optional
+    override val description: String? = null,
+    @SerialName(captionField)
+    @Optional
+    override val caption: String? = null,
+    @SerialName(parseModeField)
+    @Optional
+    override val parseMode: ParseMode? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResultDocumentCached {
+    override val type: String = inlineQueryResultDocumentType
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentImpl.kt

@@ -0,0 +1,49 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.document.InlineQueryResultDocument
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.document.inlineQueryResultDocumentType
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.mimeTypeField
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultDocumentImpl(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(documentUrlField)
+    override val url: String,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(mimeTypeField)
+    override val mimeType: String,
+    @SerialName(thumbUrlField)
+    @Optional
+    override val thumbUrl: String? = null,
+    @SerialName(thumbWidthField)
+    @Optional
+    override val thumbWidth: Int? = null,
+    @SerialName(thumbHeightField)
+    @Optional
+    override val thumbHeight: Int? = null,
+    @SerialName(descriptionField)
+    @Optional
+    override val description: String? = null,
+    @SerialName(captionField)
+    @Optional
+    override val caption: String? = null,
+    @SerialName(parseModeField)
+    @Optional
+    override val parseMode: ParseMode? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResultDocument {
+    override val type: String = inlineQueryResultDocumentType
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultGifCachedImpl.kt

@@ -0,0 +1,36 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.gif.InlineQueryResultGifCached
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.gif.inlineQueryResultGifType
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultGifCachedImpl(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(gifFileIdField)
+    override val fileId: FileId,
+    @SerialName(titleField)
+    @Optional
+    override val title: String? = null,
+    @SerialName(captionField)
+    @Optional
+    override val caption: String? = null,
+    @SerialName(parseModeField)
+    @Optional
+    override val parseMode: ParseMode? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResultGifCached {
+    override val type: String = inlineQueryResultGifType
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultGifImpl.kt

@@ -0,0 +1,46 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.gif.InlineQueryResultGif
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.gif.inlineQueryResultGifType
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultGifImpl(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(gifUrlField)
+    override val url: String,
+    @SerialName(thumbUrlField)
+    override val thumbUrl: String,
+    @SerialName(gifWidthField)
+    @Optional
+    override val width: Int? = null,
+    @SerialName(gifHeightField)
+    @Optional
+    override val height: Int? = null,
+    @SerialName(gifDurationField)
+    @Optional
+    override val duration: Int? = null,
+    @SerialName(titleField)
+    @Optional
+    override val title: String? = null,
+    @SerialName(captionField)
+    @Optional
+    override val caption: String? = null,
+    @SerialName(parseModeField)
+    @Optional
+    override val parseMode: ParseMode? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResultGif {
+    override val type: String = inlineQueryResultGifType
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultLocation.kt

@@ -0,0 +1,48 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Livable
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Locationed
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultLocation(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(latitudeField)
+    override val latitude: Double,
+    @SerialName(longitudeField)
+    override val longitude: Double,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(livePeriodField)
+    @Optional
+    override val livePeriod: Int? = null,
+    @SerialName(thumbUrlField)
+    @Optional
+    override val thumbUrl: String? = null,
+    @SerialName(thumbWidthField)
+    @Optional
+    override val thumbWidth: Int? = null,
+    @SerialName(thumbHeightField)
+    @Optional
+    override val thumbHeight: Int? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResult,
+    Locationed,
+    Livable,
+    TitledInlineQueryResult,
+    WithInputMessageContentInlineQueryResult,
+    ThumbedInlineQueryResult,
+    ThumbSizedInlineQueryResult
+{
+    override val type: String = "location"
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifCachedImpl.kt

@@ -0,0 +1,36 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.InlineQueryResultMpeg4GifCached
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.inlineQueryResultMpeg4GifType
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultMpeg4GifCachedImpl(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(mpeg4GifFileIdField)
+    override val fileId: FileId,
+    @SerialName(titleField)
+    @Optional
+    override val title: String? = null,
+    @SerialName(captionField)
+    @Optional
+    override val caption: String? = null,
+    @SerialName(parseModeField)
+    @Optional
+    override val parseMode: ParseMode? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResultMpeg4GifCached {
+    override val type: String = inlineQueryResultMpeg4GifType
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifImpl.kt

@@ -0,0 +1,46 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.InlineQueryResultMpeg4Gif
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.mpeg4gif.inlineQueryResultMpeg4GifType
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultMpeg4GifImpl(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(mpeg4GifUrlField)
+    override val url: String,
+    @SerialName(thumbUrlField)
+    override val thumbUrl: String,
+    @SerialName(mpeg4GifWidthField)
+    @Optional
+    override val width: Int? = null,
+    @SerialName(mpeg4GifHeightField)
+    @Optional
+    override val height: Int? = null,
+    @SerialName(mpeg4GifDurationField)
+    @Optional
+    override val duration: Int? = null,
+    @SerialName(titleField)
+    @Optional
+    override val title: String? = null,
+    @SerialName(captionField)
+    @Optional
+    override val caption: String? = null,
+    @SerialName(parseModeField)
+    @Optional
+    override val parseMode: ParseMode? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResultMpeg4Gif {
+    override val type: String = inlineQueryResultMpeg4GifType
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoCachedImpl.kt

@@ -0,0 +1,39 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.photo.InlineQueryResultPhotoCached
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.photo.inlineQueryResultPhotoType
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultPhotoCachedImpl(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(photoFileIdField)
+    override val fileId: FileId,
+    @SerialName(titleField)
+    @Optional
+    override val title: String? = null,
+    @SerialName(descriptionField)
+    @Optional
+    override val description: String? = null,
+    @SerialName(captionField)
+    @Optional
+    override val caption: String? = null,
+    @SerialName(parseModeField)
+    @Optional
+    override val parseMode: ParseMode? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResultPhotoCached {
+    override val type: String = inlineQueryResultPhotoType
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoImpl.kt

@@ -0,0 +1,46 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.photo.InlineQueryResultPhoto
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.photo.inlineQueryResultPhotoType
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultPhotoImpl(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(photoUrlField)
+    override val url: String,
+    @SerialName(thumbUrlField)
+    override val thumbUrl: String,
+    @SerialName(photoWidthField)
+    @Optional
+    override val width: Int? = null,
+    @SerialName(photoHeightField)
+    @Optional
+    override val height: Int? = null,
+    @SerialName(titleField)
+    @Optional
+    override val title: String? = null,
+    @SerialName(descriptionField)
+    @Optional
+    override val description: String? = null,
+    @SerialName(captionField)
+    @Optional
+    override val caption: String? = null,
+    @SerialName(parseModeField)
+    @Optional
+    override val parseMode: ParseMode? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResultPhoto {
+    override val type: String = inlineQueryResultPhotoType
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultStickerCached.kt

@@ -0,0 +1,24 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultStickerCached(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(stickerFileIdField)
+    override val fileId: FileId,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResult, WithInputMessageContentInlineQueryResult, WithFileIdInlineQueryResult {
+    override val type: String = "sticker"
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVenue.kt

@@ -0,0 +1,53 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CommonVenueData
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Locationed
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultVenue(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(latitudeField)
+    override val latitude: Double,
+    @SerialName(longitudeField)
+    override val longitude: Double,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(addressField)
+    override val address: String,
+    @SerialName(foursquareIdField)
+    @Optional
+    override val foursquareId: String? = null,
+    @SerialName(foursquareTypeField)
+    @Optional
+    override val foursquareType: String? = null,
+    @SerialName(thumbUrlField)
+    @Optional
+    override val thumbUrl: String? = null,
+    @SerialName(thumbWidthField)
+    @Optional
+    override val thumbWidth: Int? = null,
+    @SerialName(thumbHeightField)
+    @Optional
+    override val thumbHeight: Int? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResult,
+    Locationed,
+    CommonVenueData,
+    TitledInlineQueryResult,
+    WithInputMessageContentInlineQueryResult,
+    ThumbedInlineQueryResult,
+    ThumbSizedInlineQueryResult
+{
+    override val type: String = "venue"
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoCachedImpl.kt

@@ -0,0 +1,38 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.video.InlineQueryResultVideoCached
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.video.inlineQueryResultVideoType
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultVideoCachedImpl(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(videoFileIdField)
+    override val fileId: FileId,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(descriptionField)
+    @Optional
+    override val description: String? = null,
+    @SerialName(captionField)
+    @Optional
+    override val caption: String? = null,
+    @SerialName(parseModeField)
+    @Optional
+    override val parseMode: ParseMode? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResultVideoCached {
+    override val type: String = inlineQueryResultVideoType
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoImpl.kt

@@ -0,0 +1,51 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.video.InlineQueryResultVideo
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.video.inlineQueryResultVideoType
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.mimeTypeField
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultVideoImpl(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(videoUrlField)
+    override val url: String,
+    @SerialName(thumbUrlField)
+    override val thumbUrl: String,
+    @SerialName(mimeTypeField)
+    override val mimeType: String,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(videoWidthField)
+    @Optional
+    override val width: Int? = null,
+    @SerialName(videoHeightField)
+    @Optional
+    override val height: Int? = null,
+    @SerialName(videoDurationField)
+    @Optional
+    override val duration: Int? = null,
+    @SerialName(descriptionField)
+    @Optional
+    override val description: String? = null,
+    @SerialName(captionField)
+    @Optional
+    override val caption: String? = null,
+    @SerialName(parseModeField)
+    @Optional
+    override val parseMode: ParseMode? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResultVideo {
+    override val type: String = inlineQueryResultVideoType
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceCachedImpl.kt

@@ -0,0 +1,35 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.voice.InlineQueryResultVoiceCached
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.voice.inlineQueryResultVoiceType
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultVoiceCachedImpl(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(voiceFileIdField)
+    override val fileId: FileId,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(captionField)
+    @Optional
+    override val caption: String? = null,
+    @SerialName(parseModeField)
+    @Optional
+    override val parseMode: ParseMode? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResultVoiceCached {
+    override val type: String = inlineQueryResultVoiceType
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceImpl.kt

@@ -0,0 +1,37 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.*
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.voice.InlineQueryResultVoice
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.voice.inlineQueryResultVoiceType
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
+import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.parseModeField
+import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.*
+
+@Serializable
+data class InlineQueryResultVoiceImpl(
+    @SerialName(idField)
+    override val id: String,
+    @SerialName(voiceUrlField)
+    override val url: String,
+    @SerialName(titleField)
+    override val title: String,
+    @SerialName(voiceDurationField)
+    @Optional
+    override val duration: Int? = null,
+    @SerialName(captionField)
+    @Optional
+    override val caption: String? = null,
+    @SerialName(parseModeField)
+    @Optional
+    override val parseMode: ParseMode? = null,
+    @SerialName(replyMarkupField)
+    @Optional
+    override val replyMarkup: InlineKeyboardMarkup? = null,
+    @SerialName(inputMessageContentField)
+    @Optional
+    override val inputMessageContent: InputMessageContent? = null
+) : InlineQueryResultVoice {
+    override val type: String = inlineQueryResultVoiceType
+}

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/CaptionedInlineQueryResult.kt

@@ -1,5 +0,0 @@
-package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts
-
-import com.github.insanusmokrassar.TelegramBotAPI.types.abstracts.Captioned
-
-interface CaptionedInlineQueryResult : InlineQueryResult, Captioned

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/InlineQueryResult.kt

@@ -1,7 +1,10 @@
 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.buttons.InlineKeyboardMarkup
+import kotlinx.serialization.Serializable
 
+@Serializable(InlineQueryResultSerializer::class)
 interface InlineQueryResult {
     val type: String
     val id: String

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/OptionallyTitledInlineQueryResult.kt

@@ -1,7 +1,5 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts
 
-interface OptionallyTitledInlineQueryResult : InlineQueryResult {
-    val title: String?
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Titled
 
-
-}
+interface OptionallyTitledInlineQueryResult : InlineQueryResult, Titled

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/PositionedInlineQueryResult.kt

@@ -1,5 +1,5 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts
 
-import com.github.insanusmokrassar.TelegramBotAPI.types.abstracts.Locationed
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Locationed
 
 interface PositionedInlineQueryResult : InlineQueryResult, Locationed

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/UrlInlineQueryResult.kt

@@ -1,5 +1,5 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts
 
 interface UrlInlineQueryResult : InlineQueryResult {
-    val url: String
+    val url: String?
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/WithInputMessageContentInlineQueryResult.kt

@@ -3,5 +3,5 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQue
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InputMessageContent
 
 interface WithInputMessageContentInlineQueryResult : InlineQueryResult {
-    val inputMessageContent: InputMessageContent
+    val inputMessageContent: InputMessageContent?
 }

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudio.kt

@@ -0,0 +1,6 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.audio
+
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Performerable
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.*
+
+interface InlineQueryResultAudio : InlineQueryResultAudioCommon, UrlInlineQueryResult, DuratedInlineResultQuery, Performerable, TitledInlineQueryResult

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCached.kt

@@ -0,0 +1,5 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.audio
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult
+
+interface InlineQueryResultAudioCached : InlineQueryResultAudioCommon, WithFileIdInlineQueryResult

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/audio/InlineQueryResultAudioCommon.kt

@@ -0,0 +1,11 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.audio
+
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Captioned
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.WithInputMessageContentInlineQueryResult
+
+const val inlineQueryResultAudioType = "audio"
+
+interface InlineQueryResultAudioCommon : InlineQueryResult,
+    Captioned,
+    WithInputMessageContentInlineQueryResult

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocument.kt

@@ -0,0 +1,6 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.document
+
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.MimeTyped
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.*
+
+interface InlineQueryResultDocument : InlineQueryResultDocumentCommon, UrlInlineQueryResult, ThumbedInlineQueryResult, ThumbSizedInlineQueryResult, MimeTyped

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCached.kt

@@ -0,0 +1,5 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.document
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult
+
+interface InlineQueryResultDocumentCached : InlineQueryResultDocumentCommon, WithFileIdInlineQueryResult

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/document/InlineQueryResultDocumentCommon.kt

@@ -0,0 +1,12 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.document
+
+import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.Captioned
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.*
+
+const val inlineQueryResultDocumentType = "document"
+
+interface InlineQueryResultDocumentCommon : InlineQueryResult,
+    TitledInlineQueryResult,
+    DescribedInlineQueryResult,
+    Captioned,
+    WithInputMessageContentInlineQueryResult

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGif.kt

@@ -0,0 +1,5 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.gif
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.*
+
+interface InlineQueryResultGif : InlineQueryResultGifCommon, UrlInlineQueryResult, ThumbedInlineQueryResult, SizedInlineQueryResult, DuratedInlineResultQuery

src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/results/gif/InlineQueryResultGifCached.kt

@@ -0,0 +1,5 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.results.gif
+
+import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.WithFileIdInlineQueryResult
+
+interface InlineQueryResultGifCached : InlineQueryResultGifCommon, WithFileIdInlineQueryResult