Merge branch 'master' into master

.env.template

@@ -1,10 +1,15 @@
 REDDIT_CLIENT_ID=""
 REDDIT_CLIENT_SECRET=""
+
 REDDIT_USERNAME=""
 REDDIT_PASSWORD=""
+
 # Valid options are "yes" and "no" 
 REDDIT_2FA=""
 
+#If no, it will ask you a thread link to extract the thread, if yes it will randomize it. 
+RANDOM_THREAD="no"
+
 # Valid options are "light" and "dark"
 THEME=""
 

.gitignore

@@ -6,4 +6,6 @@ reddit-bot-351418-5560ebc49cac.json
 video_creation/__pycache__/
 .setup-done-before
 __pycache__
+.idea/
+.DS_Store
 out

README.md

@@ -7,6 +7,7 @@ All done WITHOUT video editing or asset compiling. Just pure ✨programming magi
 Created by Lewis Menelaws & [TMRRW](https://tmrrwinc.ca)
 
 [<picture>
+
   <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/6053155/170528535-e274dc0b-7972-4b27-af22-637f8c370133.png">
   <source media="(prefers-color-scheme: light)" srcset="https://user-images.githubusercontent.com/6053155/170528582-cb6671e7-5a2f-4bd4-a048-0e6cfa54f0f7.png">
   <img src="https://user-images.githubusercontent.com/6053155/170528582-cb6671e7-5a2f-4bd4-a048-0e6cfa54f0f7.png" width="350">
@@ -44,7 +45,7 @@ These videos on TikTok, YouTube and Instagram get MILLIONS of views across all p
 
 
 If you want to see more detailed guide, please refer to the official [documentation](https://luka-hietala.gitbook.io/documentation-for-the-reddit-bot/).
-*The Documentation is still being developed and worked on, please be patient as we change / add new knowledge!
+\*The Documentation is still being developed and worked on, please be patient as we change / add new knowledge!
 
 ## Contributing & Ways to improve 📈
 
@@ -52,7 +53,7 @@ In its current state, this bot does exactly what it needs to do. However, lots o
 
 I have tried to simplify the code so anyone can read it and start contributing at any skill level. Don't be shy :) contribute!
 
-- [ ] Allowing users to choose a reddit thread instead of being randomized.
+-   [x] 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.
 -   [x] Allowing users to choose between any subreddit.
 -   [ ] Allowing users to change voice.

reddit/subreddit.py

@@ -14,8 +14,6 @@ def get_subreddit_threads():
 
     load_dotenv()
 
-    print_step("Getting AskReddit threads...")
-
     if os.getenv("REDDIT_2FA", default="no").casefold() == "yes":
         print(
             "\nEnter your two-factor authentication code from your authenticator app.\n"
@@ -36,15 +34,21 @@ def get_subreddit_threads():
         password=passkey,
     )
     
+    # If the user specifies that he doesnt want a random thread, or if he doesn't insert the "RANDOM_THREAD" variable at all, ask the thread link
+    if not os.getenv("RANDOM_THREAD") or os.getenv("RANDOM_THREAD") == "no":
+        print_substep("Insert the full thread link:", style="bold green")
+        thread_link = input()
+        print_step(f"Getting the inserted thread...")
+        submission = reddit.submission(url=thread_link)
+    else:
+        # Otherwise, picks a random thread from the inserted subreddit
         if os.getenv("SUBREDDIT"):
             subreddit = reddit.subreddit(re.sub(r"r\/", "", os.getenv("SUBREDDIT")))
         else:
             # ! Prompt the user to enter a subreddit
             try:
                 subreddit = reddit.subreddit(
-                re.sub(
-                    r"r\/", "", input("What subreddit would you like to pull from? ")
-                )
+                    re.sub(r"r\/", "",input("What subreddit would you like to pull from? "))
                 )
             except ValueError:
                 subreddit = reddit.subreddit("askreddit")
@@ -52,10 +56,10 @@ def get_subreddit_threads():
 
         threads = subreddit.hot(limit=25)
         submission = list(threads)[random.randrange(0, 25)]
+
     print_substep(f"Video will be: {submission.title} :thumbsup:")
     console.log("Getting video comments...")
     try:
-
         content["thread_url"] = submission.url
         content["thread_title"] = submission.title
         content["comments"] = []