Merge pull request #211 from InsanusMokrassar/0.30.4

0.30.4

CHANGELOG.md

@@ -1,5 +1,31 @@
 # TelegramBotAPI changelog
 
+## 0.30.4
+
+* `Common`:
+    * `Version`:
+        * `MicroUtils`: `0.3.1` -> `0.3.3`
+* `Core`:
+    * `MultilevelTextSource#textSources` has been safely renamed to `subsources`
+    * `TextContent#fullEntitiesList` has been deprecated
+    * Now `TextContent` implements `TextedInput`
+        * `TextContent#entities` has been deprecated
+    * `GroupEventMessage` now overrides `chatEvent` with type `GroupEvent`
+    * `SupergroupEventMessage` now overrides `chatEvent` with type `SupergroupEvent`
+    * Any `ChatEventMessage` now have generic type of its `chatEvent` (just like messages)
+* `Utils`:
+    * Old extensions related to chat events are deprecated:
+        * `Flow<ChatEventMessage<*>>#divideBySource`
+        * `Flow<ChatEventMessage<*>>#onlyChannelEvents`
+        * `Flow<ChatEventMessage<*>>#onlyGroupEvents`
+        * `Flow<ChatEventMessage<*>>#onlySupergroupEvents`
+    * A lot of extensions for `Flow<ChatEventMessage>` has been added:
+        * `FlowsUpdatesFilter#events`
+        * `FlowsUpdatesFilter#channelEvents`
+        * `FlowsUpdatesFilter#groupEvents`
+        * `FlowsUpdatesFilter#supergroupEvents`
+        * And a lot of other filters with specific types
+
 ## 0.30.3
 
 * `Common`:

gradle.properties

@@ -12,12 +12,12 @@ klock_version=1.12.1
 uuid_version=0.2.2
 ktor_version=1.4.2
 
-micro_utils_version=0.3.1
+micro_utils_version=0.3.3
 
 javax_activation_version=1.1.1
 
 library_group=dev.inmo
-library_version=0.30.3
+library_version=0.30.4
 
 gradle_bintray_plugin_version=1.8.5
 github_release_plugin_version=2.2.12

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/CommonAbstracts/TextSource.kt

@@ -36,7 +36,10 @@ interface MultilevelTextSource : TextSource {
     @Deprecated("Will be removed in near major release")
     val textParts: List<TextPart>
         get() = textParts(0)
+    val subsources: List<TextSource>
+    @Deprecated("Will be removed in near major release", ReplaceWith("subsources"))
     val textSources: List<TextSource>
+        get() = subsources
 }
 
 data class TextPart(
@@ -46,7 +49,7 @@ data class TextPart(
 
 fun List<TextPart>.justTextSources() = map { it.source }
 fun List<TextSource>.makeString() = joinToString("") { it.source }
-internal fun MultilevelTextSource.textParts(offset: Int): List<TextPart> = textSources.toTextParts(offset)
+internal fun MultilevelTextSource.textParts(offset: Int): List<TextPart> = subsources.toTextParts(offset)
 fun List<TextSource>.separateForMessage(limit: IntRange, numberOfParts: Int? = null): List<List<TextSource>> {
     if (isEmpty()) {
         return emptyList()

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

@@ -11,7 +11,7 @@ import dev.inmo.tgbotapi.utils.internal.boldMarkdownV2
  */
 data class BoldTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
     override val asMarkdownSource: String by lazy { source.boldMarkdown() }
     override val asMarkdownV2Source: String by lazy { boldMarkdownV2() }

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

@@ -11,7 +11,7 @@ import dev.inmo.tgbotapi.utils.internal.cashTagMarkdownV2
  */
 data class CashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
     override val asMarkdownSource: String by lazy { source.cashTagMarkdown() }
     override val asMarkdownV2Source: String by lazy { cashTagMarkdownV2() }

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

@@ -11,7 +11,7 @@ import dev.inmo.tgbotapi.utils.internal.emailMarkdownV2
  */
 data class EMailTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
     override val asMarkdownSource: String by lazy { source.emailMarkdown() }
     override val asMarkdownV2Source: String by lazy { emailMarkdownV2(source) }

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

@@ -11,7 +11,7 @@ import dev.inmo.tgbotapi.utils.internal.hashTagMarkdownV2
  */
 data class HashTagTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
     override val asMarkdownSource: String by lazy { source.hashTagMarkdown() }
     override val asMarkdownV2Source: String by lazy { hashTagMarkdownV2() }

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

@@ -11,7 +11,7 @@ import dev.inmo.tgbotapi.utils.internal.italicMarkdownV2
  */
 data class ItalicTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
     override val asMarkdownSource: String by lazy { source.italicMarkdown() }
     override val asMarkdownV2Source: String by lazy { italicMarkdownV2() }

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

@@ -18,7 +18,7 @@ private val String.withoutCommercialAt
  */
 data class MentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
     override val asMarkdownSource: String by lazy { source.mentionMarkdown() }
     override val asMarkdownV2Source: String by lazy { mentionMarkdownV2() }

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

@@ -11,7 +11,7 @@ import dev.inmo.tgbotapi.utils.internal.phoneMarkdownV2
  */
 data class PhoneNumberTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
     override val asMarkdownSource: String by lazy { source.phoneMarkdown() }
     override val asMarkdownV2Source: String by lazy { phoneMarkdownV2() }

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

@@ -11,7 +11,7 @@ import dev.inmo.tgbotapi.utils.internal.strikethroughMarkdownV2
  */
 data class StrikethroughTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
     override val asHtmlSource: String by lazy { strikethroughHTML() }
     override val asMarkdownV2Source: String by lazy { strikethroughMarkdownV2() }

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

@@ -13,7 +13,7 @@ import dev.inmo.tgbotapi.utils.internal.textMentionMarkdownV2
 data class TextMentionTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
     val user: User,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
     override val asMarkdownSource: String by lazy { source.textMentionMarkdown(user.id) }
     override val asMarkdownV2Source: String by lazy { textMentionMarkdownV2(user.id) }

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

@@ -11,7 +11,7 @@ import dev.inmo.tgbotapi.utils.internal.underlineMarkdownV2
  */
 data class UnderlineTextSource @RiskFeature(DirectInvocationOfTextSourceConstructor) constructor (
     override val source: String,
-    override val textSources: List<TextSource>
+    override val subsources: List<TextSource>
 ) : MultilevelTextSource {
     override val asMarkdownSource: String by lazy { source.underlineMarkdown() }
     override val asMarkdownV2Source: String by lazy { underlineMarkdownV2() }

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

@@ -4,11 +4,12 @@ import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.chat.abstracts.ChannelChat
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.ChannelEvent
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent
 import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
 
-data class ChannelEventMessage(
+data class ChannelEventMessage<T : ChannelEvent>(
     override val messageId: MessageIdentifier,
     override val chat: ChannelChat,
-    override val chatEvent: ChannelEvent,
+    override val chatEvent: T,
     override val date: DateTime
-) : ChatEventMessage
+) : ChatEventMessage<T>

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

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

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

@@ -8,12 +8,12 @@ import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent
 import dev.inmo.tgbotapi.types.message.abstracts.GroupEventMessage
 
 @Deprecated("Renamed", ReplaceWith("CommonGroupEventMessage"))
-typealias GroupEventMessage = CommonGroupEventMessage
+typealias GroupEventMessage = CommonGroupEventMessage<*>
 
-data class CommonGroupEventMessage(
+data class CommonGroupEventMessage<T : GroupEvent>(
     override val messageId: MessageIdentifier,
     override val user: User,
     override val chat: GroupChat,
-    override val chatEvent: GroupEvent,
+    override val chatEvent: T,
     override val date: DateTime
-) : GroupEventMessage
+) : GroupEventMessage<T>

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

@@ -4,16 +4,17 @@ import com.soywiz.klock.DateTime
 import dev.inmo.tgbotapi.types.MessageIdentifier
 import dev.inmo.tgbotapi.types.User
 import dev.inmo.tgbotapi.types.chat.abstracts.SupergroupChat
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.SupergroupEvent
 import dev.inmo.tgbotapi.types.message.abstracts.SupergroupEventMessage
 
 @Deprecated("Renamed", ReplaceWith("CommonSupergroupEventMessage"))
-typealias SupergroupEventMessage = CommonSupergroupEventMessage
+typealias SupergroupEventMessage = CommonSupergroupEventMessage<*>
 
-data class CommonSupergroupEventMessage(
+data class CommonSupergroupEventMessage<T : SupergroupEvent>(
     override val messageId: MessageIdentifier,
     override val user: User,
     override val chat: SupergroupChat,
-    override val chatEvent: SupergroupEvent,
+    override val chatEvent: T,
     override val date: DateTime
-) : SupergroupEventMessage
+) : SupergroupEventMessage<T>

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

@@ -38,6 +38,7 @@ data class AnonymousGroupMessageImpl<T : MessageContent>(
 data class CommonGroupMessageImpl<T : MessageContent>(
     override val chat: GroupChat,
     override val messageId: MessageIdentifier,
+    override val user: User,
     override val date: DateTime,
     override val forwardInfo: ForwardInfo?,
     override val editDate: DateTime?,

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

@@ -296,6 +296,7 @@ internal data class RawMessage(
                             null -> CommonGroupMessageImpl(
                                 chat,
                                 messageId,
+                                from ?: error("It is expected that in messages from non anonymous users and channels user must be specified"),
                                 date.asDate,
                                 forwarded,
                                 edit_date ?.asDate,

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

@@ -2,6 +2,6 @@ package dev.inmo.tgbotapi.types.message.abstracts
 
 import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.ChatEvent
 
-interface ChatEventMessage : Message {
-    val chatEvent: ChatEvent
+interface ChatEventMessage<T : ChatEvent> : Message {
+    val chatEvent: T
 }

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

@@ -1,3 +1,5 @@
 package dev.inmo.tgbotapi.types.message.abstracts
 
-interface GroupEventMessage : ChatEventMessage, FromUserMessage
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.GroupEvent
+
+interface GroupEventMessage<T : GroupEvent> : ChatEventMessage<T>, FromUserMessage

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

@@ -17,4 +17,4 @@ interface AnonymousGroupMessage<T : MessageContent> : GroupMessage<T>, SignedMes
     override val senderChat: GroupChat
         get() = chat
 }
-interface CommonGroupMessage<T : MessageContent> : GroupMessage<T>
+interface CommonGroupMessage<T : MessageContent> : GroupMessage<T>, FromUserMessage

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

@@ -1,3 +1,5 @@
 package dev.inmo.tgbotapi.types.message.abstracts
 
-interface SupergroupEventMessage : GroupEventMessage
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.SupergroupEvent
+
+interface SupergroupEventMessage<T : SupergroupEvent> : GroupEventMessage<T>

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

@@ -1,7 +1,6 @@
 package dev.inmo.tgbotapi.types.message.content
 
-import dev.inmo.tgbotapi.CommonAbstracts.TextSourcesList
-import dev.inmo.tgbotapi.CommonAbstracts.TextPart
+import dev.inmo.tgbotapi.CommonAbstracts.*
 import dev.inmo.tgbotapi.requests.abstracts.Request
 import dev.inmo.tgbotapi.requests.send.SendTextMessage
 import dev.inmo.tgbotapi.types.ChatIdentifier
@@ -15,13 +14,13 @@ import dev.inmo.tgbotapi.utils.internal.fullListOfSubSource
 import dev.inmo.tgbotapi.utils.internal.toMarkdownTexts
 
 data class TextContent(
-    val text: String,
-    /**
-     * Not full list of entities. This list WILL NOT contain [TextPart]s with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
-     * @see [TextContent.fullEntitiesList]
-     */
-    val entities: List<TextPart> = emptyList()
-) : MessageContent {
+    override val text: String,
+    override val textEntities: List<TextPart> = emptyList()
+) : MessageContent, TextedInput {
+    @Deprecated("Has been renamed", ReplaceWith("textEntities"))
+    val entities: List<TextPart>
+        get() = textEntities
+
     override fun createResend(
         chatId: ChatIdentifier,
         disableNotification: Boolean,
@@ -83,4 +82,5 @@ data class TextContent(
  * Convert its [TextContent.entities] to list of [dev.inmo.tgbotapi.CommonAbstracts.TextSource]
  * with [dev.inmo.tgbotapi.types.MessageEntity.textsources.RegularTextSource]
  */
+@Deprecated("Useless due to the fact that currently every message contains full list of sources")
 fun TextContent.fullEntitiesList(): TextSourcesList = text.fullListOfSubSource(entities).map { it.source }

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/utils/internal/MultilevelTextSourceFormatting.kt

@@ -83,19 +83,19 @@ private fun List<TextSource>.joinSubSourcesHtml() = joinToString("") {
 internal fun MultilevelTextSource.markdownV2Default(
     openControlSymbol: String,
     closeControlSymbol: String = openControlSymbol
-) = "$openControlSymbol${textSources.joinSubSourcesMarkdownV2()}$closeControlSymbol"
+) = "$openControlSymbol${subsources.joinSubSourcesMarkdownV2()}$closeControlSymbol"
 internal fun MultilevelTextSource.htmlDefault(
     openControlSymbol: String,
     closeControlSymbol: String = openControlSymbol
-) = "<$openControlSymbol>${textSources.joinSubSourcesHtml()}</$closeControlSymbol>"
+) = "<$openControlSymbol>${subsources.joinSubSourcesHtml()}</$closeControlSymbol>"
 
 
 internal fun MultilevelTextSource.linkMarkdownV2(
     link: String
-) = "[${textSources.joinSubSourcesMarkdownV2()}](${link.escapeMarkdownV2Link()})"
+) = "[${subsources.joinSubSourcesMarkdownV2()}](${link.escapeMarkdownV2Link()})"
 internal fun MultilevelTextSource.linkHTML(
     link: String
-) = "<a href=\"${link.toHtml()}\">${textSources.joinSubSourcesHtml()}</a>"
+) = "<a href=\"${link.toHtml()}\">${subsources.joinSubSourcesHtml()}</a>"
 
 
 internal fun MultilevelTextSource.optionalPrefix(
@@ -116,8 +116,8 @@ internal fun MultilevelTextSource.boldMarkdownV2(): String = markdownV2Default(m
 internal fun MultilevelTextSource.boldHTML(): String = htmlDefault(htmlBoldControl)
 
 
-internal fun MultilevelTextSource.cashTagMarkdownV2(): String = textSources.joinSubSourcesMarkdownV2()
-internal fun MultilevelTextSource.cashTagHTML(): String = textSources.joinSubSourcesHtml()
+internal fun MultilevelTextSource.cashTagMarkdownV2(): String = subsources.joinSubSourcesMarkdownV2()
+internal fun MultilevelTextSource.cashTagHTML(): String = subsources.joinSubSourcesHtml()
 
 
 internal fun MultilevelTextSource.italicMarkdownV2(): String = markdownV2Default(markdownItalicControl)
@@ -135,21 +135,21 @@ internal fun MultilevelTextSource.underlineHTML(): String = htmlDefault(htmlUnde
 internal fun MultilevelTextSource.textMentionMarkdownV2(userId: UserId): String = linkMarkdownV2(userId.link)
 internal fun MultilevelTextSource.textMentionHTML(userId: UserId): String = linkHTML(userId.link)
 
-internal fun MultilevelTextSource.mentionMarkdownV2(): String = optionalPrefix("@") + textSources.joinSubSourcesMarkdownV2()
-internal fun MultilevelTextSource.mentionHTML(): String = optionalPrefix("@") + textSources.joinSubSourcesHtml()
+internal fun MultilevelTextSource.mentionMarkdownV2(): String = optionalPrefix("@") + subsources.joinSubSourcesMarkdownV2()
+internal fun MultilevelTextSource.mentionHTML(): String = optionalPrefix("@") + subsources.joinSubSourcesHtml()
 
 
 internal fun MultilevelTextSource.hashTagMarkdownV2(): String = when {
     source.startsWith("\\#") || source.startsWith("#") -> ""
     else -> "\\#"
-} + textSources.joinSubSourcesMarkdownV2()
-internal fun MultilevelTextSource.hashTagHTML(): String = optionalPrefix("#") + textSources.joinSubSourcesHtml()
+} + subsources.joinSubSourcesMarkdownV2()
+internal fun MultilevelTextSource.hashTagHTML(): String = optionalPrefix("#") + subsources.joinSubSourcesHtml()
 
 
-internal fun MultilevelTextSource.phoneMarkdownV2(): String = textSources.joinSubSourcesMarkdownV2()
-internal fun MultilevelTextSource.phoneHTML(): String = textSources.joinSubSourcesHtml()
+internal fun MultilevelTextSource.phoneMarkdownV2(): String = subsources.joinSubSourcesMarkdownV2()
+internal fun MultilevelTextSource.phoneHTML(): String = subsources.joinSubSourcesHtml()
 
 
-internal fun MultilevelTextSource.commandMarkdownV2(): String = optionalPrefix("/") + textSources.joinSubSourcesMarkdownV2()
-internal fun MultilevelTextSource.commandHTML(): String = optionalPrefix("/") + textSources.joinSubSourcesHtml()
+internal fun MultilevelTextSource.commandMarkdownV2(): String = optionalPrefix("/") + subsources.joinSubSourcesMarkdownV2()
+internal fun MultilevelTextSource.commandHTML(): String = optionalPrefix("/") + subsources.joinSubSourcesHtml()
 

tgbotapi.core/src/commonTest/kotlin/dev/inmo/tgbotapi/types/MessageEntity/EntitiesTestText.kt

@@ -49,8 +49,8 @@ fun List<TextPart>.testTextParts() {
     assertTrue (get(5).source is MentionTextSource)
 
     val boldSource = get(1).source as BoldTextSource
-    assertTrue (boldSource.textSources.first() is ItalicTextSource)
-    assertTrue (boldSource.textSources[1] is RegularTextSource)
-    assertTrue (boldSource.textSources[2] is StrikethroughTextSource)
-    assertTrue ((boldSource.textSources[2] as StrikethroughTextSource).textSources.first() is UnderlineTextSource)
+    assertTrue (boldSource.subsources.first() is ItalicTextSource)
+    assertTrue (boldSource.subsources[1] is RegularTextSource)
+    assertTrue (boldSource.subsources[2] is StrikethroughTextSource)
+    assertTrue ((boldSource.subsources[2] as StrikethroughTextSource).subsources.first() is UnderlineTextSource)
 }

tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/chat_events/ChatEventsSourcesConversations.kt

@@ -1,13 +1,13 @@
 package dev.inmo.tgbotapi.extensions.utils.chat_events
 
-import dev.inmo.tgbotapi.types.message.*
+import dev.inmo.tgbotapi.extensions.utils.shortcuts.*
 import dev.inmo.tgbotapi.types.message.abstracts.ChatEventMessage
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.mapNotNull
 import kotlin.reflect.KClass
 
-
-fun <T : ChatEventMessage> Flow<ChatEventMessage>.divideBySource(contentType: KClass<T>) = mapNotNull {
+@Deprecated("Refactored, replaced and renamed", ReplaceWith("filterByChatEvent", "dev.inmo.tgbotapi.extensions.utils.shortcuts.filterByChatEvent"))
+fun <T : ChatEventMessage<*>> Flow<ChatEventMessage<*>>.divideBySource(contentType: KClass<T>) = mapNotNull {
     if (contentType.isInstance(it)) {
         @Suppress("UNCHECKED_CAST")
         it as T
@@ -16,6 +16,9 @@ fun <T : ChatEventMessage> Flow<ChatEventMessage>.divideBySource(contentType: KC
     }
 }
 
-fun Flow<ChatEventMessage>.onlyChannelEvents() = divideBySource(ChannelEventMessage::class)
-fun Flow<ChatEventMessage>.onlyGroupEvents() = divideBySource(CommonGroupEventMessage::class)
-fun Flow<ChatEventMessage>.onlySupergroupEvents() = divideBySource(CommonSupergroupEventMessage::class)
+@Deprecated("Replaced and renamed", ReplaceWith("channelEvents", "dev.inmo.tgbotapi.extensions.utils.shortcuts.channelEvents"))
+fun Flow<ChatEventMessage<*>>.onlyChannelEvents() = channelEvents()
+@Deprecated("Replaced and renamed", ReplaceWith("groupEvents", "dev.inmo.tgbotapi.extensions.utils.shortcuts.groupEvents"))
+fun Flow<ChatEventMessage<*>>.onlyGroupEvents() = groupEvents()
+@Deprecated("Replaced and renamed", ReplaceWith("supergroupEvents", "dev.inmo.tgbotapi.extensions.utils.shortcuts.supergroupEvents"))
+fun Flow<ChatEventMessage<*>>.onlySupergroupEvents() = supergroupEvents()

tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/CommandsShortcuts.kt

@@ -1,6 +1,7 @@
 package dev.inmo.tgbotapi.extensions.utils.shortcuts
 
 import dev.inmo.tgbotapi.CommonAbstracts.TextSource
+import dev.inmo.tgbotapi.CommonAbstracts.textSources
 import dev.inmo.tgbotapi.extensions.utils.onlyTextContentMessages
 import dev.inmo.tgbotapi.extensions.utils.updates.asContentMessagesFlow
 import dev.inmo.tgbotapi.types.MessageEntity.textsources.BotCommandTextSource
@@ -27,7 +28,7 @@ import kotlinx.coroutines.flow.*
 fun <T : ContentMessage<TextContent>> Flow<T>.filterExactCommands(
     commandRegex: Regex
 ) = filter { contentMessage ->
-    (contentMessage.content.fullEntitiesList().singleOrNull() as? BotCommandTextSource) ?.let { commandRegex.matches(it.command) } == true
+    (contentMessage.content.textSources.singleOrNull() as? BotCommandTextSource) ?.let { commandRegex.matches(it.command) } == true
 }
 
 /**
@@ -46,7 +47,7 @@ fun <T : ContentMessage<TextContent>> Flow<T>.filterExactCommands(
 fun <T : ContentMessage<TextContent>> Flow<T>.filterCommandsInsideTextMessages(
     commandRegex: Regex
 ) = filter { contentMessage ->
-    contentMessage.content.fullEntitiesList().any {
+    contentMessage.content.textSources.any {
         (it as? BotCommandTextSource) ?.let { commandRegex.matches(it.command) } == true
     }
 }
@@ -70,7 +71,7 @@ fun <T : ContentMessage<TextContent>> Flow<T>.filterCommandsInsideTextMessages(
 fun <T : ContentMessage<TextContent>> Flow<T>.filterCommandsWithArgs(
     commandRegex: Regex
 ) = mapNotNull { contentMessage ->
-    val allEntities = contentMessage.content.fullEntitiesList()
+    val allEntities = contentMessage.content.textSources
     (allEntities.firstOrNull() as? BotCommandTextSource) ?.let {
         if (commandRegex.matches(it.command)) {
             contentMessage to allEntities.flatMap {

tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/shortcuts/EventsShortcuts.kt

@@ -0,0 +1,98 @@
+@file:Suppress("NOTHING_TO_INLINE", "unused", "EXPERIMENTAL_API_USAGE")
+
+package dev.inmo.tgbotapi.extensions.utils.shortcuts
+
+import dev.inmo.micro_utils.coroutines.plus
+import dev.inmo.tgbotapi.types.message.ChannelEventMessage
+import dev.inmo.tgbotapi.types.message.ChatEvents.*
+import dev.inmo.tgbotapi.types.message.ChatEvents.abstracts.*
+import dev.inmo.tgbotapi.types.message.abstracts.*
+import dev.inmo.tgbotapi.updateshandlers.FlowsUpdatesFilter
+import dev.inmo.tgbotapi.utils.RiskFeature
+import kotlinx.coroutines.flow.*
+
+@RiskFeature("Use with caution")
+inline fun FlowsUpdatesFilter.events(): Flow<ChatEventMessage<*>> {
+    return channelPostFlow.mapNotNull { it.data as? ChatEventMessage<*> } + messageFlow.mapNotNull { it.data as? ChatEventMessage<*> }
+}
+
+@RiskFeature("Use with caution")
+inline fun FlowsUpdatesFilter.channelEvents(): Flow<ChannelEventMessage<*>> = channelPostFlow.mapNotNull {
+    it.data as? ChannelEventMessage<*>
+}
+
+@RiskFeature("Use with caution")
+inline fun FlowsUpdatesFilter.groupEvents(): Flow<GroupEventMessage<*>> = messageFlow.mapNotNull {
+    it.data as? GroupEventMessage<*>
+}
+
+@RiskFeature("Use with caution")
+inline fun FlowsUpdatesFilter.supergroupEvents(): Flow<SupergroupEventMessage<*>> = messageFlow.mapNotNull {
+    it.data as? SupergroupEventMessage<*>
+}
+
+@RiskFeature("Use with caution")
+inline fun <reified T: ChatEvent, reified O: ChatEventMessage<T>> Flow<ChatEventMessage<*>>.filterByChatEvent(): Flow<O> = mapNotNull {
+    if (it.chatEvent is T) it as? O else null
+}
+
+@RiskFeature("Use with caution")
+inline fun <reified T : ChannelEvent> Flow<ChatEventMessage<*>>.filterChannelEvents() = filterByChatEvent<T, ChannelEventMessage<T>>()
+@RiskFeature("Use with caution")
+inline fun <reified T : ChannelEvent> FlowsUpdatesFilter.filterChannelEvents() = channelEvents().filterChannelEvents<T>()
+inline fun Flow<ChatEventMessage<*>>.channelCreatedEvents() = filterChannelEvents<ChannelChatCreated>()
+inline fun FlowsUpdatesFilter.channelCreatedEvents() = filterChannelEvents<ChannelChatCreated>()
+inline fun Flow<ChatEventMessage<*>>.deletedChannelPhotoEvents() = filterChannelEvents<DeleteChatPhoto>()
+inline fun FlowsUpdatesFilter.deletedChannelPhotoEvents() = filterChannelEvents<DeleteChatPhoto>()
+inline fun Flow<ChatEventMessage<*>>.newChannelPhotoEvents() = filterChannelEvents<NewChatPhoto>()
+inline fun FlowsUpdatesFilter.newChannelPhotoEvents() = filterChannelEvents<NewChatPhoto>()
+inline fun Flow<ChatEventMessage<*>>.newChannelTitleEvents() = filterChannelEvents<NewChatTitle>()
+inline fun FlowsUpdatesFilter.newChannelTitleEvents() = filterChannelEvents<NewChatTitle>()
+inline fun Flow<ChatEventMessage<*>>.newChannelPinnedMessageEvents() = filterChannelEvents<PinnedMessage>()
+inline fun FlowsUpdatesFilter.newChannelPinnedMessageEvents() = filterChannelEvents<PinnedMessage>()
+inline fun Flow<ChatEventMessage<*>>.channelEvents() = filterChannelEvents<ChannelEvent>()
+
+@RiskFeature("Use with caution")
+inline fun <reified T : GroupEvent> Flow<ChatEventMessage<*>>.filterGroupEvents() = filterByChatEvent<T, GroupEventMessage<T>>()
+@RiskFeature("Use with caution")
+inline fun <reified T : GroupEvent> FlowsUpdatesFilter.filterGroupEvents() = groupEvents().filterByChatEvent<T, GroupEventMessage<T>>()
+inline fun Flow<ChatEventMessage<*>>.groupCreatedEvents() = filterGroupEvents<GroupChatCreated>()
+inline fun FlowsUpdatesFilter.groupCreatedEvents() = filterGroupEvents<GroupChatCreated>()
+inline fun Flow<ChatEventMessage<*>>.deletedGroupPhotoEvents() = filterGroupEvents<DeleteChatPhoto>()
+inline fun FlowsUpdatesFilter.deletedGroupPhotoEvents() = filterGroupEvents<DeleteChatPhoto>()
+inline fun Flow<ChatEventMessage<*>>.newGroupMembersEvents() = filterGroupEvents<NewChatMembers>()
+inline fun FlowsUpdatesFilter.newGroupMembersEvents() = filterGroupEvents<NewChatMembers>()
+inline fun Flow<ChatEventMessage<*>>.leftGroupMemberEvents() = filterGroupEvents<LeftChatMember>()
+inline fun FlowsUpdatesFilter.leftGroupMemberEvents() = filterGroupEvents<LeftChatMember>()
+inline fun Flow<ChatEventMessage<*>>.newGroupPhotoEvents() = filterGroupEvents<NewChatPhoto>()
+inline fun FlowsUpdatesFilter.newGroupPhotoEvents() = filterGroupEvents<NewChatPhoto>()
+inline fun Flow<ChatEventMessage<*>>.newGroupTitleEvents() = filterGroupEvents<NewChatTitle>()
+inline fun FlowsUpdatesFilter.newGroupTitleEvents() = filterGroupEvents<NewChatTitle>()
+inline fun Flow<ChatEventMessage<*>>.newGroupPinnedMessageEvents() = filterGroupEvents<PinnedMessage>()
+inline fun FlowsUpdatesFilter.newGroupPinnedMessageEvents() = filterGroupEvents<PinnedMessage>()
+inline fun Flow<ChatEventMessage<*>>.proximityAlertTriggeredInGroupEvents() = filterGroupEvents<ProximityAlertTriggered>()
+inline fun FlowsUpdatesFilter.proximityAlertTriggeredInGroupEvents() = filterGroupEvents<ProximityAlertTriggered>()
+inline fun Flow<ChatEventMessage<*>>.groupEvents() = filterGroupEvents<GroupEvent>()
+
+
+@RiskFeature("Use with caution")
+inline fun <reified T : SupergroupEvent> Flow<ChatEventMessage<*>>.filterSupergroupEvents() = filterByChatEvent<T, SupergroupEventMessage<T>>()
+@RiskFeature("Use with caution")
+inline fun <reified T : SupergroupEvent> FlowsUpdatesFilter.filterSupergroupEvents() = supergroupEvents().filterByChatEvent<T, SupergroupEventMessage<T>>()
+inline fun Flow<ChatEventMessage<*>>.supergroupCreatedEvents() = filterSupergroupEvents<SupergroupChatCreated>()
+inline fun FlowsUpdatesFilter.supergroupCreatedEvents() = filterSupergroupEvents<SupergroupChatCreated>()
+inline fun Flow<ChatEventMessage<*>>.deletedSupergroupPhotoEvents() = filterSupergroupEvents<DeleteChatPhoto>()
+inline fun FlowsUpdatesFilter.deletedSupergroupPhotoEvents() = filterSupergroupEvents<DeleteChatPhoto>()
+inline fun Flow<ChatEventMessage<*>>.newSupergroupMembersEvents() = filterSupergroupEvents<NewChatMembers>()
+inline fun FlowsUpdatesFilter.newSupergroupMembersEvents() = filterSupergroupEvents<NewChatMembers>()
+inline fun Flow<ChatEventMessage<*>>.leftSupergroupMemberEvents() = filterSupergroupEvents<LeftChatMember>()
+inline fun FlowsUpdatesFilter.leftSupergroupMemberEvents() = filterSupergroupEvents<LeftChatMember>()
+inline fun Flow<ChatEventMessage<*>>.newSupergroupPhotoEvents() = filterSupergroupEvents<NewChatPhoto>()
+inline fun FlowsUpdatesFilter.newSupergroupPhotoEvents() = filterSupergroupEvents<NewChatPhoto>()
+inline fun Flow<ChatEventMessage<*>>.newSupergroupTitleEvents() = filterSupergroupEvents<NewChatTitle>()
+inline fun FlowsUpdatesFilter.newSupergroupTitleEvents() = filterSupergroupEvents<NewChatTitle>()
+inline fun Flow<ChatEventMessage<*>>.newSupergroupPinnedMessageEvents() = filterSupergroupEvents<PinnedMessage>()
+inline fun FlowsUpdatesFilter.newSupergroupPinnedMessageEvents() = filterSupergroupEvents<PinnedMessage>()
+inline fun Flow<ChatEventMessage<*>>.proximityAlertTriggeredInSupergroupEvents() = filterSupergroupEvents<ProximityAlertTriggered>()
+inline fun FlowsUpdatesFilter.proximityAlertTriggeredInSupergroupEvents() = filterSupergroupEvents<ProximityAlertTriggered>()
+inline fun Flow<ChatEventMessage<*>>.supergroupEvents() = filterSupergroupEvents<SupergroupEvent>()

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

@@ -19,12 +19,15 @@ fun <T : BaseSentMessageUpdate> Flow<T>.asCommonMessagesFlow() = mapNotNull {
     it.data as? CommonMessage<*>
 }
 
+@Suppress("NOTHING_TO_INLINE")
+inline fun <T : BaseSentMessageUpdate> Flow<T>.chatEvents() = mapNotNull {
+    it.data as? ChatEventMessage<*>
+}
 /**
  * Will map incoming [BaseSentMessageUpdate]s to [ChatEventMessage] from [BaseSentMessageUpdate.data]
  */
-fun <T : BaseSentMessageUpdate> Flow<T>.asChatEventsFlow() = mapNotNull {
-    it.data as? ChatEventMessage
-}
+@Deprecated("Renamed", ReplaceWith("chatEvents", "dev.inmo.tgbotapi.extensions.utils.updates.chatEvents"))
+fun <T : BaseSentMessageUpdate> Flow<T>.asChatEventsFlow() = chatEvents()
 
 /**
  * Will map incoming [BaseSentMessageUpdate]s to [UnknownMessageType] from [BaseSentMessageUpdate.data]