optimize imports

0.32.9

.github/workflows/packages_publishing.yml

@@ -0,0 +1,22 @@
+
+name: Publish package to GitHub Packages
+on: [push]
+jobs:
+  publishing:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Rewrite version
+        run: |
+          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
+          cat gradle.properties | sed -e "s/^library_version=\([0-9\.]*\)/library_version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp
+          rm gradle.properties
+          mv gradle.properties.tmp gradle.properties
+      - name: Build and publish
+        run: ./gradlew clean build publishAllPublicationsToGithubPackagesRepository -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signMetadataPublication
+        env:
+          GITHUBPACKAGES_USER: ${{ github.actor }}
+          GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/regular-build.yml

@@ -1,16 +0,0 @@
-name: Build
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Build with Gradle
-        run: ./gradlew build

CHANGELOG.md

@@ -1,5 +1,24 @@
 # TelegramBotAPI changelog
 
+## 0.32.10
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.4.28` -> `0.4.29`
+* `Core`:
+    * `AdministratorChatMemberSerializer` and `ChatMemberSerializer` has changed their visibility: they are public for now
+* `Behaviour Builder`:
+    * Now content triggers and expectators will wait for channel posts too
+
+## 0.32.9
+
+* `Common`:
+    * `Version`:
+        * `Kotlin`: `1.4.30` -> `1.4.31`
+        * `Ktor`: `1.5.1` -> `1.5.2`
+        * `MicroUtils`: `0.4.26` -> `0.4.28`
+        * `Coroutines`: `1.4.2` -> `1.4.3`
+
 ## 0.32.8
 
 * `Common`:

gradle.properties

@@ -5,18 +5,18 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true
 
-kotlin_version=1.4.30
-kotlin_coroutines_version=1.4.2
+kotlin_version=1.4.31
+kotlin_coroutines_version=1.4.3
 kotlin_serialisation_runtime_version=1.1.0
 klock_version=2.0.6
 uuid_version=0.2.3
-ktor_version=1.5.1
+ktor_version=1.5.2
 
-micro_utils_version=0.4.26
+micro_utils_version=0.4.29
 
 javax_activation_version=1.1.1
 
 library_group=dev.inmo
-library_version=0.32.8
+library_version=0.32.10
 
 github_release_plugin_version=2.2.12

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip

tgbotapi.core/mpp_publish_template.kpsb

@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":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","includeGpgSigning":true,"publishToMavenCentral":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
+{"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","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}

tgbotapi.core/publish.gradle

@@ -38,28 +38,28 @@ publishing {
                 
             }
         }
-        
         repositories {
-            maven {
-                name = "bintray"
-                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/TelegramBotAPI/${project.name}/;publish=1;override=1")
-                credentials {
-                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+                maven {
+                    name = "GithubPackages"
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
+                    credentials {
+                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                    }
                 }
             }
-            
-            maven {
-                name = "sonatype"
-                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                credentials {
-                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+                maven {
+                    name = "sonatype"
+                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                    credentials {
+                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                    }
                 }
             }
-            
         }
-        
     }
 }
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/SetPassportDataErrors.kt

@@ -1,6 +1,5 @@
 package dev.inmo.tgbotapi.requests
 
-import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.passport.PassportElementError

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/abstracts/ChatInviteLinkRequest.kt

@@ -0,0 +1,20 @@
+package dev.inmo.tgbotapi.requests.chat.abstracts
+
+import com.soywiz.klock.DateTime
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.DeserializationStrategy
+
+interface ChatInviteLinkRequest : SimpleRequest<CommonInviteLink> {
+    val chatId: ChatIdentifier
+
+    override val resultDeserializer: DeserializationStrategy<CommonInviteLink>
+        get() = CommonInviteLink.serializer()
+}
+interface KnownChatInviteLinkRequest : ChatInviteLinkRequest {
+    val inviteLink: String
+}
+interface EditChatInviteLinkRequest : ChatInviteLinkRequest {
+    val expireDate: DateTime?
+    val membersLimit: MembersLimit?
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/invite_links/CreateChatInviteLink.kt

@@ -0,0 +1,31 @@
+package dev.inmo.tgbotapi.requests.chat.invite_links
+
+import com.soywiz.klock.DateTime
+import dev.inmo.tgbotapi.requests.chat.abstracts.EditChatInviteLinkRequest
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.*
+
+@Serializable
+data class CreateChatInviteLink(
+    @SerialName(chatIdField)
+    override val chatId: ChatIdentifier,
+    @SerialName(expireDateField)
+    private val expirationUnixTimeStamp: TelegramDate? = null,
+    @SerialName(memberLimitField)
+    override val membersLimit: MembersLimit? = null
+) : EditChatInviteLinkRequest {
+    override val expireDate: DateTime?
+        get() = expirationUnixTimeStamp ?.asDate
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = "createChatInviteLink"
+}
+
+fun CreateChatInviteLink(
+    chatId: ChatId,
+    expireDate: DateTime,
+    membersLimit: MembersLimit? = null
+): CreateChatInviteLink = CreateChatInviteLink(
+    chatId, expireDate.toTelegramDate(), membersLimit
+)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/invite_links/EditChatInviteLink.kt

@@ -0,0 +1,35 @@
+package dev.inmo.tgbotapi.requests.chat.invite_links
+
+import com.soywiz.klock.DateTime
+import dev.inmo.tgbotapi.requests.chat.abstracts.EditChatInviteLinkRequest
+import dev.inmo.tgbotapi.requests.chat.abstracts.KnownChatInviteLinkRequest
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.*
+
+@Serializable
+data class EditChatInviteLink(
+    @SerialName(chatIdField)
+    override val chatId: ChatIdentifier,
+    @SerialName(inviteLinkField)
+    override val inviteLink: String,
+    @SerialName(expireDateField)
+    private val expirationUnixTimeStamp: TelegramDate? = null,
+    @SerialName(memberLimitField)
+    override val membersLimit: MembersLimit? = null
+) : EditChatInviteLinkRequest, KnownChatInviteLinkRequest {
+    override val expireDate: DateTime?
+        get() = expirationUnixTimeStamp ?.asDate
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = "editChatInviteLink"
+}
+
+fun EditChatInviteLink(
+    chatId: ChatIdentifier,
+    inviteLink: String,
+    expireDate: DateTime,
+    membersLimit: MembersLimit? = null
+): EditChatInviteLink = EditChatInviteLink(
+    chatId, inviteLink, expireDate.toTelegramDate(), membersLimit
+)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/invite_links/RevokeChatInviteLink.kt

@@ -0,0 +1,18 @@
+package dev.inmo.tgbotapi.requests.chat.invite_links
+
+import dev.inmo.tgbotapi.requests.chat.abstracts.KnownChatInviteLinkRequest
+import dev.inmo.tgbotapi.types.*
+import kotlinx.serialization.*
+
+@Serializable
+data class RevokeChatInviteLink(
+    @SerialName(chatIdField)
+    override val chatId: ChatIdentifier,
+    @SerialName(inviteLinkField)
+    override val inviteLink: String
+) : KnownChatInviteLinkRequest {
+    override val requestSerializer: SerializationStrategy<*>
+        get() = serializer()
+
+    override fun method(): String = "revokeChatInviteLink"
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/KickChatMember.kt

@@ -13,7 +13,9 @@ data class KickChatMember(
     @SerialName(userIdField)
     override val userId: UserId,
     @SerialName(untilDateField)
-    override val untilDate: TelegramDate? = null
+    override val untilDate: TelegramDate? = null,
+    @SerialName(revokeMessagesField)
+    val revokeMessages: Boolean? = null
 ) : ChatMemberRequest<Boolean>, UntilDate {
     override fun method(): String = "kickChatMember"
     override val resultDeserializer: DeserializationStrategy<Boolean>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/chat/members/PromoteChatMember.kt

@@ -31,7 +31,11 @@ data class PromoteChatMember(
     @SerialName(canPinMessagesField)
     private val canPinMessages: Boolean? = null,
     @SerialName(canPromoteMembersField)
-    private val canPromoteMembers: Boolean? = null
+    private val canPromoteMembers: Boolean? = null,
+    @SerialName(canManageVoiceChatsField)
+    private val canManageVoiceChats: Boolean? = null,
+    @SerialName(canManageChatField)
+    private val canManageChat: Boolean? = null
 ) : ChatMemberRequest<Boolean>, UntilDate {
     override fun method(): String = "promoteChatMember"
     override val resultDeserializer: DeserializationStrategy<Boolean>

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/send/polls/SendPoll.kt

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.requests.send.polls
 
 import com.soywiz.klock.DateTime
-import com.soywiz.klock.TimeSpan
 import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.send.abstracts.ReplyingMarkupSendMessageRequest
 import dev.inmo.tgbotapi.requests.send.abstracts.SendMessageRequest

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatIdentifier.kt

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types
 
 import dev.inmo.micro_utils.common.Warning
-import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import kotlinx.serialization.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatInviteLink.kt

@@ -0,0 +1,104 @@
+package dev.inmo.tgbotapi.types
+
+import com.soywiz.klock.DateTime
+import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+@Serializable
+private data class RawChatInviteLink(
+    @SerialName(inviteLinkField)
+    val inviteLink: String,
+    @SerialName(creatorField)
+    val creator: User,
+    @SerialName(isPrimaryField)
+    val isPrimary: Boolean,
+    @SerialName(isRevokedField)
+    val isRevoked: Boolean,
+    @SerialName(expireDateField)
+    val expirationDateTime: TelegramDate? = null,
+    @SerialName(memberLimitField)
+    val membersLimit: MembersLimit ?= null
+)
+
+private fun ChatInviteLink.toRawChatInviteLink() = RawChatInviteLink(
+    inviteLink,
+    creator,
+    isPrimary,
+    isRevoked,
+    expirationDateTime ?.toTelegramDate(),
+    membersLimit
+)
+
+@Serializable(ChatInviteLinkSerializer::class)
+sealed class ChatInviteLink {
+    abstract val inviteLink: String
+    abstract val creator: User
+    abstract val isPrimary: Boolean
+    abstract val isRevoked: Boolean
+    abstract val expirationDateTime: DateTime?
+    abstract val membersLimit: MembersLimit?
+}
+
+@Serializable
+data class PrimaryInviteLink(
+    @SerialName(inviteLinkField)
+    override val inviteLink: String,
+    @SerialName(creatorField)
+    override val creator: User,
+    @SerialName(isRevokedField)
+    override val isRevoked: Boolean = false,
+    @SerialName(expireDateField)
+    private val expireDate: TelegramDate? = null,
+    @SerialName(memberLimitField)
+    override val membersLimit: MembersLimit? = null
+) : ChatInviteLink() {
+    override val isPrimary: Boolean
+        get() = true
+    override val expirationDateTime: DateTime?
+        get() = expireDate ?.asDate
+}
+
+@Serializable
+data class CommonInviteLink(
+    @SerialName(inviteLinkField)
+    override val inviteLink: String,
+    @SerialName(creatorField)
+    override val creator: User,
+    @SerialName(isRevokedField)
+    override val isRevoked: Boolean = false,
+    @SerialName(expireDateField)
+    private val expireDate: TelegramDate? = null,
+    @SerialName(memberLimitField)
+    override val membersLimit: MembersLimit? = null
+) : ChatInviteLink() {
+    override val isPrimary: Boolean
+        get() = false
+    override val expirationDateTime: DateTime?
+        get() = expireDate ?.asDate
+}
+
+@Serializer(ChatInviteLink::class)
+object ChatInviteLinkSerializer : KSerializer<ChatInviteLink> {
+    override val descriptor: SerialDescriptor
+        get() = RawChatInviteLink.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): ChatInviteLink {
+        val deserializedRaw = RawChatInviteLink.serializer().deserialize(decoder)
+        return deserializedRaw.run {
+            when {
+                deserializedRaw.isPrimary -> PrimaryInviteLink(
+                    inviteLink, creator, isRevoked, expirationDateTime, membersLimit
+                )
+                else -> CommonInviteLink(
+                    inviteLink, creator, isRevoked, expirationDateTime, membersLimit
+                )
+            }
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: ChatInviteLink) {
+        RawChatInviteLink.serializer().serialize(encoder, value.toRawChatInviteLink())
+    }
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/AdministratorChatMemberImpl.kt

@@ -26,6 +26,10 @@ data class AdministratorChatMemberImpl(
     override val canPinMessages: Boolean = false,
     @SerialName(canPromoteMembersField)
     override val canPromoteMembers: Boolean = false,
+    @SerialName(canManageVoiceChatsField)
+    override val canManageVoiceChats: Boolean = false,
+    @SerialName(canManageChatField)
+    override val canManageChat: Boolean = false,
     @SerialName(isAnonymousField)
     override val isAnonymous: Boolean = false,
     @SerialName(customTitleField)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/CreatorChatMember.kt

@@ -30,6 +30,10 @@ data class CreatorChatMember(
     override val canPinMessages: Boolean = true
     @Transient
     override val canPromoteMembers: Boolean = true
+    @Transient
+    override val canManageVoiceChats: Boolean = true
+    @Transient
+    override val canManageChat: Boolean = true
     @SerialName(statusField)
     @Required
     private val type: String = "creator"

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/AdministratorChatMember.kt

@@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.types.ChatMember.abstracts
 
+import dev.inmo.tgbotapi.utils.RiskFeature
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
@@ -13,12 +14,15 @@ interface AdministratorChatMember : SpecialRightsChatMember {
     val canRemoveMessages: Boolean
     val canRestrictMembers: Boolean
     val canPromoteMembers: Boolean
+    val canManageVoiceChats: Boolean
+    val canManageChat: Boolean
     val isAnonymous: Boolean
     val customTitle: String?
 }
 
 @Serializer(AdministratorChatMember::class)
-internal object AdministratorChatMemberSerializer : KSerializer<AdministratorChatMember> {
+@RiskFeature
+object AdministratorChatMemberSerializer : KSerializer<AdministratorChatMember> {
     override val descriptor: SerialDescriptor = ChatMemberSerializer.descriptor
 
     override fun deserialize(decoder: Decoder): AdministratorChatMember = ChatMemberSerializer.deserialize(decoder) as AdministratorChatMember

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMember/abstracts/ChatMember.kt

@@ -3,6 +3,7 @@ package dev.inmo.tgbotapi.types.ChatMember.abstracts
 import dev.inmo.tgbotapi.types.ChatMember.*
 import dev.inmo.tgbotapi.types.User
 import dev.inmo.tgbotapi.types.statusField
+import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.SerialDescriptor
@@ -17,7 +18,8 @@ interface ChatMember {
 }
 
 @Serializer(ChatMember::class)
-internal object ChatMemberSerializer : KSerializer<ChatMember> {
+@RiskFeature
+object ChatMemberSerializer : KSerializer<ChatMember> {
     override val descriptor: SerialDescriptor = JsonObject.serializer().descriptor
 
     override fun deserialize(decoder: Decoder): ChatMember {

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ChatMemberUpdated.kt

@@ -0,0 +1,22 @@
+package dev.inmo.tgbotapi.types
+
+import dev.inmo.tgbotapi.types.ChatMember.abstracts.ChatMember
+import dev.inmo.tgbotapi.types.chat.abstracts.Chat
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ChatMemberUpdated(
+    @SerialName(chatField)
+    val chat: Chat,
+    @SerialName(fromField)
+    val user: User,
+    @SerialName(dateField)
+    val date: TelegramDate,
+    @SerialName(oldChatMemberField)
+    val oldChatMemberState: ChatMember,
+    @SerialName(newChatMemberField)
+    val newChatMemberState: ChatMember,
+    @SerialName(inviteLinkField)
+    val inviteLink: ChatInviteLink? = null
+)

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

@@ -26,10 +26,12 @@ typealias FoursquareId = String
 typealias FoursquareType = String
 typealias GooglePlaceId = String
 typealias GooglePlaceType = String
+typealias MembersLimit = Int
 
 typealias Seconds = Int
 typealias MilliSeconds = Long
 typealias LongSeconds = Long
+typealias UnixTimeStamp = LongSeconds
 
 typealias Meters = Float
 typealias Degrees = Int
@@ -76,6 +78,8 @@ val explanationLimit = 0 .. 200
 
 val openPeriodPollSecondsLimit = 5 .. 600
 
+val membersLimit = 1 .. 99999
+
 // Made as lazy for correct work in K/JS
 val telegramInlineModeGifPermittedMimeTypes by lazy {
     listOf(
@@ -162,6 +166,12 @@ const val optionIdsField = "option_ids"
 const val ipAddressField = "ip_address"
 const val linkedChatIdField = "linked_chat_id"
 const val horizontalAccuracyField = "horizontal_accuracy"
+const val revokeMessagesField = "revoke_messages"
+const val messageAutoDeleteTimeField = "message_auto_delete_time"
+const val isPrimaryField = "is_primary"
+const val isRevokedField = "is_revoked"
+const val expireDateField = "expire_date"
+const val memberLimitField = "member_limit"
 
 const val requestContactField = "request_contact"
 const val requestLocationField = "request_location"
@@ -239,8 +249,12 @@ const val canInviteUsersField = "can_invite_users"
 const val canRestrictMembersField = "can_restrict_members"
 const val canPinMessagesField = "can_pin_messages"
 const val canPromoteMembersField = "can_promote_members"
+const val canManageVoiceChatsField = "can_manage_voice_chats"
+const val canManageChatField = "can_manage_chat"
 const val pngStickerField = "png_sticker"
 const val tgsStickerField = "tgs_sticker"
+const val oldChatMemberField = "old_chat_member"
+const val newChatMemberField = "new_chat_member"
 
 const val okField = "ok"
 const val captionField = "caption"
@@ -292,6 +306,7 @@ const val payField = "pay"
 const val permissionsField = "permissions"
 const val typeField = "type"
 const val valueField = "value"
+const val creatorField = "creator"
 
 const val pointField = "point"
 const val xShiftField = "x_shift"
@@ -331,6 +346,7 @@ const val telegramPaymentChargeIdField = "telegram_payment_charge_id"
 const val providerPaymentChargeIdField = "provider_payment_charge_id"
 const val providerTokenField = "provider_token"
 const val providerDataField = "provider_data"
+const val usersField = "users"
 
 const val requireNameField = "need_name"
 const val requirePhoneNumberField = "need_phone_number"

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/UpdateTypes.kt

@@ -11,6 +11,8 @@ const val UPDATE_SHIPPING_QUERY = "shipping_query"
 const val UPDATE_PRE_CHECKOUT_QUERY = "pre_checkout_query"
 const val UPDATE_POLL = "poll"
 const val UPDATE_POLL_ANSWER = "poll_answer"
+const val MY_CHAT_MEMBER = "my_chat_member"
+const val CHAT_MEMBER = "chat_member"
 
 val ALL_UPDATES_LIST = listOf(
     UPDATE_MESSAGE,
@@ -23,5 +25,7 @@ val ALL_UPDATES_LIST = listOf(
     UPDATE_SHIPPING_QUERY,
     UPDATE_PRE_CHECKOUT_QUERY,
     UPDATE_POLL,
-    UPDATE_POLL_ANSWER
+    UPDATE_POLL_ANSWER,
+    MY_CHAT_MEMBER,
+    CHAT_MEMBER
 )

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/MessageAutoDeleteTimerChanged.kt

@@ -0,0 +1,25 @@
+package dev.inmo.tgbotapi.types.message.ChatEvents
+
+import dev.inmo.tgbotapi.types.Seconds
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
+import dev.inmo.tgbotapi.types.messageAutoDeleteTimeField
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+private const val seconds24Hours: Seconds = 60 * 60 * 24
+private const val seconds7Days: Seconds = seconds24Hours * 7
+
+@Serializable
+data class MessageAutoDeleteTimerChanged(
+    @SerialName(messageAutoDeleteTimeField)
+    val newAutoDeleteTime: Seconds // TODO:: check that it is seconds
+) : ChannelEvent, GroupEvent, SupergroupEvent
+
+val MessageAutoDeleteTimerChanged.isOff
+    get() = newAutoDeleteTime == 0
+
+val MessageAutoDeleteTimerChanged.is24Hours
+    get() = newAutoDeleteTime == seconds24Hours
+
+val MessageAutoDeleteTimerChanged.is7Days
+    get() = newAutoDeleteTime == seconds7Days

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/abstracts/VoiceChatEvent.kt

@@ -0,0 +1,3 @@
+package dev.inmo.tgbotapi.types.message.ChatEvents.abstracts
+
+interface VoiceChatEvent : SupergroupEvent

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/voice/VoiceChatEnded.kt

@@ -0,0 +1,18 @@
+package dev.inmo.tgbotapi.types.message.ChatEvents.voice
+
+import com.soywiz.klock.TimeSpan
+import com.soywiz.klock.seconds
+import dev.inmo.tgbotapi.types.Seconds
+import dev.inmo.tgbotapi.types.durationField
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.VoiceChatEvent
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class VoiceChatEnded(
+    @SerialName(durationField)
+    val duration: Seconds
+) : VoiceChatEvent {
+    val timeSpan: TimeSpan
+        get() = TimeSpan(duration.seconds.milliseconds)
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/voice/VoiceChatParticipantsInvited.kt

@@ -0,0 +1,13 @@
+package dev.inmo.tgbotapi.types.message.ChatEvents.voice
+
+import dev.inmo.tgbotapi.types.User
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.VoiceChatEvent
+import dev.inmo.tgbotapi.types.usersField
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class VoiceChatParticipantsInvited(
+    @SerialName(usersField)
+    val users: List<User> = emptyList()
+) : VoiceChatEvent

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/ChatEvents/voice/VoiceChatStarted.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.types.message.ChatEvents.voice
+
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.VoiceChatEvent
+import kotlinx.serialization.Serializable
+
+@Serializable
+object VoiceChatStarted : VoiceChatEvent

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/PrivateMessageImpl.kt

@@ -4,7 +4,8 @@ import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
-import dev.inmo.tgbotapi.types.message.abstracts.*
+import dev.inmo.tgbotapi.types.message.abstracts.Message
+import dev.inmo.tgbotapi.types.message.abstracts.PrivateContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent
 import dev.inmo.tgbotapi.types.message.payments.SuccessfulPaymentInfo
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt

@@ -11,6 +11,7 @@ import dev.inmo.tgbotapi.types.games.RawGame
 import dev.inmo.tgbotapi.types.location.Location
 import dev.inmo.tgbotapi.types.message.ChatEvents.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
+import dev.inmo.tgbotapi.types.message.ChatEvents.voice.*
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.abstracts.UnknownMessageType
 import dev.inmo.tgbotapi.types.message.content.*
@@ -81,6 +82,14 @@ internal data class RawMessage(
     private val dice: Dice? = null,
     private val successful_payment: SuccessfulPayment? = null,
 
+    // Voice Chat Service Messages
+    private val voice_chat_started: VoiceChatStarted? = null,
+    private val voice_chat_ended: VoiceChatEnded? = null,
+    private val voice_chat_participants_invited: VoiceChatParticipantsInvited? = null,
+
+    // AutoDelete Message time changed
+    private val message_auto_delete_timer_changed: MessageAutoDeleteTimerChanged? = null,
+
     // login property
     private val connected_website: String? = null,
 
@@ -172,6 +181,10 @@ internal data class RawMessage(
             left_chat_member != null -> LeftChatMember(left_chat_member)
             new_chat_title != null -> NewChatTitle(new_chat_title)
             new_chat_photo != null -> NewChatPhoto(new_chat_photo.toList())
+            voice_chat_started != null -> voice_chat_started
+            message_auto_delete_timer_changed != null -> message_auto_delete_timer_changed
+            voice_chat_ended != null -> voice_chat_ended
+            voice_chat_participants_invited != null -> voice_chat_participants_invited
             delete_chat_photo -> DeleteChatPhoto()
             group_chat_created -> GroupChatCreated(
                 migrate_to_chat_id

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/content/TextContent.kt

@@ -5,7 +5,8 @@ import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.SendTextMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
 import dev.inmo.tgbotapi.types.MessageIdentifier
-import dev.inmo.tgbotapi.types.ParseMode.*
+import dev.inmo.tgbotapi.types.ParseMode.ParseMode
+import dev.inmo.tgbotapi.types.ParseMode.defaultParseMode
 import dev.inmo.tgbotapi.types.buttons.KeyboardMarkup
 import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted/Email.kt

@@ -3,8 +3,8 @@ package dev.inmo.tgbotapi.types.passport.encrypted
 import dev.inmo.micro_utils.serialization.base64.Base64BytesToFromStringSerializer
 import dev.inmo.tgbotapi.types.emailField
 import dev.inmo.tgbotapi.types.hashField
-import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.EncryptedPassportElementWithEmail
+import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted/EncryptedAddress.kt

@@ -3,8 +3,8 @@ package dev.inmo.tgbotapi.types.passport.encrypted
 import dev.inmo.micro_utils.serialization.base64.Base64BytesToFromStringSerializer
 import dev.inmo.tgbotapi.types.dataField
 import dev.inmo.tgbotapi.types.passport.credentials.EncryptedData
-import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.EncryptedPassportElementWithData
+import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted/EncryptedPersonalDetails.kt

@@ -3,8 +3,8 @@ package dev.inmo.tgbotapi.types.passport.encrypted
 import dev.inmo.micro_utils.serialization.base64.Base64BytesToFromStringSerializer
 import dev.inmo.tgbotapi.types.dataField
 import dev.inmo.tgbotapi.types.passport.credentials.EncryptedData
-import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.EncryptedPassportElementWithData
+import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/passport/encrypted/PhoneNumber.kt

@@ -2,8 +2,8 @@ package dev.inmo.tgbotapi.types.passport.encrypted
 
 import dev.inmo.micro_utils.serialization.base64.Base64BytesToFromStringSerializer
 import dev.inmo.tgbotapi.types.hashField
-import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.EncryptedPassportElementWithPhoneNumber
+import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.PassportElementHash
 import dev.inmo.tgbotapi.types.phoneNumberField
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/CommonChatMemberUpdatedUpdate.kt

@@ -0,0 +1,10 @@
+package dev.inmo.tgbotapi.types.update
+
+import dev.inmo.tgbotapi.types.ChatMemberUpdated
+import dev.inmo.tgbotapi.types.UpdateIdentifier
+import dev.inmo.tgbotapi.types.update.abstracts.ChatMemberUpdatedUpdate
+
+data class CommonChatMemberUpdatedUpdate(
+    override val updateId: UpdateIdentifier,
+    override val data: ChatMemberUpdated
+) : ChatMemberUpdatedUpdate

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/MyChatMemberUpdatedUpdate.kt

@@ -0,0 +1,10 @@
+package dev.inmo.tgbotapi.types.update
+
+import dev.inmo.tgbotapi.types.ChatMemberUpdated
+import dev.inmo.tgbotapi.types.UpdateIdentifier
+import dev.inmo.tgbotapi.types.update.abstracts.ChatMemberUpdatedUpdate
+
+data class MyChatMemberUpdatedUpdate(
+    override val updateId: UpdateIdentifier,
+    override val data: ChatMemberUpdated
+) : ChatMemberUpdatedUpdate

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/RawUpdate.kt

@@ -1,9 +1,9 @@
 package dev.inmo.tgbotapi.types.update
 
+import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.CallbackQuery.RawCallbackQuery
 import dev.inmo.tgbotapi.types.InlineQueries.ChosenInlineResult.RawChosenInlineResult
 import dev.inmo.tgbotapi.types.InlineQueries.query.RawInlineQuery
-import dev.inmo.tgbotapi.types.UpdateIdentifier
 import dev.inmo.tgbotapi.types.message.abstracts.*
 import dev.inmo.tgbotapi.types.payments.PreCheckoutQuery
 import dev.inmo.tgbotapi.types.payments.ShippingQuery
@@ -11,7 +11,6 @@ import dev.inmo.tgbotapi.types.polls.Poll
 import dev.inmo.tgbotapi.types.polls.PollAnswer
 import dev.inmo.tgbotapi.types.update.abstracts.UnknownUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
-import dev.inmo.tgbotapi.types.updateIdField
 import kotlinx.serialization.*
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.jsonObject
@@ -34,7 +33,9 @@ internal data class RawUpdate constructor(
     private val shipping_query: ShippingQuery? = null,
     private val pre_checkout_query: PreCheckoutQuery? = null,
     private val poll: Poll? = null,
-    private val poll_answer: PollAnswer? = null
+    private val poll_answer: PollAnswer? = null,
+    private val my_chat_member: ChatMemberUpdated? = null,
+    private val chat_member: ChatMemberUpdated? = null
 ) {
     private var initedUpdate: Update? = null
     /**
@@ -58,6 +59,8 @@ internal data class RawUpdate constructor(
                 pre_checkout_query != null -> PreCheckoutQueryUpdate(updateId, pre_checkout_query)
                 poll != null -> PollUpdate(updateId, poll)
                 poll_answer != null -> PollAnswerUpdate(updateId, poll_answer)
+                my_chat_member != null -> MyChatMemberUpdatedUpdate(updateId, my_chat_member)
+                chat_member != null -> CommonChatMemberUpdatedUpdate(updateId, chat_member)
                 else -> UnknownUpdate(
                     updateId,
                     raw.toString(),

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/update/abstracts/ChatMemberUpdatedUpdate.kt

@@ -0,0 +1,7 @@
+package dev.inmo.tgbotapi.types.update.abstracts
+
+import dev.inmo.tgbotapi.types.ChatMemberUpdated
+
+interface ChatMemberUpdatedUpdate : Update {
+    override val data: ChatMemberUpdated
+}

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/updateshandlers/FlowsUpdatesFilter.kt

@@ -28,6 +28,8 @@ interface FlowsUpdatesFilter : UpdatesFilter {
     val preCheckoutQueryFlow: Flow<PreCheckoutQueryUpdate>
     val pollFlow: Flow<PollUpdate>
     val pollAnswerFlow: Flow<PollAnswerUpdate>
+    val chatMemberUpdatedFlow: Flow<CommonChatMemberUpdatedUpdate>
+    val myChatMemberUpdatedFlow: Flow<MyChatMemberUpdatedUpdate>
     val unknownUpdateTypeFlow: Flow<UnknownUpdate>
 }
 
@@ -74,5 +76,7 @@ class DefaultFlowsUpdatesFilter(
     override val preCheckoutQueryFlow: Flow<PreCheckoutQueryUpdate> = allUpdatesFlow.filterIsInstance()
     override val pollFlow: Flow<PollUpdate> = allUpdatesFlow.filterIsInstance()
     override val pollAnswerFlow: Flow<PollAnswerUpdate> = allUpdatesFlow.filterIsInstance()
+    override val chatMemberUpdatedFlow: Flow<CommonChatMemberUpdatedUpdate> = allUpdatesFlow.filterIsInstance()
+    override val myChatMemberUpdatedFlow: Flow<MyChatMemberUpdatedUpdate> = allUpdatesFlow.filterIsInstance()
     override val unknownUpdateTypeFlow: Flow<UnknownUpdate> = allUpdatesFlow.filterIsInstance()
 }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/Annotations.kt

@@ -35,4 +35,4 @@ const val lowLevelRiskFeatureMessage = "This method is low-level and not recomme
     AnnotationTarget.TYPEALIAS,
     AnnotationTarget.TYPE_PARAMETER
 )
-annotation class RiskFeature(val message: String)
+annotation class RiskFeature(val message: String = lowLevelRiskFeatureMessage)

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/passport/DecryptionContext.kt

@@ -1,14 +1,7 @@
 package dev.inmo.tgbotapi.utils.passport
 
 import dev.inmo.micro_utils.crypto.SourceBytes
-import dev.inmo.tgbotapi.bot.TelegramBot
-import dev.inmo.tgbotapi.requests.DownloadFile
-import dev.inmo.tgbotapi.requests.get.GetFile
-import dev.inmo.tgbotapi.types.passport.credentials.EncryptedCredentials
 import dev.inmo.tgbotapi.types.passport.credentials.EncryptedData
-import dev.inmo.tgbotapi.types.passport.encrypted.PassportFile
-import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
-import kotlinx.serialization.json.JsonObject
 
 interface Decryptor {
     fun decrypt(data: EncryptedData): SourceBytes

tgbotapi.core/src/jvmMain/kotlin/dev/inmo/tgbotapi/utils/passport/CredentialsDecrypting.kt

@@ -4,11 +4,10 @@ import dev.inmo.micro_utils.crypto.decodeBase64
 import dev.inmo.tgbotapi.types.passport.credentials.DecryptedCredentials
 import dev.inmo.tgbotapi.types.passport.credentials.EncryptedCredentials
 import dev.inmo.tgbotapi.utils.nonstrictJsonFormat
-import java.security.*
+import java.security.KeyFactory
+import java.security.PrivateKey
 import java.security.spec.PKCS8EncodedKeySpec
 import javax.crypto.Cipher
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
 
 private val regexToRemoveFromKey = Regex("(-----(BEGIN|END) ((?:.*? KEY)|CERTIFICATE)-----|[\\s])")
 

tgbotapi.extensions.api/mpp_publish_template.kpsb

@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":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","includeGpgSigning":true,"publishToMavenCentral":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
+{"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","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}

tgbotapi.extensions.api/publish.gradle

@@ -38,28 +38,28 @@ publishing {
                 
             }
         }
-        
         repositories {
-            maven {
-                name = "bintray"
-                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/TelegramBotAPI/${project.name}/;publish=1;override=1")
-                credentials {
-                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+                maven {
+                    name = "GithubPackages"
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
+                    credentials {
+                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                    }
                 }
             }
-            
-            maven {
-                name = "sonatype"
-                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                credentials {
-                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+                maven {
+                    name = "sonatype"
+                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                    credentials {
+                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                    }
                 }
             }
-            
         }
-        
     }
 }
 

tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/CreateChatInviteLink.kt

@@ -0,0 +1,31 @@
+package dev.inmo.tgbotapi.extensions.api.chat.invite_links
+
+import com.soywiz.klock.DateTime
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.invite_links.CreateChatInviteLink
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
+
+suspend fun TelegramBot.createChatInviteLink(
+    chatId: ChatIdentifier,
+    expiration: TelegramDate? = null,
+    membersLimit: MembersLimit? = null
+) = execute(CreateChatInviteLink(chatId, expiration, membersLimit))
+
+suspend fun TelegramBot.createChatInviteLink(
+    chat: PublicChat,
+    expiration: TelegramDate? = null,
+    membersLimit: MembersLimit? = null
+) = createChatInviteLink(chat.id, expiration, membersLimit)
+
+suspend fun TelegramBot.createChatInviteLink(
+    chatId: ChatIdentifier,
+    expiration: DateTime,
+    membersLimit: MembersLimit? = null
+) = createChatInviteLink(chatId, expiration.toTelegramDate(), membersLimit)
+
+suspend fun TelegramBot.createChatInviteLink(
+    chat: PublicChat,
+    expiration: DateTime,
+    membersLimit: MembersLimit? = null
+) = createChatInviteLink(chat.id, expiration.toTelegramDate(), membersLimit)

tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/EditChatInviteLink.kt

@@ -0,0 +1,63 @@
+package dev.inmo.tgbotapi.extensions.api.chat.invite_links
+
+import com.soywiz.klock.DateTime
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.invite_links.EditChatInviteLink
+import dev.inmo.tgbotapi.types.*
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
+
+suspend fun TelegramBot.editChatInviteLink(
+    chatId: ChatIdentifier,
+    previousLink: String,
+    expiration: TelegramDate? = null,
+    membersLimit: MembersLimit? = null
+) = execute(EditChatInviteLink(chatId, previousLink, expiration, membersLimit))
+
+suspend fun TelegramBot.editChatInviteLink(
+    chat: PublicChat,
+    previousLink: String,
+    expiration: TelegramDate? = null,
+    membersLimit: MembersLimit? = null
+) = editChatInviteLink(chat.id, previousLink, expiration, membersLimit)
+
+suspend fun TelegramBot.editChatInviteLink(
+    chatId: ChatIdentifier,
+    previousLink: String,
+    expiration: DateTime,
+    membersLimit: MembersLimit? = null
+) = editChatInviteLink(chatId, previousLink, expiration.toTelegramDate(), membersLimit)
+
+suspend fun TelegramBot.editChatInviteLink(
+    chat: PublicChat,
+    previousLink: String,
+    expiration: DateTime,
+    membersLimit: MembersLimit? = null
+) = editChatInviteLink(chat.id, previousLink, expiration.toTelegramDate(), membersLimit)
+
+suspend fun TelegramBot.editChatInviteLink(
+    chat: ChatIdentifier,
+    previousLink: ChatInviteLink,
+    expiration: TelegramDate? = previousLink.expirationDateTime ?.toTelegramDate(),
+    membersLimit: MembersLimit? = previousLink.membersLimit
+) = editChatInviteLink(chat, previousLink.inviteLink, expiration, membersLimit)
+
+suspend fun TelegramBot.editChatInviteLink(
+    chat: ChatIdentifier,
+    previousLink: ChatInviteLink,
+    expiration: DateTime,
+    membersLimit: MembersLimit? = previousLink.membersLimit
+) = editChatInviteLink(chat, previousLink.inviteLink, expiration, membersLimit)
+
+suspend fun TelegramBot.editChatInviteLink(
+    chat: PublicChat,
+    previousLink: ChatInviteLink,
+    expiration: TelegramDate? = previousLink.expirationDateTime ?.toTelegramDate(),
+    membersLimit: MembersLimit? = previousLink.membersLimit
+) = editChatInviteLink(chat, previousLink.inviteLink, expiration, membersLimit)
+
+suspend fun TelegramBot.editChatInviteLink(
+    chat: PublicChat,
+    previousLink: ChatInviteLink,
+    expiration: DateTime,
+    membersLimit: MembersLimit? = previousLink.membersLimit
+) = editChatInviteLink(chat, previousLink.inviteLink, expiration, membersLimit)

tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/invite_links/RevokeChatInviteLink.kt

@@ -0,0 +1,27 @@
+package dev.inmo.tgbotapi.extensions.api.chat.invite_links
+
+import dev.inmo.tgbotapi.bot.TelegramBot
+import dev.inmo.tgbotapi.requests.chat.invite_links.RevokeChatInviteLink
+import dev.inmo.tgbotapi.types.ChatIdentifier
+import dev.inmo.tgbotapi.types.ChatInviteLink
+import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
+
+suspend fun TelegramBot.revokeChatInviteLink(
+    chatId: ChatIdentifier,
+    previousLink: String
+) = execute(RevokeChatInviteLink(chatId, previousLink))
+
+suspend fun TelegramBot.revokeChatInviteLink(
+    chat: PublicChat,
+    previousLink: String
+) = revokeChatInviteLink(chat.id, previousLink)
+
+suspend fun TelegramBot.revokeChatInviteLink(
+    chatId: ChatIdentifier,
+    previousLink: ChatInviteLink
+) = revokeChatInviteLink(chatId, previousLink.inviteLink)
+
+suspend fun TelegramBot.revokeChatInviteLink(
+    chat: PublicChat,
+    previousLink: ChatInviteLink
+) = revokeChatInviteLink(chat, previousLink.inviteLink)

tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/KickChatMember.kt

@@ -8,23 +8,27 @@ import dev.inmo.tgbotapi.types.chat.abstracts.PublicChat
 suspend fun TelegramBot.kickChatMember(
     chatId: ChatIdentifier,
     userId: UserId,
-    untilDate: TelegramDate? = null
-) = execute(KickChatMember(chatId, userId, untilDate))
+    untilDate: TelegramDate? = null,
+    revokeMessages: Boolean? = null
+) = execute(KickChatMember(chatId, userId, untilDate, revokeMessages))
 
 suspend fun TelegramBot.kickChatMember(
     chat: PublicChat,
     userId: UserId,
-    untilDate: TelegramDate? = null
-) = kickChatMember(chat.id, userId, untilDate)
+    untilDate: TelegramDate? = null,
+    revokeMessages: Boolean? = null
+) = kickChatMember(chat.id, userId, untilDate, revokeMessages)
 
 suspend fun TelegramBot.kickChatMember(
     chatId: ChatId,
     user: User,
-    untilDate: TelegramDate? = null
-) = kickChatMember(chatId, user.id, untilDate)
+    untilDate: TelegramDate? = null,
+    revokeMessages: Boolean? = null
+) = kickChatMember(chatId, user.id, untilDate, revokeMessages)
 
 suspend fun TelegramBot.kickChatMember(
     chat: PublicChat,
     user: User,
-    untilDate: TelegramDate? = null
-) = kickChatMember(chat.id, user.id, untilDate)
+    untilDate: TelegramDate? = null,
+    revokeMessages: Boolean? = null
+) = kickChatMember(chat.id, user.id, untilDate, revokeMessages)

tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatMember.kt

@@ -17,7 +17,9 @@ suspend fun TelegramBot.promoteChatMember(
     canInviteUsers: Boolean? = null,
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
-    canPromoteMembers: Boolean? = null
+    canPromoteMembers: Boolean? = null,
+    canManageVoiceChats: Boolean? = null,
+    canManageChat: Boolean?
 ) = execute(
     PromoteChatMember(
         chatId,
@@ -31,7 +33,9 @@ suspend fun TelegramBot.promoteChatMember(
         canInviteUsers,
         canRestrictMembers,
         canPinMessages,
-        canPromoteMembers
+        canPromoteMembers,
+        canManageVoiceChats,
+        canManageChat
     )
 )
 
@@ -47,7 +51,9 @@ suspend fun TelegramBot.promoteChatMember(
     canInviteUsers: Boolean? = null,
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
-    canPromoteMembers: Boolean? = null
+    canPromoteMembers: Boolean? = null,
+    canManageVoiceChats: Boolean? = null,
+    canManageChat: Boolean? = null
 ) = promoteChatMember(
     chat.id,
     userId,
@@ -60,7 +66,9 @@ suspend fun TelegramBot.promoteChatMember(
     canInviteUsers,
     canRestrictMembers,
     canPinMessages,
-    canPromoteMembers
+    canPromoteMembers,
+    canManageVoiceChats,
+    canManageChat
 )
 
 suspend fun TelegramBot.promoteChatMember(
@@ -75,7 +83,9 @@ suspend fun TelegramBot.promoteChatMember(
     canInviteUsers: Boolean? = null,
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
-    canPromoteMembers: Boolean? = null
+    canPromoteMembers: Boolean? = null,
+    canManageVoiceChats: Boolean? = null,
+    canManageChat: Boolean? = null
 ) = promoteChatMember(
     chatId,
     user.id,
@@ -88,7 +98,9 @@ suspend fun TelegramBot.promoteChatMember(
     canInviteUsers,
     canRestrictMembers,
     canPinMessages,
-    canPromoteMembers
+    canPromoteMembers,
+    canManageVoiceChats,
+    canManageChat
 )
 
 suspend fun TelegramBot.promoteChatMember(
@@ -103,7 +115,9 @@ suspend fun TelegramBot.promoteChatMember(
     canInviteUsers: Boolean? = null,
     canRestrictMembers: Boolean? = null,
     canPinMessages: Boolean? = null,
-    canPromoteMembers: Boolean? = null
+    canPromoteMembers: Boolean? = null,
+    canManageVoiceChats: Boolean? = null,
+    canManageChat: Boolean? = null
 ) = promoteChatMember(
     chat.id,
     user.id,
@@ -116,5 +130,7 @@ suspend fun TelegramBot.promoteChatMember(
     canInviteUsers,
     canRestrictMembers,
     canPinMessages,
-    canPromoteMembers
+    canPromoteMembers,
+    canManageVoiceChats,
+    canManageChat
 )

tgbotapi.extensions.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/send/media/SendMediaGroup.kt

@@ -8,7 +8,6 @@ import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.chat.abstracts.Chat
 import dev.inmo.tgbotapi.types.message.abstracts.Message
 import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
-import dev.inmo.tgbotapi.types.message.content.abstracts.VisualMediaGroupContent
 import dev.inmo.tgbotapi.utils.RiskFeature
 
 /**

tgbotapi.extensions.behaviour_builder/mpp_publish_template.kpsb

@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":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 Steps Extensions","description":"This extensions project contains tools for simple interaction with chats","url":"https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.steps","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"publishToMavenCentral":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
+{"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 Steps Extensions","description":"This extensions project contains tools for simple interaction with chats","url":"https://insanusmokrassar.github.io/TelegramBotAPI/tgbotapi.extensions.steps","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}

tgbotapi.extensions.behaviour_builder/publish.gradle

@@ -38,28 +38,28 @@ publishing {
                 
             }
         }
-        
         repositories {
-            maven {
-                name = "bintray"
-                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/TelegramBotAPI/${project.name}/;publish=1;override=1")
-                credentials {
-                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+                maven {
+                    name = "GithubPackages"
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
+                    credentials {
+                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                    }
                 }
             }
-            
-            maven {
-                name = "sonatype"
-                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                credentials {
-                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+                maven {
+                    name = "sonatype"
+                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                    credentials {
+                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                    }
                 }
             }
-            
         }
-        
     }
 }
 

tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt

@@ -31,7 +31,7 @@ private suspend fun <O> BehaviourContext.waitCommonMessage(
             (it as CommonMessage<MessageContent>).mapper()
         } ?.let { return@expectFlow it }
     }
-    it.asMessageUpdate() ?.data ?.asCommonMessage() ?.mapper().let(::listOfNotNull)
+    it.asBaseSentMessageUpdate() ?.data ?.asCommonMessage() ?.mapper().let(::listOfNotNull)
 }.toList().toList()
 
 private suspend inline fun <reified T : MessageContent> BehaviourContext.waitContent(

tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitEventAction.kt

@@ -3,11 +3,12 @@
 package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
 
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
+import dev.inmo.tgbotapi.extensions.utils.asBaseSentMessageUpdate
 import dev.inmo.tgbotapi.extensions.utils.asChatEventMessage
-import dev.inmo.tgbotapi.extensions.utils.asMessageUpdate
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.message.ChatEvents.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
+import dev.inmo.tgbotapi.types.message.ChatEvents.voice.*
 import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
 import kotlinx.coroutines.flow.toList
 
@@ -23,7 +24,7 @@ private suspend fun <O> BehaviourContext.waitEventMessages(
     count,
     errorFactory
 ) {
-    it.asMessageUpdate() ?.data ?.asChatEventMessage() ?.mapper().let(::listOfNotNull)
+    it.asBaseSentMessageUpdate() ?.data ?.asChatEventMessage() ?.mapper().let(::listOfNotNull)
 }.toList().toList()
 
 
@@ -63,6 +64,39 @@ suspend fun BehaviourContext.waitChatEvents(
     count: Int = 1,
     filter: EventMessageToEventMapper<ChatEvent>? = null
 ) = waitEvents(count, initRequest, errorFactory, filter)
+
+suspend fun BehaviourContext.waitVoiceChatEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<VoiceChatEvent>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitVoiceChatStartedEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<VoiceChatStarted>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitVoiceChatEndedEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<VoiceChatEnded>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+suspend fun BehaviourContext.waitVoiceChatParticipantsInvitedEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<VoiceChatParticipantsInvited>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+
+suspend fun BehaviourContext.waitMessageAutoDeleteTimerChangedEvents(
+    initRequest: Request<*>? = null,
+    errorFactory: NullableRequestBuilder<*> = { null },
+    count: Int = 1,
+    filter: EventMessageToEventMapper<MessageAutoDeleteTimerChanged>? = null
+) = waitEvents(count, initRequest, errorFactory, filter)
+
 suspend fun BehaviourContext.waitCommonEvents(
     initRequest: Request<*>? = null,
     errorFactory: NullableRequestBuilder<*> = { null },

tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitInlineQuery.kt

@@ -1,10 +1,8 @@
 package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
 
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.utils.asCallbackQueryUpdate
 import dev.inmo.tgbotapi.extensions.utils.asInlineQueryUpdate
 import dev.inmo.tgbotapi.requests.abstracts.Request
-import dev.inmo.tgbotapi.types.CallbackQuery.*
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery
 import dev.inmo.tgbotapi.types.InlineQueries.query.BaseInlineQuery
 import dev.inmo.tgbotapi.types.InlineQueries.query.LocationInlineQuery

tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitPassportData.kt

@@ -1,7 +1,8 @@
 package dev.inmo.tgbotapi.extensions.behaviour_builder.expectations
 
 import dev.inmo.tgbotapi.extensions.behaviour_builder.BehaviourContext
-import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.extensions.utils.asMessageUpdate
+import dev.inmo.tgbotapi.extensions.utils.asPassportMessage
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.types.message.PassportMessage
 import dev.inmo.tgbotapi.types.passport.PassportData

tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/CallbackQueryTriggers.kt

@@ -4,7 +4,7 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.expectFlow
-import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.extensions.utils.asCallbackQueryUpdate
 import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
 import dev.inmo.tgbotapi.types.CallbackQuery.*
 

tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/ContentTriggers.kt

@@ -36,7 +36,7 @@ internal suspend inline fun <reified T : MessageContent> BehaviourContext.onCont
             return@expectFlow it
         }
     }
-    it.asMessageUpdate() ?.data ?.asCommonMessage() ?.let { message ->
+    it.asBaseSentMessageUpdate() ?.data ?.asCommonMessage() ?.let { message ->
         if (message.content is T) {
             val adaptedMessage = message as CommonMessage<T>
             if (additionalFilter == null || additionalFilter(adaptedMessage)) adaptedMessage else null

tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/EventTriggers.kt

@@ -4,10 +4,12 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.expectFlow
-import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.extensions.utils.asBaseSentMessageUpdate
+import dev.inmo.tgbotapi.extensions.utils.asChatEventMessage
 import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
 import dev.inmo.tgbotapi.types.message.ChatEvents.*
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
+import dev.inmo.tgbotapi.types.message.ChatEvents.voice.*
 import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
 
 internal suspend inline fun <reified T : ChatEvent> BehaviourContext.onEvent(
@@ -15,7 +17,7 @@ internal suspend inline fun <reified T : ChatEvent> BehaviourContext.onEvent(
     noinline additionalFilter: (suspend (ChatEventMessage<T>) -> Boolean)? = null,
     noinline scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<T>>
 ) = flowsUpdatesFilter.expectFlow(bot) {
-    it.asMessageUpdate() ?.data ?.asChatEventMessage() ?.let { message ->
+    it.asBaseSentMessageUpdate() ?.data ?.asChatEventMessage() ?.let { message ->
         if (message.chatEvent is T) {
             val adaptedMessage = message as ChatEventMessage<T>
             if (additionalFilter == null || additionalFilter(adaptedMessage)) adaptedMessage else null
@@ -43,6 +45,31 @@ suspend fun BehaviourContext.onChatEvent(
     additionalFilter: (suspend (ChatEventMessage<ChatEvent>) -> Boolean)? = null,
     scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<ChatEvent>>
 ) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onVoiceChatEvent(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<VoiceChatEvent>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<VoiceChatEvent>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onVoiceChatStartedEvent(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<VoiceChatStarted>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<VoiceChatStarted>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onVoiceChatEndedEvent(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<VoiceChatEnded>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<VoiceChatEnded>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onVoiceChatParticipantsInvitedEvent(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<VoiceChatParticipantsInvited>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<VoiceChatParticipantsInvited>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
+suspend fun BehaviourContext.onMessageAutoDeleteTimerChangedEvent(
+    includeFilterByChatInBehaviourSubContext: Boolean = true,
+    additionalFilter: (suspend (ChatEventMessage<MessageAutoDeleteTimerChanged>) -> Boolean)? = null,
+    scenarioReceiver: BehaviourContextAndTypeReceiver<Unit, ChatEventMessage<MessageAutoDeleteTimerChanged>>
+) = onEvent(includeFilterByChatInBehaviourSubContext, additionalFilter, scenarioReceiver)
 suspend fun BehaviourContext.onCommonEvent(
     includeFilterByChatInBehaviourSubContext: Boolean = true,
     additionalFilter: (suspend (ChatEventMessage<CommonEvent>) -> Boolean)? = null,

tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/InlineQueryTriggers.kt

@@ -5,8 +5,6 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.expectFlow
 import dev.inmo.tgbotapi.extensions.utils.asInlineQueryUpdate
 import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
-import dev.inmo.tgbotapi.types.CallbackQuery.DataCallbackQuery
-import dev.inmo.tgbotapi.types.CallbackQuery.GameShortNameCallbackQuery
 import dev.inmo.tgbotapi.types.InlineQueries.abstracts.InlineQuery
 import dev.inmo.tgbotapi.types.InlineQueries.query.BaseInlineQuery
 import dev.inmo.tgbotapi.types.InlineQueries.query.LocationInlineQuery

tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/MediaGroupTriggers.kt

@@ -5,12 +5,13 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.expectFlow
-import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.extensions.utils.asSentMediaGroupUpdate
 import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
 import dev.inmo.tgbotapi.extensions.utils.shortcuts.chat
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
 import dev.inmo.tgbotapi.types.message.content.abstracts.*
-import dev.inmo.tgbotapi.types.message.content.media.*
+import dev.inmo.tgbotapi.types.message.content.media.PhotoContent
+import dev.inmo.tgbotapi.types.message.content.media.VideoContent
 import dev.inmo.tgbotapi.utils.PreviewFeature
 
 @PreviewFeature

tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/triggers_handling/PassportTriggers.kt

@@ -3,7 +3,8 @@ package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.expectFlow
-import dev.inmo.tgbotapi.extensions.utils.*
+import dev.inmo.tgbotapi.extensions.utils.asMessageUpdate
+import dev.inmo.tgbotapi.extensions.utils.asPassportMessage
 import dev.inmo.tgbotapi.extensions.utils.extensions.sourceChat
 import dev.inmo.tgbotapi.types.message.PassportMessage
 import dev.inmo.tgbotapi.types.passport.encrypted.abstracts.EncryptedPassportElement

tgbotapi.extensions.utils/mpp_publish_template.kpsb

@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":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 Utility Extensions","description":"Util extensions for more useful work with updates and other things","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-utils","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"publishToMavenCentral":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
+{"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 Utility Extensions","description":"Util extensions for more useful work with updates and other things","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI-extensions-utils","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}

tgbotapi.extensions.utils/publish.gradle

@@ -38,28 +38,28 @@ publishing {
                 
             }
         }
-        
         repositories {
-            maven {
-                name = "bintray"
-                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/TelegramBotAPI/${project.name}/;publish=1;override=1")
-                credentials {
-                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+                maven {
+                    name = "GithubPackages"
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
+                    credentials {
+                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                    }
                 }
             }
-            
-            maven {
-                name = "sonatype"
-                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                credentials {
-                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+                maven {
+                    name = "sonatype"
+                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                    credentials {
+                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                    }
                 }
             }
-            
         }
-        
     }
 }
 

tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/ClassCasts.kt

@@ -32,7 +32,10 @@ import dev.inmo.tgbotapi.types.dice.*
 import dev.inmo.tgbotapi.types.files.*
 import dev.inmo.tgbotapi.types.files.abstracts.*
 import dev.inmo.tgbotapi.types.message.*
+import dev.inmo.tgbotapi.types.message.ChatEvents.*
+import dev.inmo.tgbotapi.types.message.ChatEvents.LeftChatMember
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
+import dev.inmo.tgbotapi.types.message.ChatEvents.voice.*
 import dev.inmo.tgbotapi.types.message.abstracts.*
 import dev.inmo.tgbotapi.types.message.content.*
 import dev.inmo.tgbotapi.types.message.content.abstracts.*
@@ -938,6 +941,18 @@ inline fun Update.asUnknownUpdate(): UnknownUpdate? = this as? UnknownUpdate
 @PreviewFeature
 inline fun Update.requireUnknownUpdate(): UnknownUpdate = this as UnknownUpdate
 @PreviewFeature
+inline fun Update.asCommonChatMemberUpdatedUpdate(): CommonChatMemberUpdatedUpdate? = this as? CommonChatMemberUpdatedUpdate
+@PreviewFeature
+inline fun Update.requireCommonChatMemberUpdatedUpdate(): CommonChatMemberUpdatedUpdate = this as CommonChatMemberUpdatedUpdate
+@PreviewFeature
+inline fun Update.asMyChatMemberUpdatedUpdate(): MyChatMemberUpdatedUpdate? = this as? MyChatMemberUpdatedUpdate
+@PreviewFeature
+inline fun Update.requireMyChatMemberUpdatedUpdate(): MyChatMemberUpdatedUpdate = this as MyChatMemberUpdatedUpdate
+@PreviewFeature
+inline fun Update.asChatMemberUpdatedUpdate(): ChatMemberUpdatedUpdate? = this as? ChatMemberUpdatedUpdate
+@PreviewFeature
+inline fun Update.requireChatMemberUpdatedUpdate(): ChatMemberUpdatedUpdate = this as ChatMemberUpdatedUpdate
+@PreviewFeature
 inline fun TelegramMediaFile.asAnimationFile(): AnimationFile? = this as? AnimationFile
 @PreviewFeature
 inline fun TelegramMediaFile.requireAnimationFile(): AnimationFile = this as AnimationFile
@@ -1245,3 +1260,79 @@ inline fun DiceAnimationType.requireFootballDiceAnimationType(): FootballDiceAni
 inline fun DiceAnimationType.asSlotMachineDiceAnimationType(): SlotMachineDiceAnimationType? = this as? SlotMachineDiceAnimationType
 @PreviewFeature
 inline fun DiceAnimationType.requireSlotMachineDiceAnimationType(): SlotMachineDiceAnimationType = this as SlotMachineDiceAnimationType
+@PreviewFeature
+inline fun ChatEvent.asChannelChatCreated(): ChannelChatCreated? = this as? ChannelChatCreated
+@PreviewFeature
+inline fun ChatEvent.requireChannelChatCreated(): ChannelChatCreated = this as ChannelChatCreated
+@PreviewFeature
+inline fun ChatEvent.asDeleteChatPhoto(): DeleteChatPhoto? = this as? DeleteChatPhoto
+@PreviewFeature
+inline fun ChatEvent.requireDeleteChatPhoto(): DeleteChatPhoto = this as DeleteChatPhoto
+@PreviewFeature
+inline fun ChatEvent.asGroupChatCreated(): GroupChatCreated? = this as? GroupChatCreated
+@PreviewFeature
+inline fun ChatEvent.requireGroupChatCreated(): GroupChatCreated = this as GroupChatCreated
+@PreviewFeature
+inline fun ChatEvent.asLeftChatMember(): LeftChatMember? = this as? LeftChatMember
+@PreviewFeature
+inline fun ChatEvent.requireLeftChatMember(): LeftChatMember = this as LeftChatMember
+@PreviewFeature
+inline fun ChatEvent.asMessageAutoDeleteTimerChanged(): MessageAutoDeleteTimerChanged? = this as? MessageAutoDeleteTimerChanged
+@PreviewFeature
+inline fun ChatEvent.requireMessageAutoDeleteTimerChanged(): MessageAutoDeleteTimerChanged = this as MessageAutoDeleteTimerChanged
+@PreviewFeature
+inline fun ChatEvent.asNewChatMembers(): NewChatMembers? = this as? NewChatMembers
+@PreviewFeature
+inline fun ChatEvent.requireNewChatMembers(): NewChatMembers = this as NewChatMembers
+@PreviewFeature
+inline fun ChatEvent.asNewChatPhoto(): NewChatPhoto? = this as? NewChatPhoto
+@PreviewFeature
+inline fun ChatEvent.requireNewChatPhoto(): NewChatPhoto = this as NewChatPhoto
+@PreviewFeature
+inline fun ChatEvent.asNewChatTitle(): NewChatTitle? = this as? NewChatTitle
+@PreviewFeature
+inline fun ChatEvent.requireNewChatTitle(): NewChatTitle = this as NewChatTitle
+@PreviewFeature
+inline fun ChatEvent.asPinnedMessage(): PinnedMessage? = this as? PinnedMessage
+@PreviewFeature
+inline fun ChatEvent.requirePinnedMessage(): PinnedMessage = this as PinnedMessage
+@PreviewFeature
+inline fun ChatEvent.asProximityAlertTriggered(): ProximityAlertTriggered? = this as? ProximityAlertTriggered
+@PreviewFeature
+inline fun ChatEvent.requireProximityAlertTriggered(): ProximityAlertTriggered = this as ProximityAlertTriggered
+@PreviewFeature
+inline fun ChatEvent.asSupergroupChatCreated(): SupergroupChatCreated? = this as? SupergroupChatCreated
+@PreviewFeature
+inline fun ChatEvent.requireSupergroupChatCreated(): SupergroupChatCreated = this as SupergroupChatCreated
+@PreviewFeature
+inline fun ChatEvent.asChannelEvent(): ChannelEvent? = this as? ChannelEvent
+@PreviewFeature
+inline fun ChatEvent.requireChannelEvent(): ChannelEvent = this as ChannelEvent
+@PreviewFeature
+inline fun ChatEvent.asCommonEvent(): CommonEvent? = this as? CommonEvent
+@PreviewFeature
+inline fun ChatEvent.requireCommonEvent(): CommonEvent = this as CommonEvent
+@PreviewFeature
+inline fun ChatEvent.asGroupEvent(): GroupEvent? = this as? GroupEvent
+@PreviewFeature
+inline fun ChatEvent.requireGroupEvent(): GroupEvent = this as GroupEvent
+@PreviewFeature
+inline fun ChatEvent.asSupergroupEvent(): SupergroupEvent? = this as? SupergroupEvent
+@PreviewFeature
+inline fun ChatEvent.requireSupergroupEvent(): SupergroupEvent = this as SupergroupEvent
+@PreviewFeature
+inline fun ChatEvent.asVoiceChatEvent(): VoiceChatEvent? = this as? VoiceChatEvent
+@PreviewFeature
+inline fun ChatEvent.requireVoiceChatEvent(): VoiceChatEvent = this as VoiceChatEvent
+@PreviewFeature
+inline fun ChatEvent.asVoiceChatEnded(): VoiceChatEnded? = this as? VoiceChatEnded
+@PreviewFeature
+inline fun ChatEvent.requireVoiceChatEnded(): VoiceChatEnded = this as VoiceChatEnded
+@PreviewFeature
+inline fun ChatEvent.asVoiceChatParticipantsInvited(): VoiceChatParticipantsInvited? = this as? VoiceChatParticipantsInvited
+@PreviewFeature
+inline fun ChatEvent.requireVoiceChatParticipantsInvited(): VoiceChatParticipantsInvited = this as VoiceChatParticipantsInvited
+@PreviewFeature
+inline fun ChatEvent.asVoiceChatStarted(): VoiceChatStarted? = this as? VoiceChatStarted
+@PreviewFeature
+inline fun ChatEvent.requireVoiceChatStarted(): VoiceChatStarted = this as VoiceChatStarted

tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/LongPolling.kt

@@ -14,10 +14,8 @@ import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.updateshandlers.*
 import dev.inmo.tgbotapi.utils.*
 import io.ktor.client.features.HttpRequestTimeoutException
-import io.ktor.utils.io.core.use
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
-import kotlin.coroutines.coroutineContext
 
 fun TelegramBot.startGettingOfUpdatesByLongPolling(
     timeoutSeconds: Seconds = 30,

tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/updates/retrieving/MediaGroupsIncluder.kt

@@ -2,7 +2,6 @@ package dev.inmo.tgbotapi.extensions.utils.updates.retrieving
 
 import dev.inmo.tgbotapi.extensions.utils.updates.convertWithMediaGroupUpdates
 import dev.inmo.tgbotapi.types.message.abstracts.MediaGroupMessage
-import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent
 import dev.inmo.tgbotapi.types.update.abstracts.BaseMessageUpdate
 import dev.inmo.tgbotapi.types.update.abstracts.Update
 import dev.inmo.tgbotapi.updateshandlers.UpdateReceiver

tgbotapi/mpp_publish_template.kpsb

@@ -1 +1 @@
-{"bintrayConfig":{"repo":"TelegramBotAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/TelegramBotAPI","autoPublish":true,"overridePublish":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","description":"This project just include all subproject of TelegramBotAPI","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"publishToMavenCentral":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}}
+{"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","description":"This project just include all subproject of TelegramBotAPI","url":"https://insanusmokrassar.github.io/TelegramBotAPI/TelegramBotAPI","vcsUrl":"https://github.com/insanusmokrassar/TelegramBotAPI.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}

tgbotapi/publish.gradle

@@ -38,28 +38,28 @@ publishing {
                 
             }
         }
-        
         repositories {
-            maven {
-                name = "bintray"
-                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/TelegramBotAPI/${project.name}/;publish=1;override=1")
-                credentials {
-                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
-                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+                maven {
+                    name = "GithubPackages"
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/TelegramBotAPI")
+                    credentials {
+                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                    }
                 }
             }
-            
-            maven {
-                name = "sonatype"
-                url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                credentials {
-                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+                maven {
+                    name = "sonatype"
+                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                    credentials {
+                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                    }
                 }
             }
-            
         }
-        
     }
 }