Bot API 4.8

Author: ba0f3

examples/echo_bot.nim

@@ -7,10 +7,10 @@ addHandler(L)
 const API_KEY = slurp("secret.key").strip()
 
 proc updateHandler(b: Telebot, u: Update): Future[bool] {.async.} =
-  if not u.message.isSome:
+  if not u.message:
     return true
   var response = u.message.get
-  if response.text.isSome:
+  if response.text:
     let text = response.text.get
     discard await b.sendMessage(response.chat.id, text, parseMode = "markdown", disableNotification = true, replyToMessageId = response.messageId)
 

src/telebot/private/api.nim

@@ -331,7 +331,8 @@ proc sendAnimation*(b: TeleBot, chatId: int64, animation: string, duration = 0,
   result = getMessage(res)
 
 proc sendPoll*(b: TeleBot, chatId: int64, question: string, options: seq[string], isAnonymous = false, kind = "",
-               allowsMultipleAnswers = false, correctOptionId = 0, isClosed = false,
+               allowsMultipleAnswers = false, correctOptionId = 0, explanation = "", explanationParseMode = "",
+               openPeriod = 0, closeDate = 0, isClosed = false,
                disableNotification = false, replyToMessageId = 0, replyMarkup: KeyboardMarkup = nil): Future[Message] {.async.} =
   END_POINT("sendPoll")
   var data = newMultipartData()
@@ -347,6 +348,14 @@ proc sendPoll*(b: TeleBot, chatId: int64, question: string, options: seq[string]
     data["allows_multiple_answers"] = "true"
   if correctOptionId != 0:
     data["correct_option_id"] = $correctOptionId
+  if explanation.len != 0:
+    data["explanation"] = explanation
+  if explanationParseMode.len != 0:
+    data["explanation_parse_mode"] = explanationParseMode
+  if openPeriod != 0:
+    data["open_period"] = $openPeriod
+  if closeDate != 0:
+    data["close_date"] = $closeDate
   if isClosed:
     data["is_closed"] = "true"
   if disableNotification:
@@ -359,11 +368,13 @@ proc sendPoll*(b: TeleBot, chatId: int64, question: string, options: seq[string]
   let res = await makeRequest(b, endpoint % b.token, data)
   result = getMessage(res)
 
-proc sendDice*(b: TeleBot, chatId: int64, disableNotification = false, replyToMessageId = 0, replyMarkup: KeyboardMarkup = nil): Future[Message] {.async.} =
+proc sendDice*(b: TeleBot, chatId: int64, emoji = "", disableNotification = false, replyToMessageId = 0, replyMarkup: KeyboardMarkup = nil): Future[Message] {.async.} =
   END_POINT("sendDice")
   var data = newMultipartData()
 
   data["chat_id"] = $chatId
+  if emoji.len != 0:
+    data["emoji"] = emoji
   if disableNotification:
     data["disable_notification"] = "true"
   if replyToMessageId != 0:
@@ -931,9 +942,6 @@ proc getUpdates*(b: TeleBot, offset, limit = 0, timeout = 50, allowedUpdates: se
     b.lastUpdateId = result[result.len - 1]["update_id"].toInt
 
 proc handleUpdate*(b: TeleBot, update: Update) {.async.} =
-  if update.updateId > b.lastUpdateId:
-    b.lastUpdateId = update.updateId
-
   # stop process other callbacks if a callback returns true
   var stop = false
   if update.inlineQuery.isSome:

src/telebot/private/types.nim

@@ -1,5 +1,8 @@
 import asyncdispatch, options, tables, httpclient
 
+
+converter optionToBool*[T](o: Option[T]): bool = o.isSome()
+
 type
   TelegramObject* = object of RootObj
 
@@ -158,17 +161,23 @@ type
     id*: string
     question*: string
     options*: seq[PollOption]
-    isClosed*: bool
     totalVoterCount*: int
+    isClosed*: bool
     isAnonymous*: bool
+    kind*: string
     allowsMultipleAnswers*: bool
     correctOptionId*: int
+    explanation*: Option[string]
+    explanationEntities*: Option[seq[MessageEntity]]
+    openPeriod*: Option[int]
+    closeDate*: Option[int]
 
   UserProfilePhotos* = object of TelegramObject
     totalCount*: int
     photos*: seq[seq[PhotoSize]]
 
   Dice* = object of TelegramObject
+    emoji*: string
     value*: int
 
   File* = object of TelegramObject

src/telebot/private/utils.nim

@@ -8,8 +8,6 @@ const
   API_URL* = "https://api.telegram.org/bot$#/"
   FILE_URL* = "https://api.telegram.org/file/bot$#/$#"
 
-#macro END_POINT*(s: static[string]) =
-#  result = parseStmt("const endpoint = \"" & API_URL & s & "\"")
 template END_POINT*(`method`: string) =
   let endpoint {.used, inject.} = API_URL & `method`
 

src/telebot/private/webhook.nim

@@ -52,7 +52,7 @@ proc getWebhookInfo*(b: TeleBot): Future[WebhookInfo] {.async.} =
   result = getWebhookInfo(res)
 
 
-proc startWebhook*(b: Telebot, secret, url: string, port=Port(8080)) =
+proc startWebhook*(b: Telebot, secret, url: string, port=Port(8080), clean = false) =
   try:
     let me = waitFor b.getMe()
     b.id = me.id