small refactoring

2026-09-02 14:19:16 +00:00 · 2026-08-26 16:29:46 +06:00
parent 9fcb267ee2
commit 0cac885dfc
6 changed files with 173 additions and 55 deletions
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChannelAdministrator.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChannelAdministrator.kt
@@ -88,7 +88,7 @@ public suspend fun TelegramBot.promoteChannelAdministrator(
    canEditStories = canEditStories,
    canDeleteStories = canDeleteStories,
    canManageDirectMessages = canManageDirectMessages,
-        canSendWelcomeMessages = canSendWelcomeMessages,
+    canSendWelcomeMessages = canSendWelcomeMessages,
 )

 public suspend fun TelegramBot.promoteChannelAdministrator(
@@ -128,7 +128,7 @@ public suspend fun TelegramBot.promoteChannelAdministrator(
    canEditStories = canEditStories,
    canDeleteStories = canDeleteStories,
    canManageDirectMessages = canManageDirectMessages,
-        canSendWelcomeMessages = canSendWelcomeMessages,
+    canSendWelcomeMessages = canSendWelcomeMessages,
 )

 public suspend fun TelegramBot.promoteChannelAdministrator(
@@ -168,5 +168,5 @@ public suspend fun TelegramBot.promoteChannelAdministrator(
    canEditStories = canEditStories,
    canDeleteStories = canDeleteStories,
    canManageDirectMessages = canManageDirectMessages,
-        canSendWelcomeMessages = canSendWelcomeMessages,
+    canSendWelcomeMessages = canSendWelcomeMessages,
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatAdministrator.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatAdministrator.kt
@@ -68,7 +68,7 @@ public suspend fun TelegramBot.promoteChatAdministrator(
    canManageVideoChats = canManageVideoChats,
    canManageChat = canManageChat,
    canManageTags = canManageTags,
-        canSendWelcomeMessages = canSendWelcomeMessages,
+    canSendWelcomeMessages = canSendWelcomeMessages,
 )

 public suspend fun TelegramBot.promoteChatAdministrator(
@@ -98,7 +98,7 @@ public suspend fun TelegramBot.promoteChatAdministrator(
    canManageVideoChats = canManageVideoChats,
    canManageChat = canManageChat,
    canManageTags = canManageTags,
-        canSendWelcomeMessages = canSendWelcomeMessages,
+    canSendWelcomeMessages = canSendWelcomeMessages,
 )

 public suspend fun TelegramBot.promoteChatAdministrator(
@@ -128,5 +128,5 @@ public suspend fun TelegramBot.promoteChatAdministrator(
    canManageVideoChats = canManageVideoChats,
    canManageChat = canManageChat,
    canManageTags = canManageTags,
-        canSendWelcomeMessages = canSendWelcomeMessages,
+    canSendWelcomeMessages = canSendWelcomeMessages,
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatMember.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteChatMember.kt
@@ -100,7 +100,7 @@ public suspend fun TelegramBot.promoteChatMember(
    canDeleteStories = canDeleteStories,
    canManageDirectMessages = canManageDirectMessages,
    canManageTags = canManageTags,
-        canSendWelcomeMessages = canSendWelcomeMessages,
+    canSendWelcomeMessages = canSendWelcomeMessages,
 )

@Warning("This method is too common. Use it with caution")
@@ -147,7 +147,7 @@ public suspend fun TelegramBot.promoteChatMember(
    canDeleteStories = canDeleteStories,
    canManageDirectMessages = canManageDirectMessages,
    canManageTags = canManageTags,
-        canSendWelcomeMessages = canSendWelcomeMessages,
+    canSendWelcomeMessages = canSendWelcomeMessages,
 )

@Warning("This method is too common. Use it with caution")
@@ -194,5 +194,5 @@ public suspend fun TelegramBot.promoteChatMember(
    canDeleteStories = canDeleteStories,
    canManageDirectMessages = canManageDirectMessages,
    canManageTags = canManageTags,
-        canSendWelcomeMessages = canSendWelcomeMessages,
+    canSendWelcomeMessages = canSendWelcomeMessages,
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteSupergroupAdministrator.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/chat/members/PromoteSupergroupAdministrator.kt
@@ -73,7 +73,7 @@ public suspend fun TelegramBot.promoteSupergroupAdministrator(
    canManageVideoChats = canManageVideoChats,
    canManageChat = canManageChat,
    canManageTopics = canManageTopics,
-        canSendWelcomeMessages = canSendWelcomeMessages
+    canSendWelcomeMessages = canSendWelcomeMessages
 )

 public suspend fun TelegramBot.promoteSupergroupAdministrator(
@@ -105,7 +105,7 @@ public suspend fun TelegramBot.promoteSupergroupAdministrator(
    canManageVideoChats = canManageVideoChats,
    canManageChat = canManageChat,
    canManageTopics = canManageTopics,
-        canSendWelcomeMessages = canSendWelcomeMessages
+    canSendWelcomeMessages = canSendWelcomeMessages
 )

 public suspend fun TelegramBot.promoteSupergroupAdministrator(
@@ -137,5 +137,5 @@ public suspend fun TelegramBot.promoteSupergroupAdministrator(
    canManageVideoChats = canManageVideoChats,
    canManageChat = canManageChat,
    canManageTopics = canManageTopics,
-        canSendWelcomeMessages = canSendWelcomeMessages
+    canSendWelcomeMessages = canSendWelcomeMessages
 )
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditEphemeralMessageCaption.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/caption/EditEphemeralMessageCaption.kt
@@ -21,7 +21,15 @@ public suspend fun TelegramBot.editEphemeralMessageCaption(
    showCaptionAboveMedia: Boolean? = null,
    replyMarkup: InlineKeyboardMarkup? = null
 ): Unit = execute(
-    EditEphemeralMessageCaption(chatId, receiverUserId, ephemeralMessageId, caption, parseMode, showCaptionAboveMedia, replyMarkup)
+    EditEphemeralMessageCaption(
+        chatId = chatId,
+        receiverUserId = receiverUserId,
+        ephemeralMessageId = ephemeralMessageId,
+        caption = caption,
+        parseMode = parseMode,
+        showCaptionAboveMedia = showCaptionAboveMedia,
+        replyMarkup = replyMarkup
+    )
 )

 /**
@@ -38,13 +46,13 @@ public suspend fun TelegramBot.editEphemeralMessageCaption(
    showCaptionAboveMedia: Boolean? = null,
    replyMarkup: InlineKeyboardMarkup? = null
 ): Unit = editEphemeralMessageCaption(
-    chatId,
-    chatId.receiverUser,
-    requireNotNull(chatId.ephemeralMessageId) { "chatId ($chatId) does not carry an ephemeralMessageId" },
-    caption,
-    parseMode,
-    showCaptionAboveMedia,
-    replyMarkup
+    chatId = chatId,
+    receiverUserId = chatId.receiverUser,
+    ephemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "chatId ($chatId) does not carry an ephemeralMessageId" },
+    caption = caption,
+    parseMode = parseMode,
+    showCaptionAboveMedia = showCaptionAboveMedia,
+    replyMarkup = replyMarkup
 )

 /**
@@ -59,7 +67,15 @@ public suspend fun TelegramBot.editEphemeralMessageCaption(
    parseMode: ParseMode? = null,
    showCaptionAboveMedia: Boolean? = null,
    replyMarkup: InlineKeyboardMarkup? = null
-): Unit = editEphemeralMessageCaption(chat.id, receiverUserId, ephemeralMessageId, caption, parseMode, showCaptionAboveMedia, replyMarkup)
+): Unit = editEphemeralMessageCaption(
+    chatId = chat.id,
+    receiverUserId = receiverUserId,
+    ephemeralMessageId = ephemeralMessageId,
+    caption = caption,
+    parseMode = parseMode,
+    showCaptionAboveMedia = showCaptionAboveMedia,
+    replyMarkup = replyMarkup
+)

 /**
 * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -73,7 +89,14 @@ public suspend fun TelegramBot.editEphemeralMessageCaption(
    showCaptionAboveMedia: Boolean? = null,
    replyMarkup: InlineKeyboardMarkup? = null
 ): Unit = execute(
-    EditEphemeralMessageCaption(chatId, receiverUserId, ephemeralMessageId, entities, showCaptionAboveMedia, replyMarkup)
+    EditEphemeralMessageCaption(
+        chatId = chatId,
+        receiverUserId = receiverUserId,
+        ephemeralMessageId = ephemeralMessageId,
+        entities = entities,
+        showCaptionAboveMedia = showCaptionAboveMedia,
+        replyMarkup = replyMarkup
+    )
 )

 /**
@@ -89,12 +112,12 @@ public suspend fun TelegramBot.editEphemeralMessageCaption(
    showCaptionAboveMedia: Boolean? = null,
    replyMarkup: InlineKeyboardMarkup? = null
 ): Unit = editEphemeralMessageCaption(
-    chatId,
-    chatId.receiverUser,
-    requireNotNull(chatId.ephemeralMessageId) { "chatId ($chatId) does not carry an ephemeralMessageId" },
-    entities,
-    showCaptionAboveMedia,
-    replyMarkup
+    chatId = chatId,
+    receiverUserId = chatId.receiverUser,
+    ephemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "chatId ($chatId) does not carry an ephemeralMessageId" },
+    entities = entities,
+    showCaptionAboveMedia = showCaptionAboveMedia,
+    replyMarkup = replyMarkup
 )

 /**
@@ -108,4 +131,11 @@ public suspend fun TelegramBot.editEphemeralMessageCaption(
    entities: TextSourcesList,
    showCaptionAboveMedia: Boolean? = null,
    replyMarkup: InlineKeyboardMarkup? = null
-): Unit = editEphemeralMessageCaption(chat.id, receiverUserId, ephemeralMessageId, entities, showCaptionAboveMedia, replyMarkup)
+): Unit = editEphemeralMessageCaption(
+    chatId = chat.id,
+    receiverUserId = receiverUserId,
+    ephemeralMessageId = ephemeralMessageId,
+    entities = entities,
+    showCaptionAboveMedia = showCaptionAboveMedia,
+    replyMarkup = replyMarkup
+)
--- a/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditEphemeralMessageText.kt
+++ b/tgbotapi.api/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/api/edit/text/EditEphemeralMessageText.kt
@@ -20,14 +20,28 @@ public suspend fun TelegramBot.editEphemeralMessageRichText(
    ephemeralMessageId: EphemeralMessageId,
    richMessage: InputRichMessage,
    replyMarkup: InlineKeyboardMarkup? = null
-): Unit = execute(EditEphemeralMessageRichText(chatId, receiverUserId, ephemeralMessageId, richMessage, replyMarkup))
+): Unit = execute(
+    request = EditEphemeralMessageRichText(
+        chatId = chatId,
+        receiverUserId = receiverUserId,
+        ephemeralMessageId = ephemeralMessageId,
+        richMessage = richMessage,
+        replyMarkup = replyMarkup
+    )
+)

 /** Edit an ephemeral message with a rich message, obtaining recipient and message identifiers from [chatId]. */
 public suspend fun TelegramBot.editEphemeralMessageRichText(
    chatId: EphemeralChatId,
    richMessage: InputRichMessage,
    replyMarkup: InlineKeyboardMarkup? = null
-): Unit = execute(EditEphemeralMessageRichText(chatId, richMessage, replyMarkup))
+): Unit = execute(
+    request = EditEphemeralMessageRichText(
+        chatId = chatId,
+        richMessage = richMessage,
+        replyMarkup = replyMarkup
+    )
+)

 /** Edit an ephemeral message with a rich message. */
 public suspend fun TelegramBot.editEphemeralMessageRichText(
@@ -36,7 +50,13 @@ public suspend fun TelegramBot.editEphemeralMessageRichText(
    ephemeralMessageId: EphemeralMessageId,
    richMessage: InputRichMessage,
    replyMarkup: InlineKeyboardMarkup? = null
-): Unit = editEphemeralMessageRichText(chat.id, receiverUserId, ephemeralMessageId, richMessage, replyMarkup)
+): Unit = editEphemeralMessageRichText(
+    chatId = chat.id,
+    receiverUserId = receiverUserId,
+    ephemeralMessageId = ephemeralMessageId,
+    richMessage = richMessage,
+    replyMarkup = replyMarkup
+)

 /**
 * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -51,7 +71,15 @@ public suspend fun TelegramBot.editEphemeralMessageText(
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null
 ): Unit = execute(
-    EditEphemeralMessageText(chatId, receiverUserId, ephemeralMessageId, text, parseMode, linkPreviewOptions, replyMarkup)
+    EditEphemeralMessageText(
+        chatId = chatId,
+        receiverUserId = receiverUserId,
+        ephemeralMessageId = ephemeralMessageId,
+        text = text,
+        parseMode = parseMode,
+        linkPreviewOptions = linkPreviewOptions,
+        replyMarkup = replyMarkup
+    )
 )

 /**
@@ -68,13 +96,13 @@ public suspend fun TelegramBot.editEphemeralMessageText(
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null
 ): Unit = editEphemeralMessageText(
-    chatId,
-    chatId.receiverUser,
-    requireNotNull(chatId.ephemeralMessageId) { "chatId ($chatId) does not carry an ephemeralMessageId" },
-    text,
-    parseMode,
-    linkPreviewOptions,
-    replyMarkup
+    chatId = chatId,
+    receiverUserId = chatId.receiverUser,
+    ephemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "chatId ($chatId) does not carry an ephemeralMessageId" },
+    text = text,
+    parseMode = parseMode,
+    linkPreviewOptions = linkPreviewOptions,
+    replyMarkup = replyMarkup
 )

 /**
@@ -89,7 +117,15 @@ public suspend fun TelegramBot.editEphemeralMessageText(
    parseMode: ParseMode? = null,
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null
-): Unit = editEphemeralMessageText(chat.id, receiverUserId, ephemeralMessageId, text, parseMode, linkPreviewOptions, replyMarkup)
+): Unit = editEphemeralMessageText(
+    chatId = chat.id,
+    receiverUserId = receiverUserId,
+    ephemeralMessageId = ephemeralMessageId,
+    text = text,
+    parseMode = parseMode,
+    linkPreviewOptions = linkPreviewOptions,
+    replyMarkup = replyMarkup
+)

 /**
 * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -103,7 +139,14 @@ public suspend fun TelegramBot.editEphemeralMessageText(
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null
 ): Unit = execute(
-    EditEphemeralMessageText(chatId, receiverUserId, ephemeralMessageId, entities, linkPreviewOptions, replyMarkup)
+    EditEphemeralMessageText(
+        chatId = chatId,
+        receiverUserId = receiverUserId,
+        ephemeralMessageId = ephemeralMessageId,
+        entities = entities,
+        linkPreviewOptions = linkPreviewOptions,
+        replyMarkup = replyMarkup
+    )
 )

 /**
@@ -119,12 +162,12 @@ public suspend fun TelegramBot.editEphemeralMessageText(
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null
 ): Unit = editEphemeralMessageText(
-    chatId,
-    chatId.receiverUser,
-    requireNotNull(chatId.ephemeralMessageId) { "chatId ($chatId) does not carry an ephemeralMessageId" },
-    entities,
-    linkPreviewOptions,
-    replyMarkup
+    chatId = chatId,
+    receiverUserId = chatId.receiverUser,
+    ephemeralMessageId = requireNotNull(chatId.ephemeralMessageId) { "chatId ($chatId) does not carry an ephemeralMessageId" },
+    entities = entities,
+    linkPreviewOptions = linkPreviewOptions,
+    replyMarkup = replyMarkup
 )

 /**
@@ -138,7 +181,14 @@ public suspend fun TelegramBot.editEphemeralMessageText(
    entities: TextSourcesList,
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null
-): Unit = editEphemeralMessageText(chat.id, receiverUserId, ephemeralMessageId, entities, linkPreviewOptions, replyMarkup)
+): Unit = editEphemeralMessageText(
+    chatId = chat.id,
+    receiverUserId = receiverUserId,
+    ephemeralMessageId = ephemeralMessageId,
+    entities = entities,
+    linkPreviewOptions = linkPreviewOptions,
+    replyMarkup = replyMarkup
+)

 /**
 * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -152,7 +202,14 @@ public suspend fun TelegramBot.editEphemeralMessageText(
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null,
    builderBody: EntitiesBuilderBody
-): Unit = editEphemeralMessageText(chatId, receiverUserId, ephemeralMessageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+): Unit = editEphemeralMessageText(
+    chatId = chatId,
+    receiverUserId = receiverUserId,
+    ephemeralMessageId = ephemeralMessageId,
+    entities = buildEntities(separator, builderBody),
+    linkPreviewOptions = linkPreviewOptions,
+    replyMarkup = replyMarkup
+)

 /**
 * Convenience overload sourcing `receiverUserId`/`ephemeralMessageId` from [chatId]. Throws
@@ -167,7 +224,12 @@ public suspend fun TelegramBot.editEphemeralMessageText(
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null,
    builderBody: EntitiesBuilderBody
-): Unit = editEphemeralMessageText(chatId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+): Unit = editEphemeralMessageText(
+    chatId = chatId,
+    entities = buildEntities(separator, builderBody),
+    linkPreviewOptions = linkPreviewOptions,
+    replyMarkup = replyMarkup
+)

 /**
 * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -181,7 +243,14 @@ public suspend fun TelegramBot.editEphemeralMessageText(
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null,
    builderBody: EntitiesBuilderBody
-): Unit = editEphemeralMessageText(chatId, receiverUserId, ephemeralMessageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+): Unit = editEphemeralMessageText(
+    chatId = chatId,
+    receiverUserId = receiverUserId,
+    ephemeralMessageId = ephemeralMessageId,
+    entities = buildEntities(separator, builderBody),
+    linkPreviewOptions = linkPreviewOptions,
+    replyMarkup = replyMarkup
+)

 /**
 * Convenience overload sourcing `receiverUserId`/`ephemeralMessageId` from [chatId]. Throws
@@ -196,7 +265,12 @@ public suspend fun TelegramBot.editEphemeralMessageText(
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null,
    builderBody: EntitiesBuilderBody
-): Unit = editEphemeralMessageText(chatId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+): Unit = editEphemeralMessageText(
+    chatId = chatId,
+    entities = buildEntities(separator, builderBody),
+    linkPreviewOptions = linkPreviewOptions,
+    replyMarkup = replyMarkup
+)

 /**
 * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -210,7 +284,14 @@ public suspend fun TelegramBot.editEphemeralMessageText(
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null,
    builderBody: EntitiesBuilderBody
-): Unit = editEphemeralMessageText(chat.id, receiverUserId, ephemeralMessageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+): Unit = editEphemeralMessageText(
+    chatId = chat.id,
+    receiverUserId = receiverUserId,
+    ephemeralMessageId = ephemeralMessageId,
+    entities = buildEntities(separator, builderBody),
+    linkPreviewOptions = linkPreviewOptions,
+    replyMarkup = replyMarkup
+)

 /**
 * @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
@@ -224,4 +305,11 @@ public suspend fun TelegramBot.editEphemeralMessageText(
    linkPreviewOptions: LinkPreviewOptions? = null,
    replyMarkup: InlineKeyboardMarkup? = null,
    builderBody: EntitiesBuilderBody
-): Unit = editEphemeralMessageText(chat.id, receiverUserId, ephemeralMessageId, buildEntities(separator, builderBody), linkPreviewOptions, replyMarkup)
+): Unit = editEphemeralMessageText(
+    chatId = chat.id,
+    receiverUserId = receiverUserId,
+    ephemeralMessageId = ephemeralMessageId,
+    entities = buildEntities(separator, builderBody),
+    linkPreviewOptions = linkPreviewOptions,
+    replyMarkup = replyMarkup
+)