fix of EditChatMessageMedia

24.0.0

.github/FUNDING.yml

@@ -1,3 +1,3 @@
 # These are supported funding model platforms
 
-custom: ['https://www.tinkoff.ru/rm/ovsyannikov.aleksey113/ObMJ712472', 'https://boosty.to/insanusmokrassar']
+custom: ['https://tonscan.org/address/UQAtuSLJ76Zehc3qP-eRYMR98fPIu_oOp_atcpVX55zxHwTU']

CHANGELOG.md

@@ -1,7 +1,30 @@
 # TelegramBotAPI changelog
 
+## 24.0.1
+
+* `Core`:
+  * Now you may upload photos with `EditChatMessageMedia`
+
+## 24.0.0
+
+**THIS UPDATE CONTAINS BREAKING CHANGES IN `subcontextUpdatesFilter` WORK. TAKE CARE IN MIGRATION**
+
+* `Version`:
+  * `MicroUtils`: `0.24.6` -> `0.24.7`
+* `Core`:
+  * `ForumContentMessage` got property `threadCreatingInfo` which represents information about topic where message has been sent
+* `BehaviourBuilder`:
+  * Fix of overall `subcontextUpdatesFilter` behaviour. In fact, this update will fix its affection on scenaries
+
+## 23.2.1
+
+* `Core`:
+  * Fix of `year` field in `Birthdate`
+
 ## 23.2.0
 
+**THIS UPDATE CONTAINS ADDING SUPPORT OF [Telegram Bots API 8.3](https://core.telegram.org/bots/api-changelog#february-12-2025)**
+
 * `Version`:
   * `MicroUtils`: `0.24.5` -> `0.24.6`
   * `Ktor`: `3.0.3` -> `3.1.0`

README.md

@@ -1,4 +1,4 @@
-# TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-8.2-blue)](https://core.telegram.org/bots/api-changelog#january-1-2025)
+# TelegramBotAPI [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/tgbotapi) [![Supported version](https://img.shields.io/badge/Telegram%20Bot%20API-8.3-blue)](https://core.telegram.org/bots/api-changelog#february-12-2025)
 
 |          Docs          |                                   [![KDocs](https://img.shields.io/static/v1?label=Dokka&message=KDocs&color=blue&logo=kotlin)](https://tgbotapi.inmo.dev/index.html) [![Mini tutorial](https://img.shields.io/static/v1?label=Mk&message=Docs&color=blue&logo=mkdocs)](https://docs.inmo.dev/tgbotapi/index.html)                                    |
 |:----------------------:|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|

gradle.properties

@@ -6,4 +6,4 @@ kotlin.incremental=true
 kotlin.incremental.js=true
 
 library_group=dev.inmo
-library_version=23.2.0
+library_version=24.0.1

gradle/libs.versions.toml

@@ -10,10 +10,10 @@ korlibs = "5.4.0"
 uuid = "0.8.4"
 ktor = "3.1.0"
 
-ksp = "2.1.10-1.0.29"
+ksp = "2.1.10-1.0.30"
 kotlin-poet = "1.18.1"
 
-microutils = "0.24.6"
+microutils = "0.24.7"
 kslog = "1.4.1"
 
 versions = "0.51.0"

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

@@ -1,13 +1,20 @@
 package dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling
 
+import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow
+import dev.inmo.micro_utils.coroutines.launchLoggingDropExceptions
 import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
+import dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptions
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
 import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptionsAsync
 import dev.inmo.tgbotapi.extensions.behaviour_builder.*
 import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.expectFlow
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.SimpleFilter
 import dev.inmo.tgbotapi.extensions.behaviour_builder.utils.marker_factories.MarkerFactory
+import dev.inmo.tgbotapi.extensions.utils.flatMap
 import dev.inmo.tgbotapi.types.update.abstracts.Update
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.flatMapLatest
 
 internal suspend fun <BC : BehaviourContext, T> BC.on(
     markerFactory: MarkerFactory<in T, Any>?,
@@ -40,11 +47,21 @@ internal suspend fun <BC : BehaviourContext, T> BC.on(
     }
     val handler: suspend (Pair<Update, T>) -> Unit = subcontextUpdatesFilter ?.let {
         { (update, triggerData) ->
-            createSubContextAndDoSynchronouslyWithUpdatesFilter {
-                if (subcontextUpdatesFilter(this, triggerData, update)) {
-                    localSubcontextInitialAction(update, triggerData)
-                    scenarioReceiver(triggerData)
+            val contextStateFlow = SpecialMutableStateFlow<BC?>(null)
+            createSubContextAndDoSynchronouslyWithUpdatesFilter(
+                updatesUpstreamFlow = contextStateFlow.flatMapLatest { context ->
+                    if (context == null) {
+                        emptyFlow()
+                    } else {
+                        allUpdatesFlow.filter {
+                            context.subcontextUpdatesFilter(triggerData, it)
+                        }
+                    }
                 }
+            ) {
+                contextStateFlow.value = this
+                localSubcontextInitialAction(update, triggerData)
+                scenarioReceiver(triggerData)
             }
         }
     } ?: { (update, triggerData) ->
@@ -57,8 +74,8 @@ internal suspend fun <BC : BehaviourContext, T> BC.on(
             { markerFactory(it.second) },
             block = handler
         )
-    } ?: subscribeSafelyWithoutExceptions(scope) {
-        scope.launchSafelyWithoutExceptions {
+    } ?: subscribeLoggingDropExceptions(scope) {
+        scope.launchLoggingDropExceptions {
             handler(it)
         }
     }

tgbotapi.core/api/tgbotapi.core.api

@@ -432,6 +432,7 @@ public final class dev/inmo/tgbotapi/bot/ktor/base/MultipartRequestCallFactory :
 	public fun <init> ()V
 	public fun <init> (Ldev/inmo/kslog/common/KSLog;)V
 	public synthetic fun <init> (Ldev/inmo/kslog/common/KSLog;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun makeCall (Lio/ktor/client/HttpClient;Ldev/inmo/tgbotapi/utils/TelegramAPIUrlsKeeper;Ldev/inmo/tgbotapi/requests/abstracts/Request;Lkotlinx/serialization/json/Json;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class dev/inmo/tgbotapi/bot/ktor/base/MultipleClientKtorRequestsExecutor : dev/inmo/tgbotapi/bot/BaseRequestsExecutor {
@@ -3895,7 +3896,7 @@ public final class dev/inmo/tgbotapi/requests/edit/location/live/StopInlineMessa
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
-public final class dev/inmo/tgbotapi/requests/edit/media/EditChatMessageMedia : dev/inmo/tgbotapi/requests/edit/abstracts/EditChatMessage, dev/inmo/tgbotapi/requests/edit/abstracts/EditMediaMessage, dev/inmo/tgbotapi/requests/edit/abstracts/EditReplyMessage {
+public final class dev/inmo/tgbotapi/requests/edit/media/EditChatMessageMedia : dev/inmo/tgbotapi/requests/abstracts/MultipartRequest$Common, dev/inmo/tgbotapi/requests/edit/abstracts/EditChatMessage, dev/inmo/tgbotapi/requests/edit/abstracts/EditMediaMessage, dev/inmo/tgbotapi/requests/edit/abstracts/EditReplyMessage {
 	public static final field Companion Ldev/inmo/tgbotapi/requests/edit/media/EditChatMessageMedia$Companion;
 	public synthetic fun <init> (Ldev/inmo/tgbotapi/types/ChatIdentifier;JLdev/inmo/tgbotapi/types/media/TelegramFreeMedia;Ljava/lang/String;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (Ldev/inmo/tgbotapi/types/ChatIdentifier;JLdev/inmo/tgbotapi/types/media/TelegramFreeMedia;Ljava/lang/String;Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -3909,8 +3910,11 @@ public final class dev/inmo/tgbotapi/requests/edit/media/EditChatMessageMedia :
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getBusinessConnectionId-nXr5wdE ()Ljava/lang/String;
 	public fun getChatId ()Ldev/inmo/tgbotapi/types/ChatIdentifier;
+	public fun getData ()Ldev/inmo/tgbotapi/requests/abstracts/SimpleRequest;
 	public fun getMedia ()Ldev/inmo/tgbotapi/types/media/TelegramFreeMedia;
+	public fun getMediaMap ()Ljava/util/Map;
 	public fun getMessageId-APLFQys ()J
+	public fun getParamsJson ()Lkotlinx/serialization/json/JsonObject;
 	public fun getReplyMarkup ()Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup;
 	public synthetic fun getReplyMarkup ()Ldev/inmo/tgbotapi/types/buttons/KeyboardMarkup;
 	public fun getRequestSerializer ()Lkotlinx/serialization/SerializationStrategy;
@@ -8307,17 +8311,18 @@ public abstract interface class dev/inmo/tgbotapi/types/BackgroundType$WithDocum
 
 public final class dev/inmo/tgbotapi/types/Birthdate {
 	public static final field Companion Ldev/inmo/tgbotapi/types/Birthdate$Companion;
-	public fun <init> (III)V
+	public fun <init> (IILjava/lang/Integer;)V
+	public synthetic fun <init> (IILjava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()I
 	public final fun component2 ()I
-	public final fun component3 ()I
-	public final fun copy (III)Ldev/inmo/tgbotapi/types/Birthdate;
-	public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/Birthdate;IIIILjava/lang/Object;)Ldev/inmo/tgbotapi/types/Birthdate;
+	public final fun component3 ()Ljava/lang/Integer;
+	public final fun copy (IILjava/lang/Integer;)Ldev/inmo/tgbotapi/types/Birthdate;
+	public static synthetic fun copy$default (Ldev/inmo/tgbotapi/types/Birthdate;IILjava/lang/Integer;ILjava/lang/Object;)Ldev/inmo/tgbotapi/types/Birthdate;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getDate-1iQqF6g ()I
 	public final fun getDay ()I
 	public final fun getMonth ()I
-	public final fun getYear ()I
+	public final fun getYear ()Ljava/lang/Integer;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
@@ -19164,6 +19169,7 @@ public final class dev/inmo/tgbotapi/types/message/AnonymousForumContentMessageI
 	public fun getSenderBot ()Ldev/inmo/tgbotapi/types/chat/CommonBot;
 	public synthetic fun getSenderChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat;
 	public fun getSenderChat ()Ldev/inmo/tgbotapi/types/chat/PreviewGroupChat;
+	public fun getThreadCreatingInfo ()Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated;
 	public synthetic fun getThreadId-S3HF-10 ()Ldev/inmo/tgbotapi/types/MessageThreadId;
 	public fun getThreadId-hDmiKeI ()J
 	public fun hashCode ()I
@@ -19852,6 +19858,7 @@ public final class dev/inmo/tgbotapi/types/message/CommonForumContentMessageImpl
 	public fun getReplyTo ()Ldev/inmo/tgbotapi/types/message/abstracts/Message;
 	public fun getSenderBoostsCount ()Ljava/lang/Integer;
 	public fun getSenderBot ()Ldev/inmo/tgbotapi/types/chat/CommonBot;
+	public fun getThreadCreatingInfo ()Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated;
 	public synthetic fun getThreadId-S3HF-10 ()Ldev/inmo/tgbotapi/types/MessageThreadId;
 	public fun getThreadId-hDmiKeI ()J
 	public fun getUser ()Ldev/inmo/tgbotapi/types/chat/User;
@@ -20136,6 +20143,7 @@ public final class dev/inmo/tgbotapi/types/message/FromChannelForumContentMessag
 	public fun getSenderBot ()Ldev/inmo/tgbotapi/types/chat/CommonBot;
 	public fun getSenderChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat;
 	public synthetic fun getSenderChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat;
+	public fun getThreadCreatingInfo ()Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated;
 	public synthetic fun getThreadId-S3HF-10 ()Ldev/inmo/tgbotapi/types/MessageThreadId;
 	public fun getThreadId-hDmiKeI ()J
 	public fun hashCode ()I
@@ -20571,6 +20579,7 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/AnonymousForumConte
 	public static fun getMetaInfo-fV8YnZ8 (Ldev/inmo/tgbotapi/types/message/abstracts/AnonymousForumContentMessage;)Lkotlin/Triple;
 	public static fun getReplyTo (Ldev/inmo/tgbotapi/types/message/abstracts/AnonymousForumContentMessage;)Ldev/inmo/tgbotapi/types/message/abstracts/Message;
 	public static fun getSenderChat (Ldev/inmo/tgbotapi/types/message/abstracts/AnonymousForumContentMessage;)Ldev/inmo/tgbotapi/types/chat/PreviewGroupChat;
+	public static fun getThreadCreatingInfo (Ldev/inmo/tgbotapi/types/message/abstracts/AnonymousForumContentMessage;)Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated;
 }
 
 public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/AnonymousGroupContentMessage : dev/inmo/tgbotapi/types/message/abstracts/GroupContentMessage, dev/inmo/tgbotapi/types/message/abstracts/SignedMessage, dev/inmo/tgbotapi/types/message/abstracts/WithSenderChatMessage {
@@ -20635,6 +20644,7 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/CommonForumContentM
 	public static fun getForwardable (Ldev/inmo/tgbotapi/types/message/abstracts/CommonForumContentMessage;)Z
 	public static fun getMetaInfo-fV8YnZ8 (Ldev/inmo/tgbotapi/types/message/abstracts/CommonForumContentMessage;)Lkotlin/Triple;
 	public static fun getReplyTo (Ldev/inmo/tgbotapi/types/message/abstracts/CommonForumContentMessage;)Ldev/inmo/tgbotapi/types/message/abstracts/Message;
+	public static fun getThreadCreatingInfo (Ldev/inmo/tgbotapi/types/message/abstracts/CommonForumContentMessage;)Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated;
 	public static fun getUser (Ldev/inmo/tgbotapi/types/message/abstracts/CommonForumContentMessage;)Ldev/inmo/tgbotapi/types/chat/User;
 }
 
@@ -20687,6 +20697,7 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/ContentMessage$Defa
 
 public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/ForumContentMessage : dev/inmo/tgbotapi/types/message/abstracts/GroupContentMessage, dev/inmo/tgbotapi/types/message/abstracts/PossiblyTopicMessage {
 	public abstract fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewForumChat;
+	public abstract fun getThreadCreatingInfo ()Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated;
 	public abstract fun getThreadId-hDmiKeI ()J
 }
 
@@ -20696,6 +20707,7 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/ForumContentMessage
 	public static fun getForwardable (Ldev/inmo/tgbotapi/types/message/abstracts/ForumContentMessage;)Z
 	public static fun getMetaInfo-fV8YnZ8 (Ldev/inmo/tgbotapi/types/message/abstracts/ForumContentMessage;)Lkotlin/Triple;
 	public static fun getReplyTo (Ldev/inmo/tgbotapi/types/message/abstracts/ForumContentMessage;)Ldev/inmo/tgbotapi/types/message/abstracts/Message;
+	public static fun getThreadCreatingInfo (Ldev/inmo/tgbotapi/types/message/abstracts/ForumContentMessage;)Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated;
 }
 
 public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/FromChannelForumContentMessage : dev/inmo/tgbotapi/types/message/abstracts/ForumContentMessage, dev/inmo/tgbotapi/types/message/abstracts/FromChannelGroupContentMessage {
@@ -20708,6 +20720,7 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/FromChannelForumCon
 	public static fun getMetaInfo-fV8YnZ8 (Ldev/inmo/tgbotapi/types/message/abstracts/FromChannelForumContentMessage;)Lkotlin/Triple;
 	public static fun getReplyTo (Ldev/inmo/tgbotapi/types/message/abstracts/FromChannelForumContentMessage;)Ldev/inmo/tgbotapi/types/message/abstracts/Message;
 	public static fun getSenderChat (Ldev/inmo/tgbotapi/types/message/abstracts/FromChannelForumContentMessage;)Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat;
+	public static fun getThreadCreatingInfo (Ldev/inmo/tgbotapi/types/message/abstracts/FromChannelForumContentMessage;)Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated;
 }
 
 public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/FromChannelGroupContentMessage : dev/inmo/tgbotapi/types/message/abstracts/GroupContentMessage, dev/inmo/tgbotapi/types/message/abstracts/SignedMessage, dev/inmo/tgbotapi/types/message/abstracts/WithSenderChatMessage {
@@ -20929,6 +20942,7 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/PossiblySentViaBotC
 }
 
 public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/PossiblyTopicMessage : dev/inmo/tgbotapi/types/message/abstracts/AccessibleMessage {
+	public abstract fun getThreadCreatingInfo ()Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated;
 	public abstract fun getThreadId-S3HF-10 ()Ldev/inmo/tgbotapi/types/MessageThreadId;
 }
 

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/KtorRequestsExecutorFactories.kt

@@ -12,8 +12,8 @@ import kotlinx.serialization.json.Json
 
 @RiskFeature
 fun createTelegramBotDefaultKtorCallRequestsFactories(logger: KSLog? = null) = listOf(
-    SimpleRequestCallFactory(logger),
     MultipartRequestCallFactory(logger),
+    SimpleRequestCallFactory(logger),
     DownloadFileRequestCallFactory,
     DownloadFileChannelRequestCallFactory
 )

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/bot/ktor/base/MultipartRequestCallFactory.kt

@@ -9,8 +9,23 @@ import io.ktor.client.HttpClient
 import io.ktor.client.request.forms.*
 import io.ktor.http.Headers
 import io.ktor.http.HttpHeaders
+import kotlinx.serialization.json.Json
 
 class MultipartRequestCallFactory(logger: KSLog? = null) : AbstractRequestCallFactory(logger ?: DefaultKTgBotAPIKSLog) {
+    private val localSimpleRequestCallFactory = SimpleRequestCallFactory(logger)
+    override suspend fun <T : Any> makeCall(
+        client: HttpClient,
+        urlsKeeper: TelegramAPIUrlsKeeper,
+        request: Request<T>,
+        jsonFormatter: Json
+    ): T? {
+        return when (request) {
+            !is MultipartRequest -> null
+            is MultipartRequest.Common -> localSimpleRequestCallFactory.makeCall(client, urlsKeeper, request.data, jsonFormatter)
+            else -> super.makeCall(client, urlsKeeper, request, jsonFormatter)
+        }
+    }
+
     override fun <T : Any> prepareCallBody(
         client: HttpClient,
         urlsKeeper: TelegramAPIUrlsKeeper,

tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/requests/edit/media/EditChatMessageMedia.kt

@@ -1,6 +1,8 @@
 package dev.inmo.tgbotapi.requests.edit.media
 
 import dev.inmo.tgbotapi.requests.abstracts.MultipartFile
+import dev.inmo.tgbotapi.requests.abstracts.MultipartRequest
+import dev.inmo.tgbotapi.requests.abstracts.SimpleRequest
 import dev.inmo.tgbotapi.requests.edit.abstracts.*
 import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.business_connection.BusinessConnectionId
@@ -27,14 +29,21 @@ data class EditChatMessageMedia(
     override val businessConnectionId: BusinessConnectionId? = chatId.businessConnectionId,
     @SerialName(replyMarkupField)
     override val replyMarkup: InlineKeyboardMarkup? = null
-) : EditChatMessage<MediaContent>, EditReplyMessage, EditMediaMessage {
-
-    init {
-        if (media.file is MultipartFile) {
-            throw IllegalArgumentException("For editing of media messages you MUST use file id (according to documentation)")
-        }
+) : EditChatMessage<MediaContent>, EditReplyMessage, EditMediaMessage, MultipartRequest.Common<ContentMessage<MediaContent>> {
+    override val data: SimpleRequest<ContentMessage<MediaContent>>
+        get() = this
+    override val mediaMap: Map<String, MultipartFile> by lazy {
+        (media.file as? MultipartFile) ?.let {
+            mapOf(it.fileId to it)
+        } ?: emptyMap()
     }
 
+//    init {
+//        if (media.file is MultipartFile) {
+//            throw IllegalArgumentException("For editing of media messages you MUST use file id (according to documentation)")
+//        }
+//    }
+
     override fun method(): String = editMessageMediaMethod
     override val resultDeserializer: DeserializationStrategy<ContentMessage<MediaContent>>
         get() = MediaContentMessageResultDeserializer

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

@@ -1,6 +1,8 @@
 package dev.inmo.tgbotapi.types
 
 import korlibs.time.Date
+import korlibs.time.DateTime
+import korlibs.time.Year
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -11,9 +13,12 @@ data class Birthdate(
     @SerialName(monthField)
     val month: Int,
     @SerialName(yearField)
-    val year: Int
+    val year: Int? = null
 ) {
+    /**
+     * Represents this birthday as korlibs [Date]. Will use this year in case if [year] has not been retrieved
+     */
     val date: Date by lazy {
-        Date(year, month, day)
+        Date(year ?: DateTime.now().year.year, month, day)
     }
 }

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

@@ -1,7 +1,9 @@
 package dev.inmo.tgbotapi.types.message.abstracts
 
+import dev.inmo.tgbotapi.requests.chat.forum.CreateForumTopic
 import dev.inmo.tgbotapi.types.MessageThreadId
 import dev.inmo.tgbotapi.types.chat.*
+import dev.inmo.tgbotapi.types.message.ChatEvents.forum.ForumTopicCreated
 import dev.inmo.tgbotapi.types.message.content.MessageContent
 
 sealed interface GroupContentMessage<T : MessageContent> : PublicContentMessage<T> {
@@ -15,6 +17,9 @@ sealed interface PotentiallyFromUserGroupContentMessage<T : MessageContent> : Gr
 sealed interface ForumContentMessage<T : MessageContent> : GroupContentMessage<T>, PossiblyTopicMessage {
     override val chat: PreviewForumChat
     override val threadId: MessageThreadId
+
+    override val threadCreatingInfo: ForumTopicCreated?
+        get() = (replyTo as? ChatEventMessage<*>) ?.chatEvent as? ForumTopicCreated
 }
 
 

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

@@ -1,7 +1,10 @@
 package dev.inmo.tgbotapi.types.message.abstracts
 
+import dev.inmo.tgbotapi.requests.chat.forum.CreateForumTopic
 import dev.inmo.tgbotapi.types.MessageThreadId
+import dev.inmo.tgbotapi.types.message.ChatEvents.forum.ForumTopicCreated
 
 interface PossiblyTopicMessage : AccessibleMessage {
     val threadId: MessageThreadId?
+    val threadCreatingInfo: ForumTopicCreated?
 }