mirror of
https://github.com/InsanusMokrassar/TelegramBotAPI.git
synced 2026-10-26 06:27:00 +00:00
Add Bot API 10.3 General support
This commit is contained in:
1 parent
f86bb6662e
commit
93a4bf1da0
30 files changed
+684
-111
No files matched your search
+53
-13
@@ -26,14 +26,18 @@ public suspend fun TelegramBot.sendMessageDraft(
|
||||
draftId: DraftId,
|
||||
text: String,
|
||||
parseMode: ParseMode? = null,
|
||||
threadId: MessageThreadId? = chatId.threadId
|
||||
threadId: MessageThreadId? = chatId.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null
|
||||
): Unit = execute(
|
||||
SendMessageDraft(
|
||||
chatId = chatId,
|
||||
draftId = draftId,
|
||||
text = text,
|
||||
parseMode = parseMode,
|
||||
threadId = threadId
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop
|
||||
)
|
||||
)
|
||||
|
||||
@@ -62,11 +66,13 @@ public suspend fun TelegramBot.sendMessageDraftFlow(
|
||||
messagesFlow: Flow<TextSourcesList>,
|
||||
threadId: MessageThreadId? = chatId.threadId,
|
||||
draftId: DraftId? = null,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null
|
||||
): Boolean {
|
||||
val draftId = draftId ?: GlobalDraftIdAllocator.allocate()
|
||||
return sendMessageDraftFlow(
|
||||
messagesFlow.map {
|
||||
SendMessageDraft(chatId = chatId, draftId = draftId, entities = it, threadId = threadId)
|
||||
SendMessageDraft(chatId = chatId, draftId = draftId, entities = it, threadId = threadId, canStop = canStop, keepOnStop = keepOnStop)
|
||||
}
|
||||
)
|
||||
}
|
||||
@@ -76,11 +82,13 @@ public suspend fun TelegramBot.sendMessageDraftFlowWithTextsAndParseMode(
|
||||
messagesFlow: Flow<Pair<String, ParseMode?>>,
|
||||
threadId: MessageThreadId? = chatId.threadId,
|
||||
draftId: DraftId? = null,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null
|
||||
): Boolean {
|
||||
val draftId = draftId ?: GlobalDraftIdAllocator.allocate()
|
||||
return sendMessageDraftFlow(
|
||||
messagesFlow.map {
|
||||
SendMessageDraft(chatId = chatId, draftId = draftId, text = it.first, parseMode = it.second, threadId = threadId)
|
||||
SendMessageDraft(chatId = chatId, draftId = draftId, text = it.first, parseMode = it.second, threadId = threadId, canStop = canStop, keepOnStop = keepOnStop)
|
||||
}
|
||||
)
|
||||
}
|
||||
@@ -90,6 +98,8 @@ public suspend fun TelegramBot.sendMessageDraftFlowWithTexts(
|
||||
messagesFlow: Flow<String>,
|
||||
threadId: MessageThreadId? = chatId.threadId,
|
||||
draftId: DraftId? = null,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null
|
||||
): Boolean {
|
||||
val draftId = draftId ?: GlobalDraftIdAllocator.allocate()
|
||||
return sendMessageDraftFlowWithTextsAndParseMode(
|
||||
@@ -98,7 +108,9 @@ public suspend fun TelegramBot.sendMessageDraftFlowWithTexts(
|
||||
it.escapeMarkdownV2Common() to MarkdownV2
|
||||
},
|
||||
threadId = threadId,
|
||||
draftId = draftId
|
||||
draftId = draftId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop
|
||||
)
|
||||
}
|
||||
|
||||
@@ -107,26 +119,34 @@ public suspend fun TelegramBot.sendMessageDraft(
|
||||
draftId: DraftId,
|
||||
text: String,
|
||||
parseMode: ParseMode? = null,
|
||||
threadId: MessageThreadId? = chat.id.threadId
|
||||
threadId: MessageThreadId? = chat.id.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null
|
||||
): Unit = sendMessageDraft(
|
||||
chatId = chat.id,
|
||||
draftId = draftId,
|
||||
text = text,
|
||||
parseMode = parseMode,
|
||||
threadId = threadId
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop
|
||||
)
|
||||
|
||||
public suspend fun TelegramBot.sendMessageDraft(
|
||||
chatId: IdChatIdentifier,
|
||||
draftId: DraftId,
|
||||
entities: TextSourcesList,
|
||||
threadId: MessageThreadId? = chatId.threadId
|
||||
threadId: MessageThreadId? = chatId.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null
|
||||
): Unit = execute(
|
||||
SendMessageDraft(
|
||||
chatId = chatId,
|
||||
draftId = draftId,
|
||||
entities = entities,
|
||||
threadId = threadId
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop
|
||||
)
|
||||
)
|
||||
|
||||
@@ -134,12 +154,16 @@ public suspend fun TelegramBot.sendMessageDraft(
|
||||
chat: Chat,
|
||||
draftId: DraftId,
|
||||
entities: TextSourcesList,
|
||||
threadId: MessageThreadId? = chat.id.threadId
|
||||
threadId: MessageThreadId? = chat.id.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null
|
||||
): Unit = sendMessageDraft(
|
||||
chatId = chat.id,
|
||||
draftId = draftId,
|
||||
entities = entities,
|
||||
threadId = threadId
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop
|
||||
)
|
||||
|
||||
public suspend fun TelegramBot.sendMessageDraft(
|
||||
@@ -147,12 +171,16 @@ public suspend fun TelegramBot.sendMessageDraft(
|
||||
draftId: DraftId,
|
||||
separator: TextSource? = null,
|
||||
threadId: MessageThreadId? = chatId.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null,
|
||||
builderBody: EntitiesBuilderBody
|
||||
): Unit = sendMessageDraft(
|
||||
chatId = chatId,
|
||||
draftId = draftId,
|
||||
entities = buildEntities(separator, builderBody),
|
||||
threadId = threadId
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop
|
||||
)
|
||||
|
||||
public suspend fun TelegramBot.sendMessageDraft(
|
||||
@@ -160,12 +188,16 @@ public suspend fun TelegramBot.sendMessageDraft(
|
||||
draftId: DraftId,
|
||||
separator: String,
|
||||
threadId: MessageThreadId? = chatId.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null,
|
||||
builderBody: EntitiesBuilderBody
|
||||
): Unit = sendMessageDraft(
|
||||
chatId = chatId,
|
||||
draftId = draftId,
|
||||
entities = buildEntities(separator, builderBody),
|
||||
threadId = threadId
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop
|
||||
)
|
||||
|
||||
public suspend fun TelegramBot.sendMessageDraft(
|
||||
@@ -173,12 +205,16 @@ public suspend fun TelegramBot.sendMessageDraft(
|
||||
draftId: DraftId,
|
||||
separator: TextSource? = null,
|
||||
threadId: MessageThreadId? = chat.id.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null,
|
||||
builderBody: EntitiesBuilderBody
|
||||
): Unit = sendMessageDraft(
|
||||
chatId = chat.id,
|
||||
draftId = draftId,
|
||||
separator = separator,
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop,
|
||||
builderBody = builderBody
|
||||
)
|
||||
|
||||
@@ -187,11 +223,15 @@ public suspend fun TelegramBot.sendMessageDraft(
|
||||
draftId: DraftId,
|
||||
separator: String,
|
||||
threadId: MessageThreadId? = chat.id.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null,
|
||||
builderBody: EntitiesBuilderBody
|
||||
): Unit = sendMessageDraft(
|
||||
chatId = chat.id,
|
||||
draftId = draftId,
|
||||
separator = separator,
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop,
|
||||
builderBody = builderBody
|
||||
)
|
||||
+6
-2
@@ -10,12 +10,16 @@ public suspend fun TelegramBot.sendRichMessageDraft(
|
||||
chatId: ChatId,
|
||||
draftId: Long,
|
||||
richMessage: InputRichMessage,
|
||||
threadId: MessageThreadId? = chatId.threadId
|
||||
threadId: MessageThreadId? = chatId.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null
|
||||
): Unit = execute(
|
||||
SendRichMessageDraft(
|
||||
chatId = chatId,
|
||||
draftId = draftId,
|
||||
richMessage = richMessage,
|
||||
threadId = threadId
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop
|
||||
)
|
||||
)
|
||||
@@ -1462,13 +1462,17 @@ public suspend fun TelegramBot.send(
|
||||
draftId: DraftId,
|
||||
text: String,
|
||||
parseMode: ParseMode? = null,
|
||||
threadId: MessageThreadId? = chatId.threadId
|
||||
threadId: MessageThreadId? = chatId.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null
|
||||
): Unit = sendMessageDraft(
|
||||
chatId = chatId,
|
||||
draftId = draftId,
|
||||
text = text,
|
||||
parseMode = parseMode,
|
||||
threadId = threadId
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop
|
||||
)
|
||||
|
||||
/**
|
||||
@@ -1479,13 +1483,17 @@ public suspend fun TelegramBot.send(
|
||||
draftId: DraftId,
|
||||
text: String,
|
||||
parseMode: ParseMode? = null,
|
||||
threadId: MessageThreadId? = chat.id.threadId
|
||||
threadId: MessageThreadId? = chat.id.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null
|
||||
): Unit = sendMessageDraft(
|
||||
chat = chat,
|
||||
draftId = draftId,
|
||||
text = text,
|
||||
parseMode = parseMode,
|
||||
threadId = threadId
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop
|
||||
)
|
||||
|
||||
/**
|
||||
@@ -1495,12 +1503,16 @@ public suspend fun TelegramBot.send(
|
||||
chatId: IdChatIdentifier,
|
||||
draftId: DraftId,
|
||||
entities: TextSourcesList,
|
||||
threadId: MessageThreadId? = chatId.threadId
|
||||
threadId: MessageThreadId? = chatId.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null
|
||||
): Unit = sendMessageDraft(
|
||||
chatId = chatId,
|
||||
draftId = draftId,
|
||||
entities = entities,
|
||||
threadId = threadId
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop
|
||||
)
|
||||
|
||||
/**
|
||||
@@ -1510,12 +1522,16 @@ public suspend fun TelegramBot.send(
|
||||
chat: Chat,
|
||||
draftId: DraftId,
|
||||
entities: TextSourcesList,
|
||||
threadId: MessageThreadId? = chat.id.threadId
|
||||
threadId: MessageThreadId? = chat.id.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null
|
||||
): Unit = sendMessageDraft(
|
||||
chat = chat,
|
||||
draftId = draftId,
|
||||
entities = entities,
|
||||
threadId = threadId
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop
|
||||
)
|
||||
|
||||
/**
|
||||
@@ -1526,12 +1542,16 @@ public suspend fun TelegramBot.send(
|
||||
draftId: DraftId,
|
||||
separator: TextSource? = null,
|
||||
threadId: MessageThreadId? = chatId.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null,
|
||||
builderBody: EntitiesBuilderBody
|
||||
): Unit = sendMessageDraft(
|
||||
chatId = chatId,
|
||||
draftId = draftId,
|
||||
separator = separator,
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop,
|
||||
builderBody = builderBody
|
||||
)
|
||||
|
||||
@@ -1543,12 +1563,16 @@ public suspend fun TelegramBot.send(
|
||||
draftId: DraftId,
|
||||
separator: String,
|
||||
threadId: MessageThreadId? = chatId.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null,
|
||||
builderBody: EntitiesBuilderBody
|
||||
): Unit = sendMessageDraft(
|
||||
chatId = chatId,
|
||||
draftId = draftId,
|
||||
separator = separator,
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop,
|
||||
builderBody = builderBody
|
||||
)
|
||||
|
||||
@@ -1560,12 +1584,16 @@ public suspend fun TelegramBot.send(
|
||||
draftId: DraftId,
|
||||
separator: TextSource? = null,
|
||||
threadId: MessageThreadId? = chat.id.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null,
|
||||
builderBody: EntitiesBuilderBody
|
||||
): Unit = sendMessageDraft(
|
||||
chat = chat,
|
||||
draftId = draftId,
|
||||
separator = separator,
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop,
|
||||
builderBody = builderBody
|
||||
)
|
||||
|
||||
@@ -1577,15 +1605,38 @@ public suspend fun TelegramBot.send(
|
||||
draftId: DraftId,
|
||||
separator: String,
|
||||
threadId: MessageThreadId? = chat.id.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null,
|
||||
builderBody: EntitiesBuilderBody
|
||||
): Unit = sendMessageDraft(
|
||||
chat = chat,
|
||||
draftId = draftId,
|
||||
separator = separator,
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop,
|
||||
builderBody = builderBody
|
||||
)
|
||||
|
||||
/**
|
||||
* Will execute [sendRichMessageDraft] request
|
||||
*/
|
||||
public suspend fun TelegramBot.send(
|
||||
chatId: ChatId,
|
||||
draftId: Long,
|
||||
richMessage: InputRichMessage,
|
||||
threadId: MessageThreadId? = chatId.threadId,
|
||||
canStop: Boolean? = null,
|
||||
keepOnStop: Boolean? = null
|
||||
): Unit = sendRichMessageDraft(
|
||||
chatId = chatId,
|
||||
draftId = draftId,
|
||||
richMessage = richMessage,
|
||||
threadId = threadId,
|
||||
canStop = canStop,
|
||||
keepOnStop = keepOnStop
|
||||
)
|
||||
|
||||
/**
|
||||
* @param replyMarkup Some [InlineKeyboardMarkup]. See [dev.inmo.tgbotapi.extensions.utils.types.buttons.inlineKeyboard]
|
||||
* as a builder for that
|
||||
|
||||
Reference in new issue
Block a user