From 533213f9695c32093f2c0b53a372657d4e62928c Mon Sep 17 00:00:00 2001 From: Kylmakalle Date: Sun, 25 Jun 2017 13:43:19 +0300 Subject: [PATCH] Support for attachments forward --- bot.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/bot.py b/bot.py index d2beec1..f97385b 100644 --- a/bot.py +++ b/bot.py @@ -108,23 +108,35 @@ def start_command(message): def form_request(message, method, info): if int(info[2]): - if message.text.startswith('!'): + if message.text and message.text.startswith('!'): if len(message.text) - 1: message.text = message.text[1:] if info[1] != 'None': method(message, info[1], group=True, forward_messages=info[1]) else: method(message, info[1], group=True) + elif message.caption and message.caption.startswith('!'): + if len(message.caption) - 1: + message.caption = message.caption[1:] + if info[1] != 'None': + method(message, info[1], group=True, forward_messages=info[1]) else: method(message, info[1], group=True) else: - if message.text.startswith('!'): + if message.text and message.text.startswith('!'): if len(message.text) - 1: message.text = message.text[1:] if info[1] != 'None': method(message, info[0], group=False, forward_messages=info[1]) else: method(message, info[1], group=True) + elif message.caption and message.caption.startswith('!'): + if len(message.caption) - 1: + message.caption = message.caption[1:] + if info[1] != 'None': + method(message, info[0], group=False, forward_messages=info[1]) + else: + method(message, info[1], group=True) else: method(message, info[0], group=False)