Merge branch 'master' of quentin/schneiderbot-tg-fork into master

schneiderbot.py

@@ -104,6 +104,10 @@ def sendDog(bot, update):
     dog = pydog.PyDog()
     bot.send_photo(chat_id=update.message.chat_id, photo=dog.get_random_image())
 
+def sendCatDog(bot, update):
+    """Best of both worlds!"""
+    catdog = "https://upload.wikimedia.org/wikipedia/en/6/64/CatDog.jpeg"
+    bot.send_photo(chat_id=update.message.chat_id, photo=catdog)
 
 def magie(bot, update):
     """MAGIEEEEEE"""
@@ -190,6 +194,7 @@ def main():
     dp.add_handler(CommandHandler("mensa", mensa, pass_args=True))
     dp.add_handler(CommandHandler("cat", sendCat))
     dp.add_handler(CommandHandler("dog", sendDog))
+    dp.add_handler(CommandHandler("catdog", sendCatDog))
     dp.add_handler(CommandHandler("shrug", shrug))