From ba28561f994a7ce715e78a3b1a2d0af0d175cc4b Mon Sep 17 00:00:00 2001
From: Luke Robles <lukelrobles@gmail.com>
Date: Wed, 6 Dec 2023 19:44:12 -0800
Subject: [PATCH] Add halo role to welcome message

---
 app/animals.py         |  4 ++--
 app/bot.py             |  3 +++
 app/get_from_reddit.py | 12 +++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/animals.py b/app/animals.py
index cc0181ed..6624e909 100755
--- a/app/animals.py
+++ b/app/animals.py
@@ -15,7 +15,8 @@ def get_red_panda():
 
 
 def get_dog():
-    return random.choice([random_sheeb, random_dog, random_dog_reddit])()
+    # return random.choice([random_sheeb, random_dog, random_dog_reddit])()
+    return random_dog_reddit()
 
 
 def random_sheeb():
@@ -46,7 +47,6 @@ def random_dog_reddit():
             "swedishvallhund",
             "puppy101",
             "lookatmydog",
-            "dogs",
             "jackrussellterrier",
         ]
     )
diff --git a/app/bot.py b/app/bot.py
index 9745f144..8cebcd8f 100755
--- a/app/bot.py
+++ b/app/bot.py
@@ -42,6 +42,8 @@ async def on_ready():
 
 🚀 for Star Citizen
 
+👽 for Halo
+
 :gear: for Lethal Company
 
 🏎️ for Sim Racing
@@ -74,6 +76,7 @@ async def on_raw_reaction_add(payload):
         "🚀": "Star Citizens",
         "⚙️": "Lethal Gamers",
         "🏎️": "sim racists",
+        "👽": "Gaylo gamers",
     }
 
     if payload.channel_id == 1026281775984549958:
diff --git a/app/get_from_reddit.py b/app/get_from_reddit.py
index c6566c5e..9c8d021f 100755
--- a/app/get_from_reddit.py
+++ b/app/get_from_reddit.py
@@ -23,6 +23,8 @@ def get_image(boards, nsfw=False):
         "i3.kym-cdn.com",
         "imgur.com",
         "media.giphy.com",
+        "v.redd.it",
+        "reddit.com",
     ]
     request_string = "https://reddit.com/r/{}/random.json".format(boards)
 
@@ -38,11 +40,11 @@ def get_image(boards, nsfw=False):
 
     response = requests.get(
         request_string, headers={"User-agent": random_user_agent}
-    ).json()[0]["data"]["children"][0]
+    ).json()[0]["data"]["children"][0]["data"]
 
-    if response["data"]["domain"] not in domains:
-        # If we dont find an approved domain, re-try the request
-        return get_image(boards, nsfw=nsfw)
-    image_url = response["data"]["url"].replace("http://", "https://")
+    if response["secure_media"]:
+        image_url = response["secure_media"]["reddit_video"]["fallback_url"]
+    elif response["domain"] in domains:
+        image_url = response["url_overridden_by_dest"]
 
     return image_url