hotfix after SendVoice signature change

Fix #139: Add "from" field to chat events

.gitignore

@@ -8,3 +8,6 @@ settings.xml
 .gradle/
 build/
 out/
+
+local.properties
+secret.gradle

CHANGELOG.md

@@ -42,6 +42,69 @@
         * `HttpClient#loadFile`
         * `PathedFile#download`
 
+### 0.28.5
+
+* `TelegramBotAPI-core`:
+    * Now in forward info you can get `ForwardFromSupergroupInfo`
+    * **BREAKING CHANGE** `SendVoice` factory function has changed its signature: now it have now `thumb`
+    (according to the [documentation](https://core.telegram.org/bots/api#sendvoice))
+* `TelegramBotAPI-extensions-api`:
+    * ALL REQUESTS EXECUTOR USAGES WERE REPLACED WITH `TelegramBot` TYPEALIAS. It should not bring any break changes
+    * Internal changes of `sendRegularPoll` and `sendQuizPoll` extensions
+    * Variable `defaultLivePeriodDelayMillis` now is public
+    * All `send` extensions for `TelegramBot` got their `reply` variations (issue [#144](https://github.com/InsanusMokrassar/TelegramBotAPI/issues/144))
+    * A lot of `send` extensions for `TelegramBot` got their variation with `Chat` instead of `ChatIdentifier`
+    
+### 0.28.4
+
+* `Common`:
+    * Version updates:
+        * `Ktor`: `1.4.0` -> `1.4.1`
+* `TelegramBotAPI-core`
+    * Interface `GroupEventMessage` has been added ([#140](https://github.com/InsanusMokrassar/TelegramBotAPI/pull/140))
+        * Old `GroupEventMessage` was renamed to `CommonGroupEventMessage` ([#140](https://github.com/InsanusMokrassar/TelegramBotAPI/pull/140))
+    * Interface `SupergroupEventMessage` has been added ([#140](https://github.com/InsanusMokrassar/TelegramBotAPI/pull/140))
+        * Old `SupergroupEventMessage` was renamed to `CommonSupergroupEventMessage` ([#140](https://github.com/InsanusMokrassar/TelegramBotAPI/pull/140))
+    * Any `GroupEventMessage` now have `from` field ([#140](https://github.com/InsanusMokrassar/TelegramBotAPI/pull/140))
+* `TelegramBotAPI-extensions-utils`
+    * Extensions `Flow<ChatEventMessage>#onlyGroupEvents` and `Flow<ChatEventMessage>#onlySupergroupEvents` now returns
+    `CommonGroupEventMessage` and `CommonSupergroupEventMessage`
+
+### 0.28.3
+
+* Common:
+    * Version updates:
+        * `Klock`: `0.12.0` -> `0.12.1`
+        * `Kotlin serialization`: `1.0.0-RC` -> `1.0.0-RC2` (dependency `kotlinx-serialization-core` was replaced with
+        `kotlinx-serialization-json` due to [kotlinx.serialization library update](https://github.com/Kotlin/kotlinx.serialization/blob/master/CHANGELOG.md#100-rc2--2020-09-21))
+* `TelegramBotAPI-core`:
+    * All `InlineQueryResult` has changed their type of id for more obvious relation between `InlineQueryResult#id` and
+    `ChosenInlineResult#resultId`: `String` -> `InlineQueryIdentifier`
+* `TelegramBotAPI-extensions-utils`:
+    * Several extensions for updates flows based on `InlineQueryUpdate` has been added:
+        * `Flow<InlineQueryUpdate>#onlyBaseInlineQueriesWithUpdates`
+        * `Flow<InlineQueryUpdate>#onlyBaseInlineQueries`
+        * `Flow<InlineQueryUpdate>#onlyLocationInlineQueriesWithUpdates`
+        * `Flow<InlineQueryUpdate>#onlyLocationInlineQueries`
+    * Several extensions for updates flows based on `ChosenInlineResultUpdate` has been added:
+        * `Flow<ChosenInlineResultUpdate>.onlyBaseChosenInlineResultsWithUpdates`
+        * `Flow<ChosenInlineResultUpdate>.onlyBaseChosenInlineResults`
+        * `Flow<ChosenInlineResultUpdate>.onlyLocationChosenInlineResultsWithUpdates`
+        * `Flow<ChosenInlineResultUpdate>.onlyLocationChosenInlineResults`
+
+### 0.28.2
+
+* `TelegramBotAPI-extensions-utils`:
+    * Several commands shortcuts for `Flow<ContentMessage<TextContent>>` has been added:
+        * `filterExactCommands`
+        * `filterCommandsInsideTextMessages`
+        * `filterCommandsWithArgs`
+    * Extension `Flow<BaseSentMessageUpdate>.filterCommandsWithArgs` has changed its signature: now it will also have
+    original message paired with list of text sources
+    * Shortcut method `commonMessages` for `onlyCommonMessages`
+    * Shortcuts `onlySentViaBot` and `withoutSentViaBot` now are extensions for any `Flow` with types which implementing
+    `ContentMessage`
+
 ### 0.28.1
 
 * Common:

TelegramBotAPI-core/build.gradle

@@ -41,7 +41,7 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib')
                 api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
-                api "org.jetbrains.kotlinx:kotlinx-serialization-core:$kotlin_serialisation_runtime_version"
+                api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_runtime_version"
                 api "org.jetbrains.kotlinx:kotlinx-serialization-properties:$kotlin_serialisation_runtime_version"
 
                 api "com.soywiz.korlibs.klock:klock:$klock_version"

TelegramBotAPI-core/mpp_publish_template.kpsb

@@ -1 +1 @@
-{"bintrayConfig":{"repo":"StandardRepository","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Core","description":"Library for Object-Oriented and type-safe work with Telegram Bot API","url":"https://insanusmokrassar.github.io/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}
+{"bintrayConfig":{"repo":"StandardRepository","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Core","description":"Library for Object-Oriented and type-safe work with Telegram Bot API","url":"https://insanusmokrassar.github.io/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}

TelegramBotAPI-core/publish.gradle

@@ -25,6 +25,9 @@ bintray {
         }
         into "${project.group}".replace(".", "/")
     }
+    
+    publish = true
+    
     pkg {
         repo = "StandardRepository"
         name = "${project.name}"

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/send/media/SendVoice.kt

@@ -17,7 +17,6 @@ import kotlinx.serialization.*
 fun SendVoice(
     chatId: ChatIdentifier,
     voice: InputFile,
-    thumb: InputFile? = null,
     caption: String? = null,
     parseMode: ParseMode? = null,
     duration: Long? = null,
@@ -27,13 +26,10 @@ fun SendVoice(
 ): Request<ContentMessage<VoiceContent>> {
     val voiceAsFileId = (voice as? FileId) ?.fileId
     val voiceAsFile = voice as? MultipartFile
-    val thumbAsFileId = (thumb as? FileId) ?.fileId
-    val thumbAsFile = thumb as? MultipartFile
 
     val data = SendVoiceData(
         chatId,
         voiceAsFileId,
-        thumbAsFileId,
         caption,
         parseMode,
         duration,
@@ -42,12 +38,12 @@ fun SendVoice(
         replyMarkup
     )
 
-    return if (voiceAsFile == null && thumbAsFile == null) {
+    return if (voiceAsFile == null) {
         data
     } else {
         MultipartRequestImpl(
             data,
-            SendVoiceFiles(voiceAsFile, thumbAsFile)
+            SendVoiceFiles(voiceAsFile)
         )
     }
 }
@@ -61,8 +57,6 @@ data class SendVoiceData internal constructor(
     override val chatId: ChatIdentifier,
     @SerialName(voiceField)
     val voice: String? = null,
-    @SerialName(thumbField)
-    override val thumb: String? = null,
     @SerialName(captionField)
     override val text: String? = null,
     @SerialName(parseModeField)
@@ -79,7 +73,6 @@ data class SendVoiceData internal constructor(
     SendMessageRequest<ContentMessage<VoiceContent>>,
     ReplyingMarkupSendMessageRequest<ContentMessage<VoiceContent>>,
     TextableSendMessageRequest<ContentMessage<VoiceContent>>,
-    ThumbedSendMessageRequest<ContentMessage<VoiceContent>>,
     DuratedSendMessageRequest<ContentMessage<VoiceContent>>
 {
     init {

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultArticle.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioCachedImpl.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultAudioImpl.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultContact.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentCachedImpl.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultDocumentImpl.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultGame.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultGifCachedImpl.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultGifImpl.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultLocation.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifCachedImpl.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultMpeg4GifImpl.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoCachedImpl.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultPhotoImpl.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultStickerCached.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVenue.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoCachedImpl.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVideoImpl.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceCachedImpl.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/InlineQueryResultVoiceImpl.kt

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

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/InlineQueries/InlineQueryResult/abstracts/InlineQueryResult.kt

@@ -1,12 +1,13 @@
 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.InlineQueryIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 import kotlinx.serialization.Serializable
 
 @Serializable(InlineQueryResultSerializer::class)
 interface InlineQueryResult {
     val type: String
-    val id: String
+    val id: InlineQueryIdentifier
     val replyMarkup: InlineKeyboardMarkup?
 }

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonGroupEventMessage.kt

@@ -1,14 +1,19 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.message
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.types.User
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.GroupChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.GroupEvent
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ChatEventMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.GroupEventMessage
 import com.soywiz.klock.DateTime
 
-data class GroupEventMessage(
+@Deprecated("Renamed", ReplaceWith("CommonGroupEventMessage"))
+typealias GroupEventMessage = CommonGroupEventMessage
+
+data class CommonGroupEventMessage(
     override val messageId: MessageIdentifier,
+    override val user: User,
     override val chat: GroupChat,
     override val chatEvent: GroupEvent,
     override val date: DateTime
-) : ChatEventMessage
+) : GroupEventMessage

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonSupergroupEventMessage.kt

@@ -1,14 +1,19 @@
 package com.github.insanusmokrassar.TelegramBotAPI.types.message
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
+import com.github.insanusmokrassar.TelegramBotAPI.types.User
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.SupergroupChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.SupergroupEvent
-import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ChatEventMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.SupergroupEventMessage
 import com.soywiz.klock.DateTime
 
-data class SupergroupEventMessage(
+@Deprecated("Renamed", ReplaceWith("CommonSupergroupEventMessage"))
+typealias SupergroupEventMessage = CommonSupergroupEventMessage
+
+data class CommonSupergroupEventMessage(
     override val messageId: MessageIdentifier,
+    override val user: User,
     override val chat: SupergroupChat,
     override val chatEvent: SupergroupEvent,
     override val date: DateTime
-) : ChatEventMessage
+) : SupergroupEventMessage

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ForwardInfo.kt

@@ -2,6 +2,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.message
 
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.ChannelChat
+import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.SupergroupChat
 
 sealed class ForwardInfo {
     abstract val dateOfOriginal: TelegramDate
@@ -23,3 +24,8 @@ data class ForwardFromChannelInfo(
     val channelChat: ChannelChat,
     val signature: String? = null
 ) : ForwardInfo()
+
+data class ForwardFromSupergroupInfo(
+    override val dateOfOriginal: TelegramDate,
+    val group: SupergroupChat
+) : ForwardInfo()

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/RawMessage.kt

@@ -153,6 +153,10 @@ internal data class RawMessage(
                 forward_from_chat,
                 forward_signature
             )
+            forward_from_chat is SupergroupChat -> ForwardFromSupergroupInfo(
+                forward_date,
+                forward_from_chat
+            )
             forward_from != null -> UserForwardInfo(
                 forward_date,
                 forward_from
@@ -192,14 +196,16 @@ internal data class RawMessage(
         try {
             chatEvent?.let { chatEvent ->
                 when (chat) {
-                    is SupergroupChat -> SupergroupEventMessage(
+                    is SupergroupChat -> CommonSupergroupEventMessage(
                         messageId,
+                        from ?: error("Supergroup events are expected to contain 'from' field"),
                         chat,
                         chatEvent as? SupergroupEvent ?: throwWrongChatEvent(SupergroupEvent::class, chatEvent),
                         date.asDate
                     )
-                    is GroupChat -> GroupEventMessage(
+                    is GroupChat -> CommonGroupEventMessage(
                         messageId,
+                        from ?: error("Supergroup events are expected to contain 'from' field"),
                         chat,
                         chatEvent as? GroupEvent ?: throwWrongChatEvent(GroupChat::class, chatEvent),
                         date.asDate

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/GroupEventMessage.kt

@@ -0,0 +1,3 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts
+
+interface GroupEventMessage : ChatEventMessage, FromUserMessage

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/SupergroupEventMessage.kt

@@ -0,0 +1,3 @@
+package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts
+
+interface SupergroupEventMessage : GroupEventMessage

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/content/media/VoiceContent.kt

@@ -29,7 +29,6 @@ data class VoiceContent(
     ): Request<ContentMessage<VoiceContent>> = SendVoice(
         chatId,
         media.fileId,
-        null,
         toHtmlCaptions().firstOrNull(),
         HTMLParseMode,
         media.duration,

TelegramBotAPI-core/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/JSON.kt

@@ -8,6 +8,7 @@ internal val nonstrictJsonFormat = Json {
     ignoreUnknownKeys = true
     allowSpecialFloatingPointValues = true
     useArrayPolymorphism = true
+    encodeDefaults = true
 }
 
 fun <T: Any> T.toJsonWithoutNulls(serializer: SerializationStrategy<T>): JsonObject = toJson(serializer).withoutNulls()

TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/SimpleInputFilesTest.kt

@@ -13,6 +13,7 @@ private val nonstrictJsonFormat = Json {
     ignoreUnknownKeys = true
     allowSpecialFloatingPointValues = true
     useArrayPolymorphism = true
+    encodeDefaults = true
 }
 
 class SimpleInputFilesTest {

TelegramBotAPI-core/src/commonTest/kotlin/com/github/insanusmokrassar/TelegramBotAPI/TestsJsonFormat.kt

@@ -2,4 +2,6 @@ package com.github.insanusmokrassar.TelegramBotAPI
 
 import kotlinx.serialization.json.Json
 
-val TestsJsonFormat = Json {}
+val TestsJsonFormat = Json {
+    encodeDefaults = true
+}

TelegramBotAPI-extensions-api/mpp_publish_template.json

@@ -1 +0,0 @@
-{"bintrayConfig":{"repo":"StandardRepository","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Extensions for API","description":"API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}

TelegramBotAPI-extensions-api/mpp_publish_template.kpsb

@@ -0,0 +1 @@
+{"bintrayConfig":{"repo":"StandardRepository","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"Telegram Bot API Extensions for API","description":"API extensions which provide work with RequestsExecutor of TelegramBotAPI almost like it is described in original Telegram Bot API reference","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-api","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"}

TelegramBotAPI-extensions-api/publish.gradle

@@ -25,6 +25,9 @@ bintray {
         }
         into "${project.group}".replace(".", "/")
     }
+    
+    publish = true
+    
     pkg {
         repo = "StandardRepository"
         name = "${project.name}"

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/BotBuilder.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper
 import io.ktor.client.HttpClient
 import io.ktor.client.HttpClientConfig
@@ -33,13 +33,13 @@ data class BotBuilder internal constructor(
 }
 
 /**
- * @return Created by [telegramBotWithCustomClientConfig] function [RequestsExecutor]. This executor will be preconfigured using [token] and
+ * @return Created by [telegramBotWithCustomClientConfig] function [TelegramBot]. This executor will be preconfigured using [token] and
  * [block]
  */
 fun telegramBot(
     token: String,
     block: BotBuilder.() -> Unit
-): RequestsExecutor = telegramBot(
+): TelegramBot = telegramBot(
     TelegramAPIUrlsKeeper(token),
     BotBuilder().apply(block).createHttpClient()
 )

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/BotExtensions.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api
 
 import com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorRequestsExecutor
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.utils.TelegramAPIUrlsKeeper
 import io.ktor.client.HttpClient
 import io.ktor.client.HttpClientConfig
@@ -13,7 +13,7 @@ import io.ktor.client.engine.HttpClientEngine
 fun telegramBot(
     urlsKeeper: TelegramAPIUrlsKeeper,
     client: HttpClient = HttpClient()
-): RequestsExecutor = KtorRequestsExecutor(
+): TelegramBot = KtorRequestsExecutor(
     urlsKeeper,
     client
 )
@@ -26,7 +26,7 @@ fun telegramBotWithCustomClientConfig(
     urlsKeeper: TelegramAPIUrlsKeeper,
     clientEngine: HttpClientEngine,
     clientConfig: HttpClientConfig<*>.() -> Unit = {}
-): RequestsExecutor = telegramBot(
+): TelegramBot = telegramBot(
     urlsKeeper,
     HttpClient(clientEngine, clientConfig)
 )
@@ -37,7 +37,7 @@ fun telegramBotWithCustomClientConfig(
 fun telegramBotWithCustomClientConfig(
     urlsKeeper: TelegramAPIUrlsKeeper,
     clientConfig: HttpClientConfig<*>.() -> Unit = {}
-): RequestsExecutor = telegramBot(
+): TelegramBot = telegramBot(
     urlsKeeper,
     HttpClient(clientConfig)
 )
@@ -47,7 +47,7 @@ fun telegramBotWithCustomClientConfig(
  */
 fun telegramBot(
     token: String
-): RequestsExecutor = telegramBotWithCustomClientConfig(TelegramAPIUrlsKeeper(token))
+): TelegramBot = telegramBotWithCustomClientConfig(TelegramAPIUrlsKeeper(token))
 
 /**
  * Allows to create bot using bot [token] and already prepared [client]
@@ -55,7 +55,7 @@ fun telegramBot(
 fun telegramBot(
     token: String,
     client: HttpClient
-): RequestsExecutor = telegramBot(TelegramAPIUrlsKeeper(token), client)
+): TelegramBot = telegramBot(TelegramAPIUrlsKeeper(token), client)
 
 /**
  * Allows to create bot using bot [token] and configure [HttpClient] using [clientConfig]
@@ -63,7 +63,7 @@ fun telegramBot(
 fun telegramBotWithCustomClientConfig(
     token: String,
     clientConfig: HttpClientConfig<*>.() -> Unit
-): RequestsExecutor = telegramBotWithCustomClientConfig(TelegramAPIUrlsKeeper(token), clientConfig)
+): TelegramBot = telegramBotWithCustomClientConfig(TelegramAPIUrlsKeeper(token), clientConfig)
 
 /**
  * Allows to create bot using bot [token] and specify [HttpClientEngine] by passing [clientEngine] param and optionally
@@ -73,4 +73,4 @@ fun telegramBot(
     token: String,
     clientEngine: HttpClientEngine,
     clientConfig: HttpClientConfig<*>.() -> Unit = {}
-): RequestsExecutor = telegramBotWithCustomClientConfig(TelegramAPIUrlsKeeper(token), clientEngine, clientConfig)
+): TelegramBot = telegramBotWithCustomClientConfig(TelegramAPIUrlsKeeper(token), clientEngine, clientConfig)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/DeleteMessage.kt

@@ -1,28 +1,28 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.DeleteMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 
-suspend fun RequestsExecutor.deleteMessage(
+suspend fun TelegramBot.deleteMessage(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier
 ) = execute(
     DeleteMessage(chatId, messageId)
 )
 
-suspend fun RequestsExecutor.deleteMessage(
+suspend fun TelegramBot.deleteMessage(
     chat: Chat,
     messageId: MessageIdentifier
 ) = deleteMessage(chat.id, messageId)
 
-suspend fun RequestsExecutor.deleteMessage(
+suspend fun TelegramBot.deleteMessage(
     message: Message
 ) = deleteMessage(message.chat, message.messageId)
 
 suspend fun Message.delete(
-    requestsExecutor: RequestsExecutor
+    requestsExecutor: TelegramBot
 ) = requestsExecutor.deleteMessage(this)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/ForwardMessage.kt

@@ -1,13 +1,13 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.ForwardMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 
-suspend fun RequestsExecutor.forwardMessage(
+suspend fun TelegramBot.forwardMessage(
     fromChatId: ChatIdentifier,
     toChatId: ChatIdentifier,
     messageId: MessageIdentifier,
@@ -16,34 +16,34 @@ suspend fun RequestsExecutor.forwardMessage(
     ForwardMessage(fromChatId, toChatId, messageId, disableNotification)
 )
 
-suspend fun RequestsExecutor.forwardMessage(
+suspend fun TelegramBot.forwardMessage(
     fromChat: Chat,
     toChatId: ChatIdentifier,
     messageId: MessageIdentifier,
     disableNotification: Boolean = false
 ) = forwardMessage(fromChat.id, toChatId, messageId, disableNotification)
 
-suspend fun RequestsExecutor.forwardMessage(
+suspend fun TelegramBot.forwardMessage(
     fromChatId: ChatIdentifier,
     toChat: Chat,
     messageId: MessageIdentifier,
     disableNotification: Boolean = false
 ) = forwardMessage(fromChatId, toChat.id, messageId, disableNotification)
 
-suspend fun RequestsExecutor.forwardMessage(
+suspend fun TelegramBot.forwardMessage(
     fromChat: Chat,
     toChat: Chat,
     messageId: MessageIdentifier,
     disableNotification: Boolean = false
 ) = forwardMessage(fromChat.id, toChat.id, messageId, disableNotification)
 
-suspend fun RequestsExecutor.forwardMessage(
+suspend fun TelegramBot.forwardMessage(
     toChatId: ChatIdentifier,
     message: Message,
     disableNotification: Boolean = false
 ) = forwardMessage(message.chat, toChatId, message.messageId, disableNotification)
 
-suspend fun RequestsExecutor.forwardMessage(
+suspend fun TelegramBot.forwardMessage(
     toChat: Chat,
     message: Message,
     disableNotification: Boolean = false

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/GetUpdates.kt

@@ -1,11 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.GetUpdates
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.update.abstracts.Update
 
-suspend fun RequestsExecutor.getUpdates(
+suspend fun TelegramBot.getUpdates(
     offset: UpdateIdentifier? = null,
     limit: Int = getUpdatesLimit.last,
     timeout: Seconds? = null,
@@ -16,7 +16,7 @@ suspend fun RequestsExecutor.getUpdates(
     )
 )
 
-suspend fun RequestsExecutor.getUpdates(
+suspend fun TelegramBot.getUpdates(
     lastUpdate: Update,
     limit: Int = getUpdatesLimit.last,
     timeout: Seconds? = null,

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/JsonUtils.kt

@@ -8,4 +8,5 @@ internal val nonstrictJsonFormat = Json {
     ignoreUnknownKeys = true
     allowSpecialFloatingPointValues = true
     useArrayPolymorphism = true
+    encodeDefaults = true
 }

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/LiveLocation.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.LiveLocation.editLiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.LiveLocation.stopLiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendLocation
@@ -9,6 +9,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMa
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.LocationContent
 import com.soywiz.klock.DateTime
 import com.soywiz.klock.TimeSpan
@@ -17,9 +18,9 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlin.math.ceil
 
-private val livePeriodDelayMillis = (livePeriodLimit.last - 60L) * 1000L
+val defaultLivePeriodDelayMillis = (livePeriodLimit.last - 60L) * 1000L
 class LiveLocation internal constructor(
-    private val requestsExecutor: RequestsExecutor,
+    private val requestsExecutor: TelegramBot,
     scope: CoroutineScope,
     autoCloseTimeDelay: Double,
     initMessage: ContentMessage<LocationContent>
@@ -66,12 +67,12 @@ class LiveLocation internal constructor(
     }
 }
 
-suspend fun RequestsExecutor.startLiveLocation(
+suspend fun TelegramBot.startLiveLocation(
     scope: CoroutineScope,
     chatId: ChatIdentifier,
     latitude: Double,
     longitude: Double,
-    liveTimeMillis: Long = livePeriodDelayMillis,
+    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
@@ -97,12 +98,12 @@ suspend fun RequestsExecutor.startLiveLocation(
     )
 }
 
-suspend fun RequestsExecutor.startLiveLocation(
+suspend fun TelegramBot.startLiveLocation(
     scope: CoroutineScope,
     chat: Chat,
     latitude: Double,
     longitude: Double,
-    liveTimeMillis: Long = livePeriodDelayMillis,
+    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
@@ -110,11 +111,11 @@ suspend fun RequestsExecutor.startLiveLocation(
     scope, chat.id, latitude, longitude, liveTimeMillis, disableNotification, replyToMessageId, replyMarkup
 )
 
-suspend fun RequestsExecutor.startLiveLocation(
+suspend fun TelegramBot.startLiveLocation(
     scope: CoroutineScope,
     chatId: ChatId,
     location: Location,
-    liveTimeMillis: Long = livePeriodDelayMillis,
+    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
@@ -122,14 +123,33 @@ suspend fun RequestsExecutor.startLiveLocation(
     scope, chatId, location.latitude, location.longitude, liveTimeMillis, disableNotification, replyToMessageId, replyMarkup
 )
 
-suspend fun RequestsExecutor.startLiveLocation(
+suspend fun TelegramBot.startLiveLocation(
     scope: CoroutineScope,
     chat: Chat,
     location: Location,
-    liveTimeMillis: Long = livePeriodDelayMillis,
+    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ): LiveLocation = startLiveLocation(
     scope, chat.id, location.latitude, location.longitude, liveTimeMillis, disableNotification, replyToMessageId, replyMarkup
 )
+
+suspend inline fun TelegramBot.replyWithLiveLocation(
+    to: Message,
+    scope: CoroutineScope,
+    latitude: Double,
+    longitude: Double,
+    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
+    disableNotification: Boolean = false,
+    replyMarkup: KeyboardMarkup? = null
+) = startLiveLocation(scope, to.chat, latitude, longitude, liveTimeMillis, disableNotification, to.messageId, replyMarkup)
+
+suspend inline fun TelegramBot.replyWithLiveLocation(
+    to: Message,
+    scope: CoroutineScope,
+    location: Location,
+    liveTimeMillis: Long = defaultLivePeriodDelayMillis,
+    disableNotification: Boolean = false,
+    replyMarkup: KeyboardMarkup? = null
+) = startLiveLocation(scope, to.chat, location, liveTimeMillis, disableNotification, to.messageId, replyMarkup)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/StopPoll.kt

@@ -1,13 +1,13 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.StopPoll
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 
-suspend fun RequestsExecutor.stopPoll(
+suspend fun TelegramBot.stopPoll(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
@@ -15,19 +15,19 @@ suspend fun RequestsExecutor.stopPoll(
     StopPoll(chatId, messageId, replyMarkup)
 )
 
-suspend fun RequestsExecutor.stopPoll(
+suspend fun TelegramBot.stopPoll(
     chat: Chat,
     messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = stopPoll(chat.id, messageId, replyMarkup)
 
-suspend fun RequestsExecutor.stopPoll(
+suspend fun TelegramBot.stopPoll(
     chatId: ChatId,
     message: Message,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = stopPoll(chatId, message.messageId, replyMarkup)
 
-suspend fun RequestsExecutor.stopPoll(
+suspend fun TelegramBot.stopPoll(
     chat: Chat,
     message: Message,
     replyMarkup: InlineKeyboardMarkup? = null

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/answers/AnswerCallbackQuery.kt

@@ -1,11 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.answers
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.AnswerCallbackQuery
 import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQuery.CallbackQuery
 import com.github.insanusmokrassar.TelegramBotAPI.types.CallbackQueryIdentifier
 
-suspend fun RequestsExecutor.answerCallbackQuery(
+suspend fun TelegramBot.answerCallbackQuery(
     callbackQueryId: CallbackQueryIdentifier,
     text: String? = null,
     showAlert: Boolean? = null,
@@ -13,7 +13,7 @@ suspend fun RequestsExecutor.answerCallbackQuery(
     cachedTimeSeconds: Int? = null
 ) = execute(AnswerCallbackQuery(callbackQueryId, text, showAlert, url, cachedTimeSeconds))
 
-suspend fun RequestsExecutor.answerCallbackQuery(
+suspend fun TelegramBot.answerCallbackQuery(
     callbackQuery: CallbackQuery,
     text: String? = null,
     showAlert: Boolean? = null,

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/answers/AnswerInlineQuery.kt

@@ -1,12 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.answers
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.AnswerInlineQuery
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.InlineQueryResult.abstracts.InlineQueryResult
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueries.abstracts.InlineQuery
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineQueryIdentifier
 
-suspend fun RequestsExecutor.answerInlineQuery(
+suspend fun TelegramBot.answerInlineQuery(
     inlineQueryID: InlineQueryIdentifier,
     results: List<InlineQueryResult> = emptyList(),
     cachedTime: Int? = null,
@@ -18,7 +18,7 @@ suspend fun RequestsExecutor.answerInlineQuery(
     AnswerInlineQuery(inlineQueryID, results, cachedTime, isPersonal, nextOffset, switchPmText, switchPmParameter)
 )
 
-suspend fun RequestsExecutor.answerInlineQuery(
+suspend fun TelegramBot.answerInlineQuery(
     inlineQuery: InlineQuery,
     results: List<InlineQueryResult> = emptyList(),
     cachedTime: Int? = null,

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/answers/payments/AnswerPreCheckoutQuery.kt

@@ -1,23 +1,23 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.answers.payments
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.AnswerPreCheckoutQueryError
 import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.AnswerPreCheckoutQueryOk
 import com.github.insanusmokrassar.TelegramBotAPI.types.PreCheckoutQueryId
 import com.github.insanusmokrassar.TelegramBotAPI.types.payments.PreCheckoutQuery
 
-suspend fun RequestsExecutor.answerPreCheckoutQueryOk(
+suspend fun TelegramBot.answerPreCheckoutQueryOk(
     id: PreCheckoutQueryId
 ) = execute(AnswerPreCheckoutQueryOk(id))
-suspend fun RequestsExecutor.answerPreCheckoutQueryOk(
+suspend fun TelegramBot.answerPreCheckoutQueryOk(
     preCheckoutQuery: PreCheckoutQuery
 ) = answerPreCheckoutQueryOk(preCheckoutQuery.id)
 
-suspend fun RequestsExecutor.answerPreCheckoutQueryError(
+suspend fun TelegramBot.answerPreCheckoutQueryError(
     id: PreCheckoutQueryId,
     error: String
 ) = execute(AnswerPreCheckoutQueryError(id, error))
-suspend fun RequestsExecutor.answerPreCheckoutQueryError(
+suspend fun TelegramBot.answerPreCheckoutQueryError(
     preCheckoutQuery: PreCheckoutQuery,
     error: String
 ) = answerPreCheckoutQueryError(preCheckoutQuery.id, error)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/answers/payments/AnswerShippingQuery.kt

@@ -1,26 +1,26 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.answers.payments
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.AnswerShippingQueryError
 import com.github.insanusmokrassar.TelegramBotAPI.requests.answers.payments.AnswerShippingQueryOk
 import com.github.insanusmokrassar.TelegramBotAPI.types.ShippingQueryIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.payments.ShippingOption
 import com.github.insanusmokrassar.TelegramBotAPI.types.payments.ShippingQuery
 
-suspend fun RequestsExecutor.answerShippingQueryOk(
+suspend fun TelegramBot.answerShippingQueryOk(
     id: ShippingQueryIdentifier,
     shippingOptions: List<ShippingOption>
 ) = execute(AnswerShippingQueryOk(id, shippingOptions))
-suspend fun RequestsExecutor.answerShippingQueryOk(
+suspend fun TelegramBot.answerShippingQueryOk(
     shippingQuery: ShippingQuery,
     shippingOptions: List<ShippingOption>
 ) = answerShippingQueryOk(shippingQuery.id, shippingOptions)
 
-suspend fun RequestsExecutor.answerShippingQueryError(
+suspend fun TelegramBot.answerShippingQueryError(
     id: ShippingQueryIdentifier,
     error: String
 ) = execute(AnswerShippingQueryError(id, error))
-suspend fun RequestsExecutor.answerShippingQueryError(
+suspend fun TelegramBot.answerShippingQueryError(
     shippingQuery: ShippingQuery,
     error: String
 ) = answerShippingQueryError(shippingQuery.id, error)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/bot/GetMe.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.bot
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.bot.GetMe
 
-suspend fun RequestsExecutor.getMe() = execute(GetMe)
+suspend fun TelegramBot.getMe() = execute(GetMe)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/bot/GetMyCommands.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.bot
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.bot.GetMyCommands
 
-suspend fun RequestsExecutor.getMyCommands() = execute(GetMyCommands)
+suspend fun TelegramBot.getMyCommands() = execute(GetMyCommands)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/bot/SetMyCommands.kt

@@ -1,13 +1,13 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.bot
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.bot.SetMyCommands
 import com.github.insanusmokrassar.TelegramBotAPI.types.BotCommand
 
-suspend fun RequestsExecutor.setMyCommands(
+suspend fun TelegramBot.setMyCommands(
     commands: List<BotCommand>
 ) = execute(SetMyCommands(commands))
 
-suspend fun RequestsExecutor.setMyCommands(
+suspend fun TelegramBot.setMyCommands(
     vararg commands: BotCommand
 ) = setMyCommands(commands.toList())

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/ExportChatInviteLink.kt

@@ -1,14 +1,14 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.ExportChatInviteLink
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.exportChatInviteLink(
+suspend fun TelegramBot.exportChatInviteLink(
     chatId: ChatIdentifier
 ) = execute(ExportChatInviteLink(chatId))
 
-suspend fun RequestsExecutor.exportChatInviteLink(
+suspend fun TelegramBot.exportChatInviteLink(
     chat: PublicChat
 ) = exportChatInviteLink(chat.id)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/LeaveChat.kt

@@ -1,14 +1,14 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.LeaveChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.leaveChat(
+suspend fun TelegramBot.leaveChat(
     chatId: ChatIdentifier
 ) = execute(LeaveChat(chatId))
 
-suspend fun RequestsExecutor.leaveChat(
+suspend fun TelegramBot.leaveChat(
     chat: PublicChat
 ) = leaveChat(chat.id)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/get/GetChat.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.get
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get.GetChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.*
@@ -9,11 +9,11 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.extended.
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.extended.*
 import com.github.insanusmokrassar.TelegramBotAPI.utils.PreviewFeature
 
-suspend fun RequestsExecutor.getChat(
+suspend fun TelegramBot.getChat(
     chatId: ChatIdentifier
 ) = execute(GetChat(chatId))
 
-suspend fun RequestsExecutor.getChat(
+suspend fun TelegramBot.getChat(
     chat: Chat
 ) = getChat(chat.id)
 
@@ -24,7 +24,7 @@ suspend fun RequestsExecutor.getChat(
  * @throws ClassCastException
  */
 @PreviewFeature
-suspend fun RequestsExecutor.getChat(
+suspend fun TelegramBot.getChat(
     chat: PublicChat
 ) = getChat(chat.id) as ExtendedPublicChat
 
@@ -36,7 +36,7 @@ suspend fun RequestsExecutor.getChat(
  * @throws ClassCastException
  */
 @PreviewFeature
-suspend fun RequestsExecutor.getChat(
+suspend fun TelegramBot.getChat(
     chat: ChannelChat
 ) = getChat(chat.id) as ExtendedChannelChat
 
@@ -47,7 +47,7 @@ suspend fun RequestsExecutor.getChat(
  * @throws ClassCastException
  */
 @PreviewFeature
-suspend fun RequestsExecutor.getChat(
+suspend fun TelegramBot.getChat(
     chat: ChannelChatImpl
 ) = getChat(chat.id) as ExtendedChannelChatImpl
 
@@ -59,7 +59,7 @@ suspend fun RequestsExecutor.getChat(
  * @throws ClassCastException
  */
 @PreviewFeature
-suspend fun RequestsExecutor.getChat(
+suspend fun TelegramBot.getChat(
     chat: GroupChat
 ) = getChat(chat.id) as ExtendedGroupChat
 
@@ -70,7 +70,7 @@ suspend fun RequestsExecutor.getChat(
  * @throws ClassCastException
  */
 @PreviewFeature
-suspend fun RequestsExecutor.getChat(
+suspend fun TelegramBot.getChat(
     chat: GroupChatImpl
 ) = getChat(chat.id) as ExtendedGroupChatImpl
 
@@ -82,7 +82,7 @@ suspend fun RequestsExecutor.getChat(
  * @throws ClassCastException
  */
 @PreviewFeature
-suspend fun RequestsExecutor.getChat(
+suspend fun TelegramBot.getChat(
     chat: SupergroupChat
 ) = getChat(chat.id) as ExtendedSupergroupChat
 
@@ -93,7 +93,7 @@ suspend fun RequestsExecutor.getChat(
  * @throws ClassCastException
  */
 @PreviewFeature
-suspend fun RequestsExecutor.getChat(
+suspend fun TelegramBot.getChat(
     chat: SupergroupChatImpl
 ) = getChat(chat.id) as ExtendedSupergroupChatImpl
 
@@ -105,7 +105,7 @@ suspend fun RequestsExecutor.getChat(
  * @throws ClassCastException
  */
 @PreviewFeature
-suspend fun RequestsExecutor.getChat(
+suspend fun TelegramBot.getChat(
     chat: PrivateChat
 ) = getChat(chat.id) as ExtendedPrivateChat
 
@@ -116,7 +116,7 @@ suspend fun RequestsExecutor.getChat(
  * @throws ClassCastException
  */
 @PreviewFeature
-suspend fun RequestsExecutor.getChat(
+suspend fun TelegramBot.getChat(
     chat: PrivateChatImpl
 ) = getChat(chat.id) as ExtendedPrivateChatImpl
 
@@ -127,6 +127,6 @@ suspend fun RequestsExecutor.getChat(
  * @throws ClassCastException
  */
 @PreviewFeature
-suspend fun RequestsExecutor.getChat(
+suspend fun TelegramBot.getChat(
     chat: CommonUser
 ) = getChat(chat.id) as ExtendedUser

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/get/GetChatAdministrators.kt

@@ -1,14 +1,14 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.get
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get.GetChatAdministrators
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.getChatAdministrators(
+suspend fun TelegramBot.getChatAdministrators(
     chatId: ChatIdentifier
 ) = execute(GetChatAdministrators(chatId))
 
-suspend fun RequestsExecutor.getChatAdministrators(
+suspend fun TelegramBot.getChatAdministrators(
     chat: PublicChat
 ) = getChatAdministrators(chat.id)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/get/GetChatMembersCount.kt

@@ -1,14 +1,14 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.get
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.get.GetChatMembersCount
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.getChatMembersCount(
+suspend fun TelegramBot.getChatMembersCount(
     chatId: ChatIdentifier
 ) = execute(GetChatMembersCount(chatId))
 
-suspend fun RequestsExecutor.getChatMembersCount(
+suspend fun TelegramBot.getChatMembersCount(
     chat: PublicChat
 ) = getChatMembersCount(chat.id)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/GetChatMember.kt

@@ -1,26 +1,26 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.members
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.GetChatMember
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.getChatMember(
+suspend fun TelegramBot.getChatMember(
     chatId: ChatIdentifier,
     userId: UserId
 ) = execute(GetChatMember(chatId, userId))
 
-suspend fun RequestsExecutor.getChatMember(
+suspend fun TelegramBot.getChatMember(
     chat: PublicChat,
     userId: UserId
 ) = getChatMember(chat.id, userId)
 
-suspend fun RequestsExecutor.getChatMember(
+suspend fun TelegramBot.getChatMember(
     chatId: ChatId,
     user: User
 ) = getChatMember(chatId, user.id)
 
-suspend fun RequestsExecutor.getChatMember(
+suspend fun TelegramBot.getChatMember(
     chat: PublicChat,
     user: User
 ) = getChatMember(chat.id, user.id)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/KickChatMember.kt

@@ -1,29 +1,29 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.members
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.KickChatMember
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.kickChatMember(
+suspend fun TelegramBot.kickChatMember(
     chatId: ChatIdentifier,
     userId: UserId,
     untilDate: TelegramDate? = null
 ) = execute(KickChatMember(chatId, userId, untilDate))
 
-suspend fun RequestsExecutor.kickChatMember(
+suspend fun TelegramBot.kickChatMember(
     chat: PublicChat,
     userId: UserId,
     untilDate: TelegramDate? = null
 ) = kickChatMember(chat.id, userId, untilDate)
 
-suspend fun RequestsExecutor.kickChatMember(
+suspend fun TelegramBot.kickChatMember(
     chatId: ChatId,
     user: User,
     untilDate: TelegramDate? = null
 ) = kickChatMember(chatId, user.id, untilDate)
 
-suspend fun RequestsExecutor.kickChatMember(
+suspend fun TelegramBot.kickChatMember(
     chat: PublicChat,
     user: User,
     untilDate: TelegramDate? = null

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/PromoteChatMember.kt

@@ -1,11 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.members
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.PromoteChatMember
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.promoteChatMember(
+suspend fun TelegramBot.promoteChatMember(
     chatId: ChatIdentifier,
     userId: UserId,
     untilDate: TelegramDate? = null,
@@ -33,7 +33,7 @@ suspend fun RequestsExecutor.promoteChatMember(
     )
 )
 
-suspend fun RequestsExecutor.promoteChatMember(
+suspend fun TelegramBot.promoteChatMember(
     chat: PublicChat,
     userId: UserId,
     untilDate: TelegramDate? = null,
@@ -59,7 +59,7 @@ suspend fun RequestsExecutor.promoteChatMember(
     canPromoteMembers
 )
 
-suspend fun RequestsExecutor.promoteChatMember(
+suspend fun TelegramBot.promoteChatMember(
     chatId: ChatId,
     user: User,
     untilDate: TelegramDate? = null,
@@ -85,7 +85,7 @@ suspend fun RequestsExecutor.promoteChatMember(
     canPromoteMembers
 )
 
-suspend fun RequestsExecutor.promoteChatMember(
+suspend fun TelegramBot.promoteChatMember(
     chat: PublicChat,
     user: User,
     untilDate: TelegramDate? = null,

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/RestrictChatMember.kt

@@ -1,33 +1,33 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.members
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.RestrictChatMember
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ChatPermissions
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.restrictChatMember(
+suspend fun TelegramBot.restrictChatMember(
     chatId: ChatIdentifier,
     userId: UserId,
     untilDate: TelegramDate? = null,
     permissions: ChatPermissions = ChatPermissions()
 ) = execute(RestrictChatMember(chatId, userId, untilDate, permissions))
 
-suspend fun RequestsExecutor.restrictChatMember(
+suspend fun TelegramBot.restrictChatMember(
     chat: PublicChat,
     userId: UserId,
     untilDate: TelegramDate? = null,
     permissions: ChatPermissions = ChatPermissions()
 ) = restrictChatMember(chat.id, userId, untilDate, permissions)
 
-suspend fun RequestsExecutor.restrictChatMember(
+suspend fun TelegramBot.restrictChatMember(
     chatId: ChatId,
     user: User,
     untilDate: TelegramDate? = null,
     permissions: ChatPermissions = ChatPermissions()
 ) = restrictChatMember(chatId, user.id, untilDate, permissions)
 
-suspend fun RequestsExecutor.restrictChatMember(
+suspend fun TelegramBot.restrictChatMember(
     chat: PublicChat,
     user: User,
     untilDate: TelegramDate? = null,

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/SetChatAdministratorCustomTitle.kt

@@ -1,29 +1,29 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.members
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.SetChatAdministratorCustomTitle
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.setChatAdministratorCustomTitle(
+suspend fun TelegramBot.setChatAdministratorCustomTitle(
     chatId: ChatId,
     userId: UserId,
     customTitle: String
 ) = execute(SetChatAdministratorCustomTitle(chatId, userId, customTitle))
 
-suspend fun RequestsExecutor.setChatAdministratorCustomTitle(
+suspend fun TelegramBot.setChatAdministratorCustomTitle(
     chat: PublicChat,
     userId: UserId,
     customTitle: String
 ) = setChatAdministratorCustomTitle(chat.id, userId, customTitle)
 
-suspend fun RequestsExecutor.setChatAdministratorCustomTitle(
+suspend fun TelegramBot.setChatAdministratorCustomTitle(
     chatId: ChatId,
     user: User,
     customTitle: String
 ) = setChatAdministratorCustomTitle(chatId, user.id, customTitle)
 
-suspend fun RequestsExecutor.setChatAdministratorCustomTitle(
+suspend fun TelegramBot.setChatAdministratorCustomTitle(
     chat: PublicChat,
     user: User,
     customTitle: String

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/members/UnbanChatMember.kt

@@ -1,26 +1,26 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.members
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.members.UnbanChatMember
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.unbanChatMember(
+suspend fun TelegramBot.unbanChatMember(
     chatId: ChatIdentifier,
     userId: UserId
 ) = execute(UnbanChatMember(chatId, userId))
 
-suspend fun RequestsExecutor.unbanChatMember(
+suspend fun TelegramBot.unbanChatMember(
     chat: PublicChat,
     userId: UserId
 ) = unbanChatMember(chat.id, userId)
 
-suspend fun RequestsExecutor.unbanChatMember(
+suspend fun TelegramBot.unbanChatMember(
     chatId: ChatId,
     user: User
 ) = unbanChatMember(chatId, user.id)
 
-suspend fun RequestsExecutor.unbanChatMember(
+suspend fun TelegramBot.unbanChatMember(
     chat: PublicChat,
     user: User
 ) = unbanChatMember(chat.id, user.id)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/DeleteChatPhoto.kt

@@ -1,14 +1,14 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.modify
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.DeleteChatPhoto
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.deleteChatPhoto(
+suspend fun TelegramBot.deleteChatPhoto(
     chatId: ChatIdentifier
 ) = execute(DeleteChatPhoto(chatId))
 
-suspend fun RequestsExecutor.deleteChatPhoto(
+suspend fun TelegramBot.deleteChatPhoto(
     chat: PublicChat
 ) = deleteChatPhoto(chat.id)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/PinChatMessage.kt

@@ -1,25 +1,25 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.modify
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.PinChatMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 
-suspend fun RequestsExecutor.pinChatMessage(
+suspend fun TelegramBot.pinChatMessage(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
     disableNotification: Boolean = false
 ) = execute(PinChatMessage(chatId, messageId, disableNotification))
 
-suspend fun RequestsExecutor.pinChatMessage(
+suspend fun TelegramBot.pinChatMessage(
     chat: PublicChat,
     messageId: MessageIdentifier,
     disableNotification: Boolean = false
 ) = pinChatMessage(chat.id, messageId, disableNotification)
 
-suspend fun RequestsExecutor.pinChatMessage(
+suspend fun TelegramBot.pinChatMessage(
     message: Message,
     disableNotification: Boolean = false
 ) = if (message.chat is PublicChat) {

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatDescription.kt

@@ -1,16 +1,16 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.modify
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.SetChatDescription
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.setChatDescription(
+suspend fun TelegramBot.setChatDescription(
     chatId: ChatIdentifier,
     description: String
 ) = execute(SetChatDescription(chatId, description))
 
-suspend fun RequestsExecutor.setChatDescription(
+suspend fun TelegramBot.setChatDescription(
     chat: PublicChat,
     description: String
 ) = setChatDescription(chat.id, description)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatPermissions.kt

@@ -1,17 +1,17 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.modify
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.SetChatPermissions
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.ChatPermissions
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.setDefaultChatMembersPermissions(
+suspend fun TelegramBot.setDefaultChatMembersPermissions(
     chatId: ChatIdentifier,
     permissions: ChatPermissions
 ) = execute(SetChatPermissions(chatId, permissions))
 
-suspend fun RequestsExecutor.setDefaultChatMembersPermissions(
+suspend fun TelegramBot.setDefaultChatMembersPermissions(
     chat: PublicChat,
     permissions: ChatPermissions
 ) = setDefaultChatMembersPermissions(chat.id, permissions)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatPhoto.kt

@@ -1,17 +1,17 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.modify
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.MultipartFile
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.SetChatPhoto
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.setChatPhoto(
+suspend fun TelegramBot.setChatPhoto(
     chatId: ChatIdentifier,
     photo: MultipartFile
 ) = execute(SetChatPhoto(chatId, photo))
 
-suspend fun RequestsExecutor.setChatPhoto(
+suspend fun TelegramBot.setChatPhoto(
     chat: PublicChat,
     photo: MultipartFile
 ) = setChatPhoto(chat.id, photo)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/SetChatTitle.kt

@@ -1,16 +1,16 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.modify
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.SetChatTitle
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.setChatTitle(
+suspend fun TelegramBot.setChatTitle(
     chatId: ChatIdentifier,
     title: String
 ) = execute(SetChatTitle(chatId, title))
 
-suspend fun RequestsExecutor.setChatTitle(
+suspend fun TelegramBot.setChatTitle(
     chat: PublicChat,
     title: String
 ) = setChatTitle(chat.id, title)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/modify/UnpinChatMessage.kt

@@ -1,14 +1,14 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.modify
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.modify.UnpinChatMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.PublicChat
 
-suspend fun RequestsExecutor.unpinChatMessage(
+suspend fun TelegramBot.unpinChatMessage(
     chatId: ChatIdentifier
 ) = execute(UnpinChatMessage(chatId))
 
-suspend fun RequestsExecutor.unpinChatMessage(
+suspend fun TelegramBot.unpinChatMessage(
     chat: PublicChat
 ) = unpinChatMessage(chat.id)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/stickers/DeleteChatStickerSet.kt

@@ -1,14 +1,14 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.stickers
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.stickers.DeleteChatStickerSet
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.SupergroupChat
 
-suspend fun RequestsExecutor.deleteChatStickerSet(
+suspend fun TelegramBot.deleteChatStickerSet(
     chatId: ChatIdentifier
 ) = execute(DeleteChatStickerSet(chatId))
 
-suspend fun RequestsExecutor.deleteChatStickerSet(
+suspend fun TelegramBot.deleteChatStickerSet(
     chat: SupergroupChat
 ) = deleteChatStickerSet(chat.id)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/chat/stickers/SetChatStickerSet.kt

@@ -1,17 +1,17 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.stickers
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.chat.stickers.SetChatStickerSet
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.StickerSetName
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.SupergroupChat
 
-suspend fun RequestsExecutor.setChatStickerSet(
+suspend fun TelegramBot.setChatStickerSet(
     chatId: ChatIdentifier,
     stickerSetName: StickerSetName
 ) = execute(SetChatStickerSet(chatId, stickerSetName))
 
-suspend fun RequestsExecutor.setChatStickerSet(
+suspend fun TelegramBot.setChatStickerSet(
     chat: SupergroupChat,
     stickerSetName: StickerSetName
 ) = setChatStickerSet(chat.id, stickerSetName)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/LiveLocation/EditChatMessageLiveLocation.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.LiveLocation
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.EditChatMessageLiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
@@ -8,7 +8,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.LocationContent
 
-suspend fun RequestsExecutor.editLiveLocation(
+suspend fun TelegramBot.editLiveLocation(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
     latitude: Double,
@@ -20,7 +20,7 @@ suspend fun RequestsExecutor.editLiveLocation(
     )
 )
 
-suspend fun RequestsExecutor.editLiveLocation(
+suspend fun TelegramBot.editLiveLocation(
     chat: Chat,
     messageId: MessageIdentifier,
     latitude: Double,
@@ -28,14 +28,14 @@ suspend fun RequestsExecutor.editLiveLocation(
     replyMarkup: InlineKeyboardMarkup? = null
 ) = editLiveLocation(chat.id, messageId, latitude, longitude, replyMarkup)
 
-suspend fun RequestsExecutor.editLiveLocation(
+suspend fun TelegramBot.editLiveLocation(
     message: ContentMessage<LocationContent>,
     latitude: Double,
     longitude: Double,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = editLiveLocation(message.chat, message.messageId, latitude, longitude, replyMarkup)
 
-suspend fun RequestsExecutor.editLiveLocation(
+suspend fun TelegramBot.editLiveLocation(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
     location: Location,
@@ -46,14 +46,14 @@ suspend fun RequestsExecutor.editLiveLocation(
     )
 )
 
-suspend fun RequestsExecutor.editLiveLocation(
+suspend fun TelegramBot.editLiveLocation(
     chat: Chat,
     messageId: MessageIdentifier,
     location: Location,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = editLiveLocation(chat.id, messageId, location.latitude, location.longitude, replyMarkup)
 
-suspend fun RequestsExecutor.editLiveLocation(
+suspend fun TelegramBot.editLiveLocation(
     message: ContentMessage<LocationContent>,
     location: Location,
     replyMarkup: InlineKeyboardMarkup? = null

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/LiveLocation/EditInlineMessageLiveLocation.kt

@@ -1,12 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.LiveLocation
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.EditInlineMessageLiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.Location
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 
-suspend fun RequestsExecutor.editLiveLocation(
+suspend fun TelegramBot.editLiveLocation(
     inlineMessageId: InlineMessageIdentifier,
     latitude: Double,
     longitude: Double,
@@ -16,7 +16,7 @@ suspend fun RequestsExecutor.editLiveLocation(
         inlineMessageId, latitude, longitude, replyMarkup
     )
 )
-suspend fun RequestsExecutor.editLiveLocation(
+suspend fun TelegramBot.editLiveLocation(
     inlineMessageId: InlineMessageIdentifier,
     location: Location,
     replyMarkup: InlineKeyboardMarkup? = null

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/LiveLocation/StopChatMessageLiveLocation.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.LiveLocation
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.StopChatMessageLiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
@@ -9,7 +9,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.LocationContent
 
-suspend fun RequestsExecutor.stopLiveLocation(
+suspend fun TelegramBot.stopLiveLocation(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
@@ -19,13 +19,13 @@ suspend fun RequestsExecutor.stopLiveLocation(
     )
 )
 
-suspend fun RequestsExecutor.stopLiveLocation(
+suspend fun TelegramBot.stopLiveLocation(
     chat: Chat,
     messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = stopLiveLocation(chat.id, messageId, replyMarkup)
 
-suspend fun RequestsExecutor.stopLiveLocation(
+suspend fun TelegramBot.stopLiveLocation(
     message: ContentMessage<LocationContent>,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = stopLiveLocation(message.chat, message.messageId, replyMarkup)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/LiveLocation/StopInlineMessageLiveLocation.kt

@@ -1,11 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.LiveLocation
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.LiveLocation.StopInlineMessageLiveLocation
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 
-suspend fun RequestsExecutor.stopLiveLocation(
+suspend fun TelegramBot.stopLiveLocation(
     inlineMessageId: InlineMessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/ReplyMarkup/EditChatMessageReplyMarkup.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.ReplyMarkup
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.ReplyMarkup.EditChatMessageReplyMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
@@ -8,7 +8,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMa
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 
-suspend fun RequestsExecutor.editMessageReplyMarkup(
+suspend fun TelegramBot.editMessageReplyMarkup(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
@@ -16,13 +16,13 @@ suspend fun RequestsExecutor.editMessageReplyMarkup(
     EditChatMessageReplyMarkup(chatId, messageId, replyMarkup)
 )
 
-suspend fun RequestsExecutor.editMessageReplyMarkup(
+suspend fun TelegramBot.editMessageReplyMarkup(
     chat: Chat,
     messageId: MessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageReplyMarkup(chat.id, messageId, replyMarkup)
 
-suspend fun RequestsExecutor.editMessageReplyMarkup(
+suspend fun TelegramBot.editMessageReplyMarkup(
     message: Message,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageReplyMarkup(message.chat.id, message.messageId, replyMarkup)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/ReplyMarkup/EditInlineMessageReplyMarkup.kt

@@ -1,11 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.ReplyMarkup
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.ReplyMarkup.EditInlineMessageReplyMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 
-suspend fun RequestsExecutor.editMessageReplyMarkup(
+suspend fun TelegramBot.editMessageReplyMarkup(
     inlineMessageId: InlineMessageIdentifier,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = execute(EditInlineMessageReplyMarkup(inlineMessageId, replyMarkup))

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/caption/EditChatMessageCaption.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.caption
 
 import com.github.insanusmokrassar.TelegramBotAPI.CommonAbstracts.CaptionedInput
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.caption.EditChatMessageCaption
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
@@ -11,7 +11,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent
 
-suspend fun RequestsExecutor.editMessageCaption(
+suspend fun TelegramBot.editMessageCaption(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
     text: String,
@@ -21,7 +21,7 @@ suspend fun RequestsExecutor.editMessageCaption(
     EditChatMessageCaption(chatId, messageId, text, parseMode, replyMarkup)
 )
 
-suspend fun RequestsExecutor.editMessageCaption(
+suspend fun TelegramBot.editMessageCaption(
     chat: Chat,
     messageId: MessageIdentifier,
     text: String,
@@ -29,7 +29,7 @@ suspend fun RequestsExecutor.editMessageCaption(
     replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageCaption(chat.id, messageId, text, parseMode, replyMarkup)
 
-suspend fun <T> RequestsExecutor.editMessageCaption(
+suspend fun <T> TelegramBot.editMessageCaption(
     message: ContentMessage<T>,
     text: String,
     parseMode: ParseMode? = null,

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/caption/EditInlineMessageCaption.kt

@@ -1,12 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.caption
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.caption.EditInlineMessageCaption
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 
-suspend fun RequestsExecutor.editMessageCaption(
+suspend fun TelegramBot.editMessageCaption(
     inlineMessageId: InlineMessageIdentifier,
     text: String,
     parseMode: ParseMode? = null,

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/media/EditChatMessageMedia.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.media
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media.EditChatMessageMedia
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia
@@ -10,7 +10,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent
 
-suspend fun RequestsExecutor.editMessageMedia(
+suspend fun TelegramBot.editMessageMedia(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
     media: InputMedia,
@@ -19,14 +19,14 @@ suspend fun RequestsExecutor.editMessageMedia(
     EditChatMessageMedia(chatId, messageId, media, replyMarkup)
 )
 
-suspend fun RequestsExecutor.editMessageMedia(
+suspend fun TelegramBot.editMessageMedia(
     chat: Chat,
     messageId: MessageIdentifier,
     media: InputMedia,
     replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageMedia(chat.id, messageId, media, replyMarkup)
 
-suspend fun RequestsExecutor.editMessageMedia(
+suspend fun TelegramBot.editMessageMedia(
     message: ContentMessage<out MediaContent>,
     media: InputMedia,
     replyMarkup: InlineKeyboardMarkup? = null

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/media/EditInlineMessageMedia.kt

@@ -1,12 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.media
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.media.EditInlineMessageMedia
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.InputMedia.InputMedia
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 
-suspend fun RequestsExecutor.editMessageCaption(
+suspend fun TelegramBot.editMessageCaption(
     inlineMessageId: InlineMessageIdentifier,
     media: InputMedia,
     replyMarkup: InlineKeyboardMarkup? = null

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/text/EditChatMessageText.kt

@@ -1,6 +1,6 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.text
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.text.EditChatMessageText
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
@@ -10,7 +10,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.TextContent
 
-suspend fun RequestsExecutor.editMessageText(
+suspend fun TelegramBot.editMessageText(
     chatId: ChatIdentifier,
     messageId: MessageIdentifier,
     text: String,
@@ -21,7 +21,7 @@ suspend fun RequestsExecutor.editMessageText(
     EditChatMessageText(chatId, messageId, text, parseMode, disableWebPagePreview, replyMarkup)
 )
 
-suspend fun RequestsExecutor.editMessageText(
+suspend fun TelegramBot.editMessageText(
     chat: Chat,
     messageId: MessageIdentifier,
     text: String,
@@ -30,7 +30,7 @@ suspend fun RequestsExecutor.editMessageText(
     replyMarkup: InlineKeyboardMarkup? = null
 ) = editMessageText(chat.id, messageId, text, parseMode, disableWebPagePreview, replyMarkup)
 
-suspend fun RequestsExecutor.editMessageText(
+suspend fun TelegramBot.editMessageText(
     message: ContentMessage<TextContent>,
     text: String,
     parseMode: ParseMode? = null,

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/edit/text/EditInlineMessageText.kt

@@ -1,12 +1,12 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.edit.text
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.edit.text.EditInlineMessageText
 import com.github.insanusmokrassar.TelegramBotAPI.types.InlineMessageIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMarkup
 
-suspend fun RequestsExecutor.editMessageText(
+suspend fun TelegramBot.editMessageText(
     inlineMessageId: InlineMessageIdentifier,
     text: String,
     parseMode: ParseMode? = null,

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/games/GetGameHighScoresByChat.kt

@@ -1,13 +1,13 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.games
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.GetGameHighScoresByChat
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.GameContent
 
-suspend fun RequestsExecutor.getGameScore(
+suspend fun TelegramBot.getGameScore(
     userId: UserId,
     chatId: ChatId,
     messageId: MessageIdentifier
@@ -15,7 +15,7 @@ suspend fun RequestsExecutor.getGameScore(
     GetGameHighScoresByChat(userId, chatId, messageId)
 )
 
-suspend fun RequestsExecutor.getGameScore(
+suspend fun TelegramBot.getGameScore(
     user: CommonUser,
     chatId: ChatId,
     messageId: MessageIdentifier
@@ -23,7 +23,7 @@ suspend fun RequestsExecutor.getGameScore(
     user.id, chatId, messageId
 )
 
-suspend fun RequestsExecutor.getGameScore(
+suspend fun TelegramBot.getGameScore(
     userId: UserId,
     chat: Chat,
     messageId: MessageIdentifier
@@ -31,7 +31,7 @@ suspend fun RequestsExecutor.getGameScore(
     userId, chat.id, messageId
 )
 
-suspend fun RequestsExecutor.getGameScore(
+suspend fun TelegramBot.getGameScore(
     user: CommonUser,
     chat: Chat,
     messageId: MessageIdentifier
@@ -39,14 +39,14 @@ suspend fun RequestsExecutor.getGameScore(
     user.id, chat.id, messageId
 )
 
-suspend fun RequestsExecutor.getGameScore(
+suspend fun TelegramBot.getGameScore(
     userId: UserId,
     message: ContentMessage<GameContent>
 ) = getGameScore(
     userId, message.chat.id, message.messageId
 )
 
-suspend fun RequestsExecutor.getGameScore(
+suspend fun TelegramBot.getGameScore(
     user: CommonUser,
     message: ContentMessage<GameContent>
 ) = getGameScore(

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/games/GetGameHighScoresByInlineMessageId.kt

@@ -1,10 +1,10 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.games
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.GetGameHighScoresByInlineMessageId
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 
-suspend fun RequestsExecutor.getGameScore(
+suspend fun TelegramBot.getGameScore(
     userId: UserId,
     inlineMessageId: InlineMessageIdentifier
 ) = execute(
@@ -13,7 +13,7 @@ suspend fun RequestsExecutor.getGameScore(
     )
 )
 
-suspend fun RequestsExecutor.getGameScore(
+suspend fun TelegramBot.getGameScore(
     user: CommonUser,
     inlineMessageId: InlineMessageIdentifier
 ) = getGameScore(user.id, inlineMessageId)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/games/SetGameScoreByChatId.kt

@@ -1,13 +1,13 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.games
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.SetGameScoreByChatId
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ContentMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.GameContent
 
-suspend fun RequestsExecutor.setGameScore(
+suspend fun TelegramBot.setGameScore(
     userId: UserId,
     score: Long,
     chatId: ChatId,
@@ -18,7 +18,7 @@ suspend fun RequestsExecutor.setGameScore(
     SetGameScoreByChatId(userId, score, chatId, messageId, force, disableEditMessage)
 )
 
-suspend fun RequestsExecutor.setGameScore(
+suspend fun TelegramBot.setGameScore(
     user: CommonUser,
     score: Long,
     chatId: ChatId,
@@ -29,7 +29,7 @@ suspend fun RequestsExecutor.setGameScore(
     user.id, score, chatId, messageId, force, disableEditMessage
 )
 
-suspend fun RequestsExecutor.setGameScore(
+suspend fun TelegramBot.setGameScore(
     userId: UserId,
     score: Long,
     chat: Chat,
@@ -40,7 +40,7 @@ suspend fun RequestsExecutor.setGameScore(
     userId, score, chat.id, messageId, force, disableEditMessage
 )
 
-suspend fun RequestsExecutor.setGameScore(
+suspend fun TelegramBot.setGameScore(
     user: CommonUser,
     score: Long,
     chat: Chat,
@@ -51,7 +51,7 @@ suspend fun RequestsExecutor.setGameScore(
     user.id, score, chat.id, messageId, force, disableEditMessage
 )
 
-suspend fun RequestsExecutor.setGameScore(
+suspend fun TelegramBot.setGameScore(
     userId: UserId,
     score: Long,
     message: ContentMessage<GameContent>,
@@ -61,7 +61,7 @@ suspend fun RequestsExecutor.setGameScore(
     userId, score, message.chat.id, message.messageId, force, disableEditMessage
 )
 
-suspend fun RequestsExecutor.setGameScore(
+suspend fun TelegramBot.setGameScore(
     user: CommonUser,
     score: Long,
     message: ContentMessage<GameContent>,

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/games/SetGameScoreByInlineMessageId.kt

@@ -1,10 +1,10 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.games
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.games.SetGameScoreByInlineMessageId
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 
-suspend fun RequestsExecutor.setGameScore(
+suspend fun TelegramBot.setGameScore(
     userId: UserId,
     score: Long,
     inlineMessageId: InlineMessageIdentifier,
@@ -16,7 +16,7 @@ suspend fun RequestsExecutor.setGameScore(
     )
 )
 
-suspend fun RequestsExecutor.setGameScore(
+suspend fun TelegramBot.setGameScore(
     user: CommonUser,
     score: Long,
     inlineMessageId: InlineMessageIdentifier,

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/get/GetFile.kt

@@ -1,16 +1,16 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.get
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.FileId
 import com.github.insanusmokrassar.TelegramBotAPI.requests.get.GetFile
 import com.github.insanusmokrassar.TelegramBotAPI.types.files.abstracts.TelegramMediaFile
 
-suspend fun RequestsExecutor.getFileAdditionalInfo(
+suspend fun TelegramBot.getFileAdditionalInfo(
     fileId: FileId
 ) = execute(
     GetFile(fileId)
 )
 
-suspend fun RequestsExecutor.getFileAdditionalInfo(
+suspend fun TelegramBot.getFileAdditionalInfo(
     file: TelegramMediaFile
 ) = getFileAdditionalInfo(file.fileId)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/get/GetStickerSet.kt

@@ -1,16 +1,16 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.get
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.get.GetStickerSet
 import com.github.insanusmokrassar.TelegramBotAPI.types.files.Sticker
 
-suspend fun RequestsExecutor.getStickerSet(
+suspend fun TelegramBot.getStickerSet(
     name: String
 ) = execute(
     GetStickerSet(name)
 )
 
-suspend fun RequestsExecutor.getStickerSet(
+suspend fun TelegramBot.getStickerSet(
     sticker: Sticker
 ) = getStickerSet(
     sticker.stickerSetName ?: error("Sticker must contains stickerSetName to be correctly used in getStickerSet method")

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/get/GetUserProfilePhotos.kt

@@ -1,11 +1,11 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.get
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.get.GetUserProfilePhotos
 import com.github.insanusmokrassar.TelegramBotAPI.types.CommonUser
 import com.github.insanusmokrassar.TelegramBotAPI.types.UserId
 
-suspend fun RequestsExecutor.getUserProfilePhotos(
+suspend fun TelegramBot.getUserProfilePhotos(
     userId: UserId,
     offset: Int? = null,
     limit: Int? = null
@@ -15,7 +15,7 @@ suspend fun RequestsExecutor.getUserProfilePhotos(
     )
 )
 
-suspend fun RequestsExecutor.getUserProfilePhotos(
+suspend fun TelegramBot.getUserProfilePhotos(
     user: CommonUser,
     offset: Int? = null,
     limit: Int? = null

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/SendAction.kt

@@ -1,102 +1,102 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendAction
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.actions.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 
-suspend fun RequestsExecutor.sendBotAction(
+suspend fun TelegramBot.sendBotAction(
     chatId: ChatIdentifier,
     action: BotAction
 ) = execute(
     SendAction(chatId, action)
 )
 
-suspend fun RequestsExecutor.sendBotAction(
+suspend fun TelegramBot.sendBotAction(
     chat: Chat,
     action: BotAction
 ) = sendBotAction(chat.id, action)
 
 
-suspend fun RequestsExecutor.sendActionTyping(
+suspend fun TelegramBot.sendActionTyping(
     chatId: ChatIdentifier
 ) = sendBotAction(chatId, TypingAction)
 
-suspend fun RequestsExecutor.sendActionUploadPhoto(
+suspend fun TelegramBot.sendActionUploadPhoto(
     chatId: ChatIdentifier
 ) = sendBotAction(chatId, UploadPhotoAction)
 
-suspend fun RequestsExecutor.sendActionRecordVideo(
+suspend fun TelegramBot.sendActionRecordVideo(
     chatId: ChatIdentifier
 ) = sendBotAction(chatId, RecordVideoAction)
 
-suspend fun RequestsExecutor.sendActionUploadVideo(
+suspend fun TelegramBot.sendActionUploadVideo(
     chatId: ChatIdentifier
 ) = sendBotAction(chatId, UploadVideoAction)
 
-suspend fun RequestsExecutor.sendActionRecordAudio(
+suspend fun TelegramBot.sendActionRecordAudio(
     chatId: ChatIdentifier
 ) = sendBotAction(chatId, RecordAudioAction)
 
-suspend fun RequestsExecutor.sendActionUploadAudio(
+suspend fun TelegramBot.sendActionUploadAudio(
     chatId: ChatIdentifier
 ) = sendBotAction(chatId, UploadAudioAction)
 
-suspend fun RequestsExecutor.sendActionUploadDocument(
+suspend fun TelegramBot.sendActionUploadDocument(
     chatId: ChatIdentifier
 ) = sendBotAction(chatId, UploadDocumentAction)
 
-suspend fun RequestsExecutor.sendActionFindLocation(
+suspend fun TelegramBot.sendActionFindLocation(
     chatId: ChatIdentifier
 ) = sendBotAction(chatId, FindLocationAction)
 
-suspend fun RequestsExecutor.sendActionRecordVideoNote(
+suspend fun TelegramBot.sendActionRecordVideoNote(
     chatId: ChatIdentifier
 ) = sendBotAction(chatId, RecordVideoNoteAction)
 
-suspend fun RequestsExecutor.sendActionUploadVideoNote(
+suspend fun TelegramBot.sendActionUploadVideoNote(
     chatId: ChatIdentifier
 ) = sendBotAction(chatId, UploadVideoNoteAction)
 
 
-suspend fun RequestsExecutor.sendActionTyping(
+suspend fun TelegramBot.sendActionTyping(
     chat: Chat
 ) = sendBotAction(chat, TypingAction)
 
-suspend fun RequestsExecutor.sendActionUploadPhoto(
+suspend fun TelegramBot.sendActionUploadPhoto(
     chat: Chat
 ) = sendBotAction(chat, UploadPhotoAction)
 
-suspend fun RequestsExecutor.sendActionRecordVideo(
+suspend fun TelegramBot.sendActionRecordVideo(
     chat: Chat
 ) = sendBotAction(chat, RecordVideoAction)
 
-suspend fun RequestsExecutor.sendActionUploadVideo(
+suspend fun TelegramBot.sendActionUploadVideo(
     chat: Chat
 ) = sendBotAction(chat, UploadVideoAction)
 
-suspend fun RequestsExecutor.sendActionRecordAudio(
+suspend fun TelegramBot.sendActionRecordAudio(
     chat: Chat
 ) = sendBotAction(chat, RecordAudioAction)
 
-suspend fun RequestsExecutor.sendActionUploadAudio(
+suspend fun TelegramBot.sendActionUploadAudio(
     chat: Chat
 ) = sendBotAction(chat, UploadAudioAction)
 
-suspend fun RequestsExecutor.sendActionUploadDocument(
+suspend fun TelegramBot.sendActionUploadDocument(
     chat: Chat
 ) = sendBotAction(chat, UploadDocumentAction)
 
-suspend fun RequestsExecutor.sendActionFindLocation(
+suspend fun TelegramBot.sendActionFindLocation(
     chat: Chat
 ) = sendBotAction(chat, FindLocationAction)
 
-suspend fun RequestsExecutor.sendActionRecordVideoNote(
+suspend fun TelegramBot.sendActionRecordVideoNote(
     chat: Chat
 ) = sendBotAction(chat, RecordVideoNoteAction)
 
-suspend fun RequestsExecutor.sendActionUploadVideoNote(
+suspend fun TelegramBot.sendActionUploadVideoNote(
     chat: Chat
 ) = sendBotAction(chat, UploadVideoNoteAction)
 

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/SendContact.kt

@@ -1,12 +1,13 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendContact
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 
-suspend fun RequestsExecutor.sendContact(
+suspend fun TelegramBot.sendContact(
     chatId: ChatIdentifier,
     phoneNumber: String,
     firstName: String,
@@ -20,7 +21,7 @@ suspend fun RequestsExecutor.sendContact(
     )
 )
 
-suspend fun RequestsExecutor.sendContact(
+suspend fun TelegramBot.sendContact(
     chatId: ChatIdentifier,
     contact: Contact,
     disableNotification: Boolean = false,
@@ -32,7 +33,7 @@ suspend fun RequestsExecutor.sendContact(
     )
 )
 
-suspend fun RequestsExecutor.sendContact(
+suspend fun TelegramBot.sendContact(
     chat: Chat,
     phoneNumber: String,
     firstName: String,
@@ -44,7 +45,7 @@ suspend fun RequestsExecutor.sendContact(
     chat.id, phoneNumber, firstName, lastName, disableNotification, replyToMessageId, replyMarkup
 )
 
-suspend fun RequestsExecutor.sendContact(
+suspend fun TelegramBot.sendContact(
     chat: Chat,
     contact: Contact,
     disableNotification: Boolean = false,
@@ -53,3 +54,33 @@ suspend fun RequestsExecutor.sendContact(
 ) = sendContact(
     chat.id, contact, disableNotification, replyToMessageId, replyMarkup
 )
+
+suspend inline fun TelegramBot.reply(
+    to: Message,
+    phoneNumber: String,
+    firstName: String,
+    lastName: String? = null,
+    disableNotification: Boolean = false,
+    replyMarkup: KeyboardMarkup? = null
+) = sendContact(
+    to.chat,
+    phoneNumber,
+    firstName,
+    lastName,
+    disableNotification,
+    to.messageId,
+    replyMarkup
+)
+
+suspend inline fun TelegramBot.reply(
+    to: Message,
+    contact: Contact,
+    disableNotification: Boolean = false,
+    replyMarkup: KeyboardMarkup? = null
+) = sendContact(
+    to.chat,
+    contact,
+    disableNotification,
+    to.messageId,
+    replyMarkup
+)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/SendDice.kt

@@ -1,14 +1,15 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendDice
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
 import com.github.insanusmokrassar.TelegramBotAPI.types.dice.DiceAnimationType
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 
-suspend fun RequestsExecutor.sendDice(
+suspend fun TelegramBot.sendDice(
     chatId: ChatIdentifier,
     animationType: DiceAnimationType? = null,
     disableNotification: Boolean = false,
@@ -18,10 +19,17 @@ suspend fun RequestsExecutor.sendDice(
     SendDice(chatId, animationType, disableNotification, replyToMessageId, replyMarkup)
 )
 
-suspend fun RequestsExecutor.sendDice(
+suspend fun TelegramBot.sendDice(
     chat: Chat,
     animationType: DiceAnimationType? = null,
     disableNotification: Boolean = false,
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendDice(chat.id, animationType, disableNotification, replyToMessageId, replyMarkup)
+
+suspend inline fun TelegramBot.reply(
+    to: Message,
+    animationType: DiceAnimationType? = null,
+    disableNotification: Boolean = false,
+    replyMarkup: KeyboardMarkup? = null
+) = sendDice(to.chat, animationType, disableNotification, to.messageId, replyMarkup)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/SendLocation.kt

@@ -1,12 +1,13 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendLocation
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 
-suspend fun RequestsExecutor.sendLocation(
+suspend fun TelegramBot.sendLocation(
     chatId: ChatIdentifier,
     latitude: Double,
     longitude: Double,
@@ -24,7 +25,7 @@ suspend fun RequestsExecutor.sendLocation(
     )
 )
 
-suspend fun RequestsExecutor.sendLocation(
+suspend fun TelegramBot.sendLocation(
     chatId: ChatIdentifier,
     location: Location,
     disableNotification: Boolean = false,
@@ -39,7 +40,7 @@ suspend fun RequestsExecutor.sendLocation(
     replyMarkup
 )
 
-suspend fun RequestsExecutor.sendLocation(
+suspend fun TelegramBot.sendLocation(
     chat: Chat,
     latitude: Double,
     longitude: Double,
@@ -55,7 +56,7 @@ suspend fun RequestsExecutor.sendLocation(
     replyMarkup
 )
 
-suspend fun RequestsExecutor.sendLocation(
+suspend fun TelegramBot.sendLocation(
     chat: Chat,
     location: Location,
     disableNotification: Boolean = false,
@@ -69,3 +70,31 @@ suspend fun RequestsExecutor.sendLocation(
     replyToMessageId,
     replyMarkup
 )
+
+suspend inline fun TelegramBot.reply(
+    to: Message,
+    latitude: Double,
+    longitude: Double,
+    disableNotification: Boolean = false,
+    replyMarkup: KeyboardMarkup? = null
+) = sendLocation(
+    to.chat,
+    latitude,
+    longitude,
+    disableNotification,
+    to.messageId,
+    replyMarkup
+)
+
+suspend inline fun TelegramBot.reply(
+    to: Message,
+    location: Location,
+    disableNotification: Boolean = false,
+    replyMarkup: KeyboardMarkup? = null
+) = sendLocation(
+    to.chat,
+    location,
+    disableNotification,
+    to.messageId,
+    replyMarkup
+)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/SendMessage.kt

@@ -1,14 +1,15 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendTextMessage
 import com.github.insanusmokrassar.TelegramBotAPI.types.ChatIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier
 import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.ParseMode
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 
-suspend fun RequestsExecutor.sendMessage(
+suspend fun TelegramBot.sendMessage(
     chatId: ChatIdentifier,
     text: String,
     parseMode: ParseMode? = null,
@@ -20,7 +21,7 @@ suspend fun RequestsExecutor.sendMessage(
     SendTextMessage(chatId, text, parseMode, disableWebPagePreview, disableNotification, replyToMessageId, replyMarkup)
 )
 
-suspend fun RequestsExecutor.sendTextMessage(
+suspend fun TelegramBot.sendTextMessage(
     chatId: ChatIdentifier,
     text: String,
     parseMode: ParseMode? = null,
@@ -32,7 +33,7 @@ suspend fun RequestsExecutor.sendTextMessage(
     chatId, text, parseMode, disableWebPagePreview, disableNotification, replyToMessageId, replyMarkup
 )
 
-suspend fun RequestsExecutor.sendMessage(
+suspend fun TelegramBot.sendMessage(
     chat: Chat,
     text: String,
     parseMode: ParseMode? = null,
@@ -43,7 +44,7 @@ suspend fun RequestsExecutor.sendMessage(
 ) = sendMessage(chat.id, text, parseMode, disableWebPagePreview, disableNotification, replyToMessageId, replyMarkup)
 
 
-suspend fun RequestsExecutor.sendTextMessage(
+suspend fun TelegramBot.sendTextMessage(
     chat: Chat,
     text: String,
     parseMode: ParseMode? = null,
@@ -52,3 +53,20 @@ suspend fun RequestsExecutor.sendTextMessage(
     replyToMessageId: MessageIdentifier? = null,
     replyMarkup: KeyboardMarkup? = null
 ) = sendTextMessage(chat.id, text, parseMode, disableWebPagePreview, disableNotification, replyToMessageId, replyMarkup)
+
+suspend inline fun TelegramBot.reply(
+    to: Message,
+    text: String,
+    parseMode: ParseMode? = null,
+    disableWebPagePreview: Boolean? = null,
+    disableNotification: Boolean = false,
+    replyMarkup: KeyboardMarkup? = null
+) = sendTextMessage(
+    to.chat,
+    text,
+    parseMode,
+    disableWebPagePreview,
+    disableNotification,
+    to.messageId,
+    replyMarkup
+)

TelegramBotAPI-extensions-api/src/commonMain/kotlin/com/github/insanusmokrassar/TelegramBotAPI/extensions/api/send/SendVenue.kt

@@ -1,13 +1,14 @@
 package com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send
 
-import com.github.insanusmokrassar.TelegramBotAPI.bot.RequestsExecutor
+import com.github.insanusmokrassar.TelegramBotAPI.bot.TelegramBot
 import com.github.insanusmokrassar.TelegramBotAPI.requests.send.SendVenue
 import com.github.insanusmokrassar.TelegramBotAPI.types.*
 import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.KeyboardMarkup
 import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat
+import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message
 import com.github.insanusmokrassar.TelegramBotAPI.types.venue.Venue
 
-suspend fun RequestsExecutor.sendVenue(
+suspend fun TelegramBot.sendVenue(
     chatId: ChatIdentifier,
     latitude: Double,
     longitude: Double,
@@ -23,7 +24,7 @@ suspend fun RequestsExecutor.sendVenue(
     )
 )
 
-suspend fun RequestsExecutor.sendVenue(
+suspend fun TelegramBot.sendVenue(
     chat: Chat,
     latitude: Double,
     longitude: Double,
@@ -37,7 +38,7 @@ suspend fun RequestsExecutor.sendVenue(
     chat.id, latitude, longitude, title, address, foursquareId, disableNotification, replyToMessageId, replyMarkup
 )
 
-suspend fun RequestsExecutor.sendVenue(
+suspend fun TelegramBot.sendVenue(
     chatId: ChatIdentifier,
     location: Location,
     title: String,
@@ -50,7 +51,7 @@ suspend fun RequestsExecutor.sendVenue(
     chatId, location.latitude, location.longitude, title, address, foursquareId, disableNotification, replyToMessageId, replyMarkup
 )
 
-suspend fun RequestsExecutor.sendVenue(
+suspend fun TelegramBot.sendVenue(
     chat: Chat,
     location: Location,
     title: String,
@@ -63,7 +64,7 @@ suspend fun RequestsExecutor.sendVenue(
     chat.id, location.latitude, location.longitude, title, address, foursquareId, disableNotification, replyToMessageId, replyMarkup
 )
 
-suspend fun RequestsExecutor.sendVenue(
+suspend fun TelegramBot.sendVenue(
     chatId: ChatIdentifier,
     venue: Venue,
     disableNotification: Boolean = false,
@@ -75,7 +76,7 @@ suspend fun RequestsExecutor.sendVenue(
     )
 )
 
-suspend fun RequestsExecutor.sendVenue(
+suspend fun TelegramBot.sendVenue(
     chat: Chat,
     venue: Venue,
     disableNotification: Boolean = false,
@@ -84,3 +85,37 @@ suspend fun RequestsExecutor.sendVenue(
 ) = sendVenue(
     chat.id, venue, disableNotification, replyToMessageId, replyMarkup
 )
+
+suspend inline fun TelegramBot.reply(
+    to: Message,
+    latitude: Double,
+    longitude: Double,
+    title: String,
+    address: String,
+    foursquareId: String? = null,
+    disableNotification: Boolean = false,
+    replyMarkup: KeyboardMarkup? = null
+) = sendVenue(
+    to.chat, latitude, longitude, title, address, foursquareId, disableNotification, to.messageId, replyMarkup
+)
+
+suspend inline fun TelegramBot.reply(
+    to: Message,
+    location: Location,
+    title: String,
+    address: String,
+    foursquareId: String? = null,
+    disableNotification: Boolean = false,
+    replyMarkup: KeyboardMarkup? = null
+) = sendVenue(
+    to.chat, location, title, address, foursquareId, disableNotification, to.messageId, replyMarkup
+)
+
+suspend inline fun TelegramBot.reply(
+    to: Message,
+    venue: Venue,
+    disableNotification: Boolean = false,
+    replyMarkup: KeyboardMarkup? = null
+) = sendVenue(
+    to.chat, venue, disableNotification, to.messageId, replyMarkup
+)