Version 7.4

omarmiatello · Jun 11, 2024 · 16a15f5 · 16a15f5
1 parent 43bae5f
commit 16a15f5
Show file tree

Hide file tree

Showing 12 changed files with 4,100 additions and 1,382 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # telegram-api-generator
 Parse https://core.telegram.org/bots/api page and generate a Kotlin class "DocSection" with "DocType" and "DocMethod"
 
-Last update: Telegram Bot API 7.2
+Last update: Telegram Bot API 7.4
 
 Example in:
 

diff --git a/data/telegramapi.html b/data/telegramapi.html
diff --git a/example/TelegramClient.kt b/example/TelegramClient.kt
diff --git a/example/TelegramModels.kt b/example/TelegramModels.kt
diff --git a/example/TelegramModels.rs b/example/TelegramModels.rs
diff --git a/example/TelegramModelsOnly.kt b/example/TelegramModelsOnly.kt
diff --git a/example/telegram.json b/example/telegram.json
diff --git a/example/telegram.md b/example/telegram.md
diff --git a/example/telegram_full.md b/example/telegram_full.md
diff --git a/example/telegram_tiny.md b/example/telegram_tiny.md
diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt
@@ -13,6 +13,22 @@ fun main() = runBlocking {
         HttpClient(CIO).get("https://core.telegram.org/bots/api").bodyAsText()
             .also { File("data/telegramapi.html").writeText(it) }
     ).toSection()
+
+    val docsRequiredFirst = docs.map { doc ->
+        doc.copy(
+            docTypes = doc.docTypes.map { type ->
+                type.copy(
+                    docFields = type.docFields.sortedByDescending { it.required }
+                )
+            },
+            docMethods = doc.docMethods.map { method ->
+                method.copy(
+                    docParameters = method.docParameters.sortedByDescending { it.required }
+                )
+            }
+        )
+    }
+
     val version = "Bot API ([\\d.]+)".toRegex().find(File("data/telegramapi.html").readText())?.value
 
     println("👓 $version - Parse completed")
@@ -31,9 +47,9 @@ fun main() = runBlocking {
     File("example/telegram_tiny.md").writeText(docs.toReadmeTinyExample())
     File("example/telegram_full.md").writeText(docs.toReadmeFullExample())
     File("example/telegram.json").writeText(docs.toJson())
-    File("example/TelegramModelsOnly.kt").writeText(docs.toKotlinModels(useKotlinXSerialization = false))
-    File("example/TelegramModels.kt").writeText(docs.toKotlinModels(useKotlinXSerialization = true))
-    File("example/TelegramClient.kt").writeText(docs.toKotlinMethods())
+    File("example/TelegramModelsOnly.kt").writeText(docsRequiredFirst.toKotlinModels(useKotlinXSerialization = false))
+    File("example/TelegramModels.kt").writeText(docsRequiredFirst.toKotlinModels(useKotlinXSerialization = true))
+    File("example/TelegramClient.kt").writeText(docsRequiredFirst.toKotlinMethods())
     File("example/TelegramModels.rs").writeText(docs.toRustModels())
 
     println("🎉 $version - Examples generated!")

diff --git a/src/main/kotlin/TelegramType.kt b/src/main/kotlin/TelegramType.kt
@@ -95,6 +95,18 @@ sealed class TelegramType(val name: String, val superType: TelegramType? = findS
             deserializer = ""
         )
 
+        object BackgroundFill : Super(
+            name = "BackgroundFill",
+            subclasses = { it.startsWith("BackgroundFill") },
+            deserializer = ""
+        )
+
+        object BackgroundType : Super(
+            name = "BackgroundType",
+            subclasses = { it.startsWith("BackgroundType") },
+            deserializer = ""
+        )
+
         object KeyboardOption : Super(
             name = "KeyboardOption",
             subclasses = { it in listOf("InlineKeyboardMarkup", "ReplyKeyboardMarkup", "ReplyKeyboardRemove", "ForceReply") },
@@ -149,6 +161,8 @@ sealed class TelegramType(val name: String, val superType: TelegramType? = findS
             Super.MessageOrigin,
             Super.ChatBoostSource,
             Super.MenuButton,
+            Super.BackgroundFill,
+            Super.BackgroundType,
             Super.KeyboardOption,
             Super.MaybeInaccessibleMessage,
             WithAlternative.InputFileOrString,
@@ -184,6 +198,8 @@ sealed class TelegramType(val name: String, val superType: TelegramType? = findS
             "PassportElementError" -> Super.PassportElementError
             "ChatMember" -> Super.ChatMember
             "MenuButton" -> Super.MenuButton
+            "BackgroundFill" -> Super.BackgroundFill
+            "BackgroundType" -> Super.BackgroundType
             "BotCommandScope" -> Super.BotCommandScope
             "KeyboardOption" -> Super.KeyboardOption
             "MaybeInaccessibleMessage" -> Super.MaybeInaccessibleMessage