Switch from sam to std/json, refs #67 #68

Author: ba0f3

examples/delete_message.nim

@@ -1,13 +1,14 @@
-import ../telebot, asyncdispatch, logging, options, sam
+import telebot, asyncdispatch, logging, options
 from strutils import strip
 
 var L = newConsoleLogger(fmtStr="$levelname, [$time] ")
 addHandler(L)
 
 const API_KEY = slurp("secret.key").strip()
 
-proc commandHandler(b: Telebot, c: Command) {.async.} =
+proc commandHandler(b: Telebot, c: Command): Future[bool] {.gcsafe, async.} =
   discard await b.deleteMessage($c.message.chat.id, c.message.messageId)
+  result = true
 
 when isMainModule:
   let bot = newTeleBot(API_KEY)

examples/dynamic_commands.nim

@@ -0,0 +1,28 @@
+import telebot, asyncdispatch, logging
+from strutils import strip
+
+var L = newConsoleLogger(fmtStr="$levelname, [$time] ")
+addHandler(L)
+
+const API_KEY = slurp("secret.key").strip()
+
+proc getCommandHandler(b: Telebot, c: Command): Future[bool] {.gcsafe, async.} =
+  let commands = await b.getMyCommands()
+  var output = ""
+  if commands.len == 0:
+    output = "No command registered yet"
+  else:
+    for command in commands:
+      output.add(command.command & "\t" & command.description & "\n")
+  discard await b.sendMessage(c.message.chat.id, "```\n" & output & "\n```", parseMode="markdown")
+  result = true
+
+proc setCommandHandler(b: Telebot, c: Command): Future[bool] {.gcsafe, async.} =
+  discard await b.sendDice(c.message.chat.id)
+  result = true
+
+when isMainModule:
+  let bot = newTeleBot(API_KEY)
+  bot.onCommand("get", getCommandHandler)
+  bot.onCommand("set", setCommandHandler)
+  bot.poll(timeout=300)

examples/echo_bot_with_proxy.nim

@@ -6,13 +6,13 @@ addHandler(L)
 
 const API_KEY = slurp("secret.key").strip()
 
-proc updateHandler(b: Telebot, u: Update) {.async.} =
+proc updateHandler(b: Telebot, u: Update): Future[bool] {.gcsafe, async.} =
   var response = u.message.get
   if response.text.isSome:
     discard await b.sendMessage(response.chat.id, response.text.get)
 
 
-proc greatingHandler(b: Telebot, c: Command) {.async.} =
+proc greatingHandler(b: Telebot, c: Command): Future[bool] {.gcsafe, async.} =
   discard b.sendMessage(c.message.chat.id, "hello " & c.message.fromUser.get().firstName)
 
 when isMainModule:

examples/inline_keyboard.nim

@@ -6,8 +6,8 @@ addHandler(L)
 
 const API_KEY = slurp("secret.key").strip()
 
-proc updateHandler(bot: TeleBot, e: Update) {.async.} =
-  var response = e.message.get
+proc updateHandler(b: Telebot, u: Update): Future[bool] {.gcsafe, async.} =
+  var response = u.message.get
   if response.text.isSome:
     let
       text = response.text.get
@@ -24,7 +24,7 @@ proc updateHandler(bot: TeleBot, e: Update) {.async.} =
 
     let replyMarkup = newInlineKeyboardMarkup(@[google, bing], @[ddg, searx])
 
-    discard await bot.sendMessage(response.chat.id, text, replyMarkup = replyMarkup)
+    discard await b.sendMessage(response.chat.id, text, replyMarkup = replyMarkup)
 
 when isMainModule:
   let bot = newTeleBot(API_KEY)

examples/promote_chat_member.nim

@@ -1,12 +1,12 @@
-import ../telebot, asyncdispatch, logging, options, sam
+import telebot, asyncdispatch, logging, options
 from strutils import strip
 
 var L = newConsoleLogger(fmtStr="$levelname, [$time] ")
 addHandler(L)
 
 const API_KEY = slurp("secret.key").strip()
 
-proc promoteHandler(b: Telebot, c: Command) {.async.} =
+proc promoteHandler(b: Telebot, c: Command): Future[bool] {.gcsafe, async.} =
     try:
         echo waitFor b.promoteChatMember($c.message.chat.id, c.message.fromUser.get().id,
             canChangeInfo=true,

examples/seamless_bot.nim renamed to examples/seamless_login_bot.nim

@@ -11,7 +11,7 @@ const API_KEY = slurp("secret.key").strip()
     SEND /setdomain COMMAND TO @BotFatheR
 ]#
 
-proc loginHandler(b: Telebot, c: Command) {.async.} =
+proc loginHandler(b: Telebot, c: Command): Future[bool] {.gcsafe, async.} =
   var loginButton = initInlineKeyBoardButton("Login")
   loginButton.loginUrl = some(newLoginUrl("https://huy.im"))
   discard await b.sendMessage(c.message.chat.id, "Welcome to Seamless Web Bots", replyMarkup = newInlineKeyboardMarkup(@[loginButton]))

examples/send_dice.nim

@@ -6,7 +6,7 @@ addHandler(L)
 
 const API_KEY = slurp("secret.key").strip()
 
-proc commandHandler(b: Telebot, c: Command): Future[bool] {.async.} =
+proc commandHandler(b: Telebot, c: Command): Future[bool] {.gcsafe, async.} =
   discard await b.sendDice(c.message.chat.id)
 
 when isMainModule:

examples/set_chat_permissions.nim

@@ -1,14 +1,14 @@
-import ../telebot, asyncdispatch, logging, options, sam
+import telebot, asyncdispatch, logging, options
 from strutils import strip
 
-import ../telebot/utils
+import ../src/telebot/private/utils
 
 var L = newConsoleLogger(fmtStr="$levelname, [$time] ")
 addHandler(L)
 
 const API_KEY = slurp("secret.key").strip()
 
-proc commandHandler(b: Telebot, c: Command) {.async.} =
+proc commandHandler(b: Telebot, c: Command): Future[bool] {.gcsafe, async.} =
   let perms = ChatPermissions(
     canSendMessages: some(true),
     canSendMediaMessages: some(true),

examples/webhook_simple.nim

@@ -1,4 +1,4 @@
-import telebot, asyncdispatch, logging, options, sam
+import telebot, asyncdispatch, logging, options
 from strutils import strip
 
 var L = newConsoleLogger(fmtStr="$levelname, [$time] ")
@@ -14,7 +14,7 @@ proc updateHandler(b: Telebot, u: Update) {.async.} =
     discard b.sendMessage(response.chat.id, response.text.get, disableNotification = true, replyToMessageId = response.messageId, parseMode = "markdown")
 
 
-proc greatingHandler(b: Telebot, c: Command) {.async.} =
+proc greatingHandler(b: Telebot, c: Command): Future[bool] {.gcsafe, async.} =
   discard b.sendMessage(c.message.chat.id, "hello " & c.message.fromUser.get().firstName, disableNotification = true, replyToMessageId = c.message.messageId, parseMode = "markdown")
 
 when isMainModule: