simpleFilter to list wrapper

0.38.7

CHANGELOG.md

@@ -1,5 +1,51 @@
 # TelegramBotAPI changelog
 
+## 0.38.8
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.12` -> `0.9.16`
+        * `Klock`: `2.6.2` -> `2.6.3`
+        * `Ktor`: `1.6.7` -> `1.6.8`
+* `BehaviourBuilder`:
+    * Fixes in `onMediaGroup` and dependent functions
+    * Add several new extensions for `SimpleFilter`:
+        * `SimpleFilter#listAll`
+        * `SimpleFilter#listAny`
+        * `SimpleFilter#listNone`
+
+## 0.38.7
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.9` -> `0.9.12`
+        * `Klock`: `2.5.2` -> `2.6.2`
+* `Core`:
+    * `SimplePollOption#votes` now is `0` by default
+    * New function `PollOption.Companion#simple`
+
+## 0.38.6
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.6` -> `0.9.9`
+        * `Klock`: `2.4.13` -> `2.5.2`
+* `Core`:
+    * New member of `MentionTextSource` - `username`
+
+## 0.38.5
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.9.5` -> `0.9.6`
+* `Core`:
+    * `Username` got new property `usernameWithoutAt` which will return `username` without leading `@`
+* `Utils`:
+    * Several new functions for working with deep links:
+        * `makeUsernameDeepLinkPrefix`
+        * `makeTelegramDeepLink`
+        * `makeDeepLink`
+
 ## 0.38.4
 
 __This update contains including of [Telegram Bot API 5.7](https://core.telegram.org/bots/api-changelog#january-31-2022)__

README.md

@@ -28,7 +28,7 @@ Other configuration examples:
 suspend fun main() {
   val bot = telegramBot(TOKEN)
 
-  bot.buildBehaviour {
+  bot.buildBehaviourWithLongPolling {
     println(getMe())
   
     onCommand("start") {
@@ -69,7 +69,7 @@ and maybe some updates it got after launch)
 suspend fun main() {
   val bot = telegramBot(TOKEN)
 
-  bot.buildBehaviour {
+  bot.buildBehaviourWithLongPolling {
     println(getMe())
 
     val nameReplyMarkup = ReplyKeyboardMarkup(

gradle.properties

@@ -8,11 +8,11 @@ kotlin.incremental.js=true
 kotlin_version=1.6.10
 kotlin_coroutines_version=1.6.0
 kotlin_serialisation_runtime_version=1.3.2
-klock_version=2.4.13
+klock_version=2.6.3
 uuid_version=0.4.0
-ktor_version=1.6.7
+ktor_version=1.6.8
 
-micro_utils_version=0.9.5
+micro_utils_version=0.9.16
 
 javax_activation_version=1.1.1
 
@@ -20,6 +20,6 @@ javax_activation_version=1.1.1
 dokka_version=1.6.10
 
 library_group=dev.inmo
-library_version=0.38.4
+library_version=0.38.8
 
 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-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip

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

@@ -22,7 +22,11 @@ internal suspend inline fun <BC : BehaviourContext, reified T : MediaGroupConten
     markerFactory: MarkerFactory<in List<MediaGroupMessage<T>>, Any> = ByChatMediaGroupMarkerFactory,
     noinline scenarioReceiver: CustomBehaviourContextAndTypeReceiver<BC, Unit, List<MediaGroupMessage<T>>>
 ) = on(markerFactory, initialFilter, subcontextUpdatesFilter, scenarioReceiver) {
-    (it.asSentMediaGroupUpdate() ?.data ?.takeIf { it.all { it is T } } as? List<MediaGroupMessage<T>>) ?.let(::listOfNotNull)
+    (it.asSentMediaGroupUpdate() ?.data ?.takeIf { messages ->
+        messages.all { message ->
+            message.content is T
+        }
+    } as? List<MediaGroupMessage<T>>) ?.let(::listOfNotNull)
 }
 
 /**

tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/SimpleFilter.kt

@@ -4,6 +4,27 @@ typealias SimpleFilter<T> = suspend (T) -> Boolean
 
 inline fun <T> SimpleFilter(noinline block: SimpleFilter<T>) = block
 
+/**
+ * @return [SimpleFilter] which will return true in case when all the items in incoming data passed [this] filter
+ */
+fun <T> SimpleFilter<T>.listAll() = SimpleFilter<Iterable<T>> {
+    it.all { this@listAll(it) }
+}
+
+/**
+ * @return [SimpleFilter] which will return true in case when there is any item in incoming data passed [this] filter
+ */
+fun <T> SimpleFilter<T>.listAny() = SimpleFilter<Iterable<T>> {
+    it.any { this@listAny(it) }
+}
+
+/**
+ * @return [SimpleFilter] which will return true in case when there is no any item in incoming data passed [this] filter
+ */
+fun <T> SimpleFilter<T>.listNone() = SimpleFilter<Iterable<T>> {
+    it.none { this@listNone(it) }
+}
+
 /**
  * Makes an AND (&&) operation between [this] and [other]
  */

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

@@ -46,6 +46,9 @@ fun Byte.toChatId(): ChatId = toLong().toChatId()
 data class Username(
     val username: String
 ) : ChatIdentifier() {
+    val usernameWithoutAt
+        get() = username.dropWhile { it == '@' }
+
     init {
         if (!username.startsWith("@")) {
             throw IllegalArgumentException("Username must starts with `@`")

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/MessageEntity/textsources/MentionTextSource.kt

@@ -1,5 +1,6 @@
 package dev.inmo.tgbotapi.types.MessageEntity.textsources
 
+import dev.inmo.tgbotapi.types.Username
 import dev.inmo.tgbotapi.utils.RiskFeature
 import dev.inmo.tgbotapi.utils.extensions.makeString
 import dev.inmo.tgbotapi.utils.internal.*
@@ -23,6 +24,7 @@ data class MentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructo
     override val markdown: String by lazy { source.mentionMarkdown() }
     override val markdownV2: String by lazy { mentionMarkdownV2() }
     override val html: String by lazy { mentionHTML() }
+    val username: Username = Username(source)
 
     init {
         if (!source.startsWith("@")) {
@@ -42,3 +44,6 @@ inline fun mention(vararg parts: TextSource) = mention(parts.toList())
 @Suppress("NOTHING_TO_INLINE")
 inline fun mention(whoToMention: String) = mention(regular(whoToMention))
 
+@Suppress("NOTHING_TO_INLINE")
+inline fun mention(whoToMention: Username) = mention(whoToMention.username.dropWhile { it == '@' })
+

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

@@ -12,6 +12,13 @@ import kotlinx.serialization.encoding.Encoder
 sealed class PollOption {
     abstract val text: String
     abstract val votes: Int
+
+    companion object {
+        fun simple(
+            text: String,
+            votes: Int = 0
+        ) = SimplePollOption(text, votes)
+    }
 }
 
 @Serializable
@@ -19,7 +26,7 @@ data class SimplePollOption (
     @SerialName(textField)
     override val text: String,
     @SerialName(votesCountField)
-    override val votes: Int
+    override val votes: Int = 0
 ) : PollOption()
 
 @RiskFeature

tgbotapi.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/formatting/LinksFormatting.kt

@@ -9,9 +9,15 @@ import dev.inmo.tgbotapi.types.message.abstracts.Message
 private const val internalLinkBeginning = "https://t.me"
 
 fun makeUsernameLink(username: String) = "$internalLinkBeginning/$username"
+fun makeUsernameDeepLinkPrefix(username: String) = "${makeUsernameLink(username)}?start="
 inline val Username.link
-    get() = makeUsernameLink(username)
+    get() = makeUsernameLink(usernameWithoutAt)
+inline val Username.deepLinkPrefix
+    get() = makeUsernameDeepLinkPrefix(usernameWithoutAt)
 inline fun makeLink(username: Username) = username.link
+inline fun makeTelegramDeepLink(username: String, startParameter: String) = "${makeUsernameDeepLinkPrefix(username)}$startParameter"
+inline fun makeDeepLink(username: Username, startParameter: String) = "${username.deepLinkPrefix}$startParameter"
+inline fun makeTelegramDeepLink(username: Username, startParameter: String) = makeDeepLink(username, startParameter)
 
 fun makeLinkToMessage(
     username: String,