From dec7395780d6947813ce26ba8acf3970a2816d7e Mon Sep 17 00:00:00 2001 From: Luke Robles Date: Tue, 9 Mar 2021 21:25:59 -0800 Subject: [PATCH] Adding a kind of working dale function --- app/animals.py | 7 +++++-- app/bot.py | 6 ++++++ pull_and_run_latest.sh | 2 +- test-dragon-bot.sh | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/animals.py b/app/animals.py index a731db8a..4e4d5c7b 100644 --- a/app/animals.py +++ b/app/animals.py @@ -1,4 +1,5 @@ import random +import glob import requests import urllib @@ -9,8 +10,6 @@ def get_red_panda(): red_panda = None while not red_panda: red_panda = requests.get('https://some-random-api.ml/img/red_panda').json()['link'] - # if 'mp4' in red_panda[-3:]: - # red_panda = None return red_panda def get_dog(): @@ -63,3 +62,7 @@ def random_bird_reddit(): def get_rat(): return get_from_reddit.get_image('rats') + +def dale(): + return random.choice(glob.glob('/tmp/dale/*')) + diff --git a/app/bot.py b/app/bot.py index 653ff4b6..535fb132 100755 --- a/app/bot.py +++ b/app/bot.py @@ -273,6 +273,12 @@ async def birb(ctx): import animals await ctx.send(animals.get_birb()) + +@bot.command(name='dale') +async def dale(ctx): + import animals + await ctx.send(file=discord.File(animals.dale())) + @bot.command(name='corona') async def corona(ctx): diff --git a/pull_and_run_latest.sh b/pull_and_run_latest.sh index 5e5b6af3..90bfe004 100755 --- a/pull_and_run_latest.sh +++ b/pull_and_run_latest.sh @@ -6,5 +6,5 @@ printf "[+] Done\n" # Run that shit and mount the docker socket so it can talk to the sky-factory container printf "\n[-] Pulling latest build of container\n" docker pull ldooks/dragon-bot:latest -docker run -d --name dragon-bot --env-file /mnt/freenas/docker_storage/dragon_bot_env --restart always ldooks/dragon-bot:latest +docker run -d --name dragon-bot -v /mnt/freenas/docker_storage/syncthing/appdata/config/Sync/dale:/tmp/dale --env-file /mnt/freenas/docker_storage/dragon_bot_env --restart always ldooks/dragon-bot:latest printf "[+] Done\n" diff --git a/test-dragon-bot.sh b/test-dragon-bot.sh index 44547dfa..8e9ebc67 100755 --- a/test-dragon-bot.sh +++ b/test-dragon-bot.sh @@ -6,4 +6,4 @@ printf "[+] Done\n" printf "\n[-] Running dragon bot in test mode\n" docker build -f ./Dockerfile-test-env -t dragon-bot-test . || exit -docker run -ti -v $(pwd)/app:/app --rm --name dragon-bot-test -e DRAGON_ENV=test -e token="MzQ1MjkwMTI5OTQ4Mjc4Nzg0.DG5IBw._9umb82PrL22bPe7GjmHClU-NtU" dragon-bot-test sh +docker run -ti -v /mnt/freenas/docker_storage/syncthing/appdata/config/Sync/dale:/tmp/dale -v $(pwd)/app:/app --rm --name dragon-bot-test -e DRAGON_ENV=test -e token="MzQ1MjkwMTI5OTQ4Mjc4Nzg0.DG5IBw._9umb82PrL22bPe7GjmHClU-NtU" dragon-bot-test sh