diff --git a/bottools/methods.py b/bottools/methods.py index 04bb671..e73d174 100644 --- a/bottools/methods.py +++ b/bottools/methods.py @@ -59,16 +59,19 @@ def captionHelper(bot, update): else: args = update.message.caption.split() - if args[0].startswith("/"): - try: - feature = commands[args[0][1:]] + try: + if args[0].startswith("/"): try: - feature(bot, update, args[1:]) + feature = commands[args[0][1:]] + try: + feature(bot, update, args[1:]) + except: + feature(bot, update) except: - feature(bot, update) - except: - update.message.reply_text(bottools.strings.unknownCommand) - else: + update.message.reply_text(bottools.strings.unknownCommand) + else: + raise ValueError() + except: explicitTweet(bot, update, args) def mentionHelper(bot, update):