Skip to content

Commit a1549c2

Browse files
committed
fix return value for sendMediaGroup, closes #55
1 parent 0fea879 commit a1549c2

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

src/telebot/private/api.nim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ proc stopMessageLiveLocation*(b: TeleBot, chatId = "", messageId = 0, inlineMess
829829
let res = await makeRequest(b, procName, data)
830830
result = res.toBool
831831

832-
proc sendMediaGroup*(b: TeleBot, chatId: string, media: seq[InputMediaSet], disableNotification = false, allowSendingWithoutReply = false, replyToMessageId = 0): Future[bool] {.async.} =
832+
proc sendMediaGroup*(b: TeleBot, chatId: string, media: seq[InputMediaSet], disableNotification = false, allowSendingWithoutReply = false, replyToMessageId = 0): Future[seq[Message]] {.async.} =
833833
var data = newMultipartData()
834834
data["chat_id"] = chatId
835835
for m in media:
@@ -845,7 +845,7 @@ proc sendMediaGroup*(b: TeleBot, chatId: string, media: seq[InputMediaSet], disa
845845
data["reply_to_message_id"] = $replyToMessageId
846846

847847
let res = await makeRequest(b, procName, data)
848-
result = res.toBool
848+
result = unmarshal(res, seq[Message])
849849

850850
proc editMessageMedia*(b: TeleBot, media: InputMediaSet, chatId = "", messageId = 0, inlineMessageId = "", replyMarkup: KeyboardMarkup = nil): Future[Option[Message]] {.async.} =
851851
var data = newMultipartData()

src/telebot/private/utils.nim

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ proc formatName*(s: string): string =
8686
else:
8787
result.add(c)
8888

89+
proc put*[T](s: var seq[T], n: JsonNode) {.inline.}
90+
8991
proc unmarshal*(n: JsonNode, T: typedesc): T =
9092
when result is object:
9193
for name, value in result.fieldPairs:
@@ -96,15 +98,18 @@ proc unmarshal*(n: JsonNode, T: typedesc): T =
9698
elif value.type is TelegramObject:
9799
value = unmarshal(n[jsonKey], value.type)
98100
elif value.type is seq:
99-
for item in n[jsonKey]:
100-
put(value, item)
101+
value = unmarshal(n[jsonKey], value.type)
102+
#for item in n[jsonKey]:
103+
# put(value, item)
101104
elif value.type is string:
102105
value = n[jsonKey].toStr
103106
else:
104107
value = to[value.type](n[jsonKey])
105108
elif result is seq:
106-
for item in n:
109+
for item in n.items:
107110
result.put(item)
111+
#for item in n:
112+
# result.put(item)
108113
109114
proc marshal*[T](t: T, s: var string) =
110115
when t is Option:

telebot.nimble

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "1.0.5"
1+
version = "1.0.6"
22
author = "Huy Doan"
33
description = "Async Telegram Bot API Client"
44
license = "MIT"

0 commit comments

Comments
 (0)