Merge branch 'revive-2026-07'

Author: gagarski

gradle.properties

@@ -1,4 +1,4 @@
-version=1.0.0-SNAPSHOT
+version=1.0.1-SNAPSHOT
 org.gradle.jvmargs=-Xmx1024M
 kapt.use.k2=true
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

vertigram-core/src/main/kotlin/ski/gagar/vertigram/Vertigram.kt

@@ -218,14 +218,17 @@ class Vertigram(
             return raw.consumer(vertigramAddress(address).address) { msg: Message<JsonObject> ->
                 coroScope.launch(MDCContext(coroScope.coroMdcWith(CONSUMER_ADDRESS_MDC to vertigramAddress(address).address))) {
                     val reqW: Request<RequestPayload> = msg.body()!!.mapTo(reqWrapperType, objectMapper)
-
                     try {
                         msg.replyWithSuccess(function(reqW.payload), this@Vertigram, replyOptions)
                     } catch (t: Throwable) {
                         msg.replyWithThrowable<RequestPayload>(t, this@Vertigram, replyOptions)
                         when (t) {
                             is VertigramInternalException -> throw t
-                            is VertigramException -> {}
+                            is VertigramException -> {
+                                if (null == msg.replyAddress()) {
+                                    throw t
+                                }
+                            }
                             else -> throw t
                         }
                     }
@@ -257,14 +260,17 @@ class Vertigram(
             return raw.localConsumer(vertigramAddress(address).address) { msg: Message<JsonObject> ->
                 coroScope.launch(MDCContext(coroScope.coroMdcWith(CONSUMER_ADDRESS_MDC to vertigramAddress(address).address))) {
                     val reqW: Request<RequestPayload> = msg.body()!!.mapTo(reqWrapperType, objectMapper)
-
                     try {
                         msg.replyWithSuccess(function(reqW.payload), this@Vertigram, replyOptions)
                     } catch (t: Throwable) {
                         msg.replyWithThrowable<RequestPayload>(t, this@Vertigram, replyOptions)
                         when (t) {
                             is VertigramInternalException -> throw t
-                            is VertigramException -> {}
+                            is VertigramException -> {
+                                if (null == msg.replyAddress()) {
+                                    throw t
+                                }
+                            }
                             else -> throw t
                         }
                     }

vertigram-telegram-client/src/main/kotlin/ski/gagar/vertigram/telegram/types/richmessage/RichMessage.kt

@@ -313,7 +313,7 @@ data class ListItem internal constructor(
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", include = JsonTypeInfo.As.EXISTING_PROPERTY)
 @JsonSubTypes(
     JsonSubTypes.Type(value = Block.Paragraph::class, name = Block.Type.PARAGRAPH_STR),
-    JsonSubTypes.Type(value = Block.SectionHeading::class, name = Block.Type.SECTION_HEADING_STR),
+    JsonSubTypes.Type(value = Block.SectionHeading::class, name = Block.Type.HEADING_STR),
     JsonSubTypes.Type(value = Block.Preformatted::class, name = Block.Type.PRE_STR),
     JsonSubTypes.Type(value = Block.Footer::class, name = Block.Type.FOOTER_STR),
     JsonSubTypes.Type(value = Block.Divider::class, name = Block.Type.DIVIDER_STR),
@@ -340,8 +340,8 @@ sealed interface Block {
     @TelegramCodegen.Type
     data class Paragraph internal constructor(val text: RichTextValue) : Block { override val type = Type.PARAGRAPH; companion object }
     @TelegramCodegen.Type
-    data class SectionHeading internal constructor(val text: RichTextValue, val level: Int) : Block {
-        override val type = Type.SECTION_HEADING
+    data class SectionHeading internal constructor(val text: RichTextValue, val size: Int) : Block {
+        override val type = Type.HEADING
         companion object
     }
     @TelegramCodegen.Type
@@ -444,7 +444,7 @@ sealed interface Block {
 
     enum class Type {
         @JsonProperty(PARAGRAPH_STR) PARAGRAPH,
-        @JsonProperty(SECTION_HEADING_STR) SECTION_HEADING,
+        @JsonProperty(HEADING_STR) HEADING,
         @JsonProperty(PRE_STR) PRE,
         @JsonProperty(FOOTER_STR) FOOTER,
         @JsonProperty(DIVIDER_STR) DIVIDER,
@@ -467,7 +467,7 @@ sealed interface Block {
 
         companion object {
             const val PARAGRAPH_STR = "paragraph"
-            const val SECTION_HEADING_STR = "section_heading"
+            const val HEADING_STR = "heading"
             const val PRE_STR = "pre"
             const val FOOTER_STR = "footer"
             const val DIVIDER_STR = "divider"

vertigram-telegram-client/src/test/kotlin/ski/gagar/vertigram/telegram/types/richmessage/RichMessageSerializationTest.kt

@@ -71,7 +71,7 @@ object RichMessageSerializationTest : BaseSerializationTest() {
         val photo = PhotoSize(fileId = "photo", fileUniqueId = "unique-photo", width = 1, height = 1)
 
         assertSerializable<Block>(paragraph)
-        assertSerializable<Block>(Block.SectionHeading(text = RichTextValue.plain("heading"), level = 2))
+        assertSerializable<Block>(Block.SectionHeading(text = RichTextValue.plain("heading"), size = 2))
         assertSerializable<Block>(Block.Preformatted(text = text, language = "kotlin"))
         assertSerializable<Block>(Block.Footer(text = text))
         assertSerializable<Block>(Block.Divider)