From b1e1d07c8bf83db592e48928bc3973a53be10eb0 Mon Sep 17 00:00:00 2001
From: owengaspard <owen@ogaspard.com>
Date: Tue, 31 May 2022 16:13:32 -0500
Subject: [PATCH] .env bool "ASK_EACH_TIME"

Define whether or not you want to be asked each time what subreddit to pull from. Also, I ticked the box on the README.
---
 .env.template       |  1 +
 README.md           |  2 +-
 reddit/subreddit.py | 23 ++++++++++++++---------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.env.template b/.env.template
index e2c5798..c598b49 100644
--- a/.env.template
+++ b/.env.template
@@ -2,4 +2,5 @@ REDDIT_CLIENT_ID=""
 REDDIT_CLIENT_SECRET=""
 REDDIT_USERNAME=""
 REDDIT_PASSWORD=""
+ASK_EACH_TIME=TRUE
 SUBREDDIT=""
\ No newline at end of file
diff --git a/README.md b/README.md
index 26d8156..1d0507a 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,6 @@ I have tried to simplify the code so anyone can read it and start contibuting at
 
 - [ ] Allowing users to choose a reddit thread instead of being randomized.
 - [ ] Allowing users to choose a background that is picked instead of the Minecraft one.
-- [ ] Allowing users to choose between any subreddit.
+- [x] Allowing users to choose between any subreddit.
 - [ ] Allowing users to change voice.
 - [ ] Creating better documentation and adding a command line interface.
diff --git a/reddit/subreddit.py b/reddit/subreddit.py
index d71adb6..c88220a 100644
--- a/reddit/subreddit.py
+++ b/reddit/subreddit.py
@@ -21,15 +21,20 @@ def get_subreddit_threads():
         username=os.getenv("REDDIT_USERNAME"),
         password=os.getenv("REDDIT_PASSWORD"),
     )
-    """
-    Ask user for subreddit input
-    """
-    subreddit = reddit.subreddit(input("What subreddit would you like to pull from? "))
-    
-    """
-    Allow you to specify in .env. Done for automation purposes.
-    subreddit = reddit.subreddit(os.getenv("SUBREDDIT"))
-    """
+
+    if os.getenv("ASK_EACH_TIME") == TRUE:
+        try:
+            subreddit = reddit.subreddit(input("What subreddit would you like to pull from? "))
+        except NameError:
+            subreddit = reddit.subreddit("askreddit")
+            print_substep("Subreddit not defined. Using AskReddit.")
+    else:
+        try:
+            subreddit = reddit.subreddit(os.getenv("SUBREDDIT"))
+        except NameError:
+            subreddit = reddit.subreddit("askreddit")
+            print_substep("Subreddit not defined. Using AskReddit.")
+
     threads = subreddit.hot(limit=25)
     submission = list(threads)[random.randrange(0, 25)]
     print_substep(f"Video will be: {submission.title} :thumbsup:")