better command handling [closes #44, fixes #39]

Author: ba0f3

telebot.nimble

@@ -1,4 +1,4 @@
-version       = "0.6.8"
+version       = "0.6.9"
 author        = "Huy Doan"
 description   = "Async Telegram Bot API Client"
 license       = "MIT"

telebot/api.nim

@@ -662,24 +662,20 @@ proc handleUpdate*(b: TeleBot, update: Update) {.async.} =
   if update.inlineQuery.isSome:
     for cb in b.inlineQueryCallbacks:
       await cb(b, update.inlineQuery.get)
-  elif update.hasCommand():
-    var
-      message = update.message.get
-    var userCommands = getCommands(message.entities.get, message.text.get)
-    for command in userCommands.keys():
-      if b.commandCallbacks.hasKey(command):
-        var cmd: Command
-        cmd.message = update.message.get()
-        cmd.params = userCommands[command]
-
-        for cb in b.commandCallbacks[command]:
-          await cb(b, cmd)
-      elif b.catchallCommandCallback != nil:
-        var cmd: CatchallCommand
-        cmd.command = command
-        cmd.message = update.message.get()
-        cmd.params = userCommands[command]
-        await b.catchallCommandCallback(b, cmd)
+  elif update.hasCommand(b.username):
+    if b.commandCallbacks.hasKey(command):
+      var cmd: Command
+      cmd.message = update.message.get()
+      cmd.params = params
+
+      for cb in b.commandCallbacks[command]:
+        await cb(b, cmd)
+    elif b.catchallCommandCallback != nil:
+      var cmd: CatchallCommand
+      cmd.command = command
+      cmd.message = update.message.get()
+      cmd.params = params
+      await b.catchallCommandCallback(b, cmd)
   else:
     for cb in b.updateCallbacks:
       await cb(b, update)
@@ -690,6 +686,13 @@ proc cleanUpdates*(b: TeleBot) {.async.} =
     updates = await b.getUpdates()
 
 proc loop(b: TeleBot, timeout = 50, offset, limit = 0) {.async.} =
+  try:
+    let me = waitFor b.getMe()
+    if me.username.isSome:
+      b.username = me.username.get().toLowerAscii()
+  except IOError, OSError:
+    d("Unable to fetch my info ", getCurrentExceptionMsg())
+
   while true:
     let updates = await b.getUpdates(timeout=timeout, offset=offset, limit=limit)
     for item in updates:

telebot/types.nim

@@ -16,6 +16,7 @@ type
     catchallCommandCallback*: CatchallCommandCallback
     inlineQueryCallbacks*: seq[InlineQueryCallback]
     proxy*: Proxy
+    username*: string
 
   CatchallCommand* = object of TelegramObject
     command*: string

telebot/utils.nim

@@ -11,30 +11,31 @@ const
 macro END_POINT*(s: string) =
   result = parseStmt("const endpoint = \"" & API_URL & s.strVal & "\"")
 
-proc hasCommand*(update: Update): bool =
+template hasCommand*(update: Update, username: string): bool =
+  var result = false
+  when not declaredInScope(command):
+    var
+      command {.inject.} = ""
+      params {.inject.} = ""
   if update.message.isSome:
-    var message = update.message.get()
+    let message = update.message.get()
     if message.entities.isSome:
-      var entities = message.entities.get()
-      for entity in entities:
-        if entity.kind == "bot_command":
-          return true
-
-proc getCommands*(entities: seq[MessageEntity], messageText: string): StringTableRef =
-  result = newStringTable(modeCaseInsensitive)
-  for entity in entities:
-    if entity.kind == "bot_command":
-      var
-        offset = entity.offset
-        length = entity.length
+      let
+        entities = message.entities.get()
+        messageText = message.text.get()
+      if entities[0].kind == "bot_command":
+        let
+          offset = entities[0].offset
+          length = entities[0].length
         command = messageText[(offset + 1)..<(offset + length)].strip()
-
-      if '@' in command:
-        command = command.split('@')[0]
-
-      var param = messageText[(offset + length)..^1]
-      param = param.split(Whitespace, 0).join().strip()
-      result[command] = param
+        params = messageText[(offset + length)..^1].splitWhitespace().join().strip()
+        result = true
+        if '@' in command:
+          var parts = command.split('@')
+          command = parts[0]
+          if (parts.len == 2 and parts[1].toLowerAscii != username):
+            result = false
+  result
 
 proc isSet*(value: any): bool {.inline.} =
   when value is string: