From bf5a430c677902b72143070ce007d9b45c000593 Mon Sep 17 00:00:00 2001 From: Luke Robles Date: Fri, 22 Jun 2018 13:51:06 -0700 Subject: [PATCH] adding birb --- app/{doggos.py => animals.py} | 7 +++++++ app/dragon-bot.py | 9 +++++++-- app/help_methods.py | 6 +++++- 3 files changed, 19 insertions(+), 3 deletions(-) rename app/{doggos.py => animals.py} (75%) diff --git a/app/doggos.py b/app/animals.py similarity index 75% rename from app/doggos.py rename to app/animals.py index 87eab257..501a1615 100644 --- a/app/doggos.py +++ b/app/animals.py @@ -19,3 +19,10 @@ def random_dog(): if 'mp4' in dog_url[-3:]: dog_url = None return "https://random.dog/{}".format(dog_url) + + +def get_birb(): + return "https://random.birb.pw/img/{}".format( + requests.get( + 'https://random.birb.pw/tweet' + ).text) \ No newline at end of file diff --git a/app/dragon-bot.py b/app/dragon-bot.py index 277a25c0..4c5473a9 100644 --- a/app/dragon-bot.py +++ b/app/dragon-bot.py @@ -8,12 +8,12 @@ then imported into the main bot import os import requests +import animals import core_utils import decide import define_word import discord import docker -import doggos import eight_ball import excuse import get_from_reddit @@ -138,6 +138,11 @@ async def on_message(message): embed_description="[Direct Link]({})".format(user.avatar_url.replace('.webp', '.png')) ) ) + if message.content.startswith('!birb'): + await client.send_message( + message.channel, + embed=generate_embed(embed_url=animals.get_birb()) + ) if message.content.startswith('!clap'): await client.delete_message(message) @@ -173,7 +178,7 @@ async def on_message(message): if message.content.startswith('!dog'): await client.send_message( message.channel, - embed=generate_embed(embed_url=doggos.get_dog()) + embed=generate_embed(embed_url=animals.get_dog()) ) if message.content.startswith('!excuse'): diff --git a/app/help_methods.py b/app/help_methods.py index c70ec195..e5137642 100644 --- a/app/help_methods.py +++ b/app/help_methods.py @@ -17,6 +17,10 @@ def get_help_message(method): 'Returns the avatar for the mentioned user', '\nUsage: !avatar @somebody' ], + 'birb': [ + 'Sends an image of a birb', + '\nUsage: !birb' + ], 'clap': [ 'Returns the shittiest meme created by sassy girls on twitter this century', 'Usage: !clap some text to be meme\'mt' @@ -117,7 +121,7 @@ def get_help_message(method): def get_help_embed(client): categories = { - 'fun': ['clap', 'dog', 'excuse', 'greentext', 'lewd', 'message', 'homepage', 'pout', 'smug'], + 'fun': ['clap', 'birb', 'dog', 'excuse', 'greentext', 'lewd', 'message', 'homepage', 'pout', 'smug'], 'util': ['8ball', 'decide', 'wallpaper', 'weather', 'stock', 'tts'], 'users': ['help', 'invite', 'purge', 'roles', 'source', 'minecraft'], 'admin': ['emoji', 'cleanup']