From bed5dd2ab2737735ff24fb9b9523382c2429e40b Mon Sep 17 00:00:00 2001
From: Kamushy <92086533+Kamushy@users.noreply.github.com>
Date: Fri, 3 Jun 2022 09:18:05 +1000
Subject: [PATCH 01/15] Made ENV make more sense

A couple were submitting links into the subreddit field
---
 .env.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.template b/.env.template
index f00c2ac..033c9d9 100644
--- a/.env.template
+++ b/.env.template
@@ -6,5 +6,5 @@ REDDIT_PASSWORD=""
 # Valid options are "yes" and "no" for the variable below
 REDDIT_2FA=""
 
-
+# Enter a subreddit, e.g. "AskReddit" or "r/AskReddit"
 SUBREDDIT=""

From ccd0c60d874a97c0f0d0a092c8412c38e33967b7 Mon Sep 17 00:00:00 2001
From: Callum Leslie <github@cleslie.uk>
Date: Sat, 4 Jun 2022 00:31:56 +0100
Subject: [PATCH 02/15] Add default values for environment variables

This should reduce errors by some values not being set in the .env file - namely 2FA and Theme
---
 main.py             | 2 +-
 reddit/subreddit.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.py b/main.py
index 8cc3c9a..57256df 100644
--- a/main.py
+++ b/main.py
@@ -20,7 +20,7 @@ reddit_object = get_subreddit_threads()
 
 load_dotenv()
 length, number_of_comments = save_text_to_mp3(reddit_object)
-download_screenshots_of_reddit_posts(reddit_object, number_of_comments, os.getenv("THEME"))
+download_screenshots_of_reddit_posts(reddit_object, number_of_comments, os.getenv("THEME", "light"))
 download_background()
 chop_background_video(length)
 final_video = make_final_video(number_of_comments)
diff --git a/reddit/subreddit.py b/reddit/subreddit.py
index 5d020fe..c7714ce 100644
--- a/reddit/subreddit.py
+++ b/reddit/subreddit.py
@@ -15,7 +15,7 @@ def get_subreddit_threads():
 
     print_step("Getting AskReddit threads...")
 
-    if os.getenv("REDDIT_2FA").lower() == "yes":
+    if os.getenv("REDDIT_2FA", default="no").lower() == "yes":
         print(
             "\nEnter your two-factor authentication code from your authenticator app.\n"
         )

From f05eff4f88402b53c1dc919c6e793dea628c3da3 Mon Sep 17 00:00:00 2001
From: Callum Leslie <github@cleslie.uk>
Date: Sat, 4 Jun 2022 01:30:10 +0100
Subject: [PATCH 03/15] Alert user if their .env is not configured properly

---
 main.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/main.py b/main.py
index 57256df..dff9645 100644
--- a/main.py
+++ b/main.py
@@ -1,13 +1,13 @@
 from utils.console import print_markdown
-import time
-
 from reddit.subreddit import get_subreddit_threads
 from video_creation.background import download_background, chop_background_video
 from video_creation.voices import save_text_to_mp3
 from video_creation.screenshot_downloader import download_screenshots_of_reddit_posts
 from video_creation.final_video import make_final_video
 from dotenv import load_dotenv
-import os
+import os, time
+
+REQUIRED_VALUES = ["REDDIT_CLIENT_ID","REDDIT_CLIENT_SECRET","REDDIT_USERNAME","REDDIT_PASSWORD"]
 
 print_markdown(
     "### Thanks for using this tool! [Feel free to contribute to this project on GitHub!](https://lewismenelaws.com) If you have any questions, feel free to reach out to me on Twitter or submit a GitHub issue."
@@ -15,10 +15,17 @@ print_markdown(
 
 time.sleep(3)
 
+load_dotenv()
 
-reddit_object = get_subreddit_threads()
+configured = True
 
-load_dotenv()
+for val in REQUIRED_VALUES:
+    if val not in os.environ or not os.getenv(val):
+        print(f"Please set the variable \"{val}\" in your .env file.")
+        configured = False
+
+if configured:
+reddit_object = get_subreddit_threads()
 length, number_of_comments = save_text_to_mp3(reddit_object)
 download_screenshots_of_reddit_posts(reddit_object, number_of_comments, os.getenv("THEME", "light"))
 download_background()

From 87d211281220ea529e6b48008e884a2adb7cd5f9 Mon Sep 17 00:00:00 2001
From: Callum Leslie <github@cleslie.uk>
Date: Sat, 4 Jun 2022 01:40:55 +0100
Subject: [PATCH 04/15] Move to casefold

---
 reddit/subreddit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reddit/subreddit.py b/reddit/subreddit.py
index c7714ce..c64db2b 100644
--- a/reddit/subreddit.py
+++ b/reddit/subreddit.py
@@ -15,7 +15,7 @@ def get_subreddit_threads():
 
     print_step("Getting AskReddit threads...")
 
-    if os.getenv("REDDIT_2FA", default="no").lower() == "yes":
+    if os.getenv("REDDIT_2FA", default="no").casefold() == "yes":
         print(
             "\nEnter your two-factor authentication code from your authenticator app.\n"
         )

From 3a7d91f474de5bbfdab0113b8479b0378949c943 Mon Sep 17 00:00:00 2001
From: Callum Leslie <github@cleslie.uk>
Date: Sat, 4 Jun 2022 01:41:48 +0100
Subject: [PATCH 05/15] Create a .env file if none exists on run

Should fix issues users have with creating their own .env file, by simply copying our template to a file for them.
---
 main.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/main.py b/main.py
index dff9645..b813c01 100644
--- a/main.py
+++ b/main.py
@@ -5,7 +5,7 @@ from video_creation.voices import save_text_to_mp3
 from video_creation.screenshot_downloader import download_screenshots_of_reddit_posts
 from video_creation.final_video import make_final_video
 from dotenv import load_dotenv
-import os, time
+import os, time, shutil
 
 REQUIRED_VALUES = ["REDDIT_CLIENT_ID","REDDIT_CLIENT_SECRET","REDDIT_USERNAME","REDDIT_PASSWORD"]
 
@@ -19,15 +19,19 @@ load_dotenv()
 
 configured = True
 
+if not os.path.exists(".env"):
+    shutil.copy(".env.template", ".env")
+    configured = False
+
 for val in REQUIRED_VALUES:
     if val not in os.environ or not os.getenv(val):
         print(f"Please set the variable \"{val}\" in your .env file.")
         configured = False
 
 if configured:
-reddit_object = get_subreddit_threads()
-length, number_of_comments = save_text_to_mp3(reddit_object)
-download_screenshots_of_reddit_posts(reddit_object, number_of_comments, os.getenv("THEME", "light"))
-download_background()
-chop_background_video(length)
-final_video = make_final_video(number_of_comments)
+    reddit_object = get_subreddit_threads()
+    length, number_of_comments = save_text_to_mp3(reddit_object)
+    download_screenshots_of_reddit_posts(reddit_object, number_of_comments, os.getenv("THEME", "light"))
+    download_background()
+    chop_background_video(length)
+    final_video = make_final_video(number_of_comments)

From d39386178b254f7bb86837c728fec20cb1dd52de Mon Sep 17 00:00:00 2001
From: Callum Leslie <github@cleslie.uk>
Date: Sat, 4 Jun 2022 01:53:34 +0100
Subject: [PATCH 06/15] Clean up imports

---
 reddit/subreddit.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/reddit/subreddit.py b/reddit/subreddit.py
index 5d020fe..95d26e7 100644
--- a/reddit/subreddit.py
+++ b/reddit/subreddit.py
@@ -1,8 +1,6 @@
 from utils.console import print_markdown, print_step, print_substep
-import praw
-import random
 from dotenv import load_dotenv
-import os
+import os, random, praw, re
 
 
 def get_subreddit_threads():

From cd5924562f021fcd95c8313cf9b8ee5cfc01185c Mon Sep 17 00:00:00 2001
From: Callum Leslie <github@cleslie.uk>
Date: Sat, 4 Jun 2022 01:57:09 +0100
Subject: [PATCH 07/15] Ignore r/ in subreddit names

---
 reddit/subreddit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reddit/subreddit.py b/reddit/subreddit.py
index 95d26e7..e1be0c3 100644
--- a/reddit/subreddit.py
+++ b/reddit/subreddit.py
@@ -40,7 +40,7 @@ def get_subreddit_threads():
         # ! Prompt the user to enter a subreddit
         try:
             subreddit = reddit.subreddit(
-                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")

From 37f22b8b018dd85d3b8db1b4fa9df282a55133cc Mon Sep 17 00:00:00 2001
From: Callum Leslie <github@cleslie.uk>
Date: Sat, 4 Jun 2022 02:00:19 +0100
Subject: [PATCH 08/15] Ignore r/ in environment subreddit names

---
 reddit/subreddit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reddit/subreddit.py b/reddit/subreddit.py
index e1be0c3..32bcba3 100644
--- a/reddit/subreddit.py
+++ b/reddit/subreddit.py
@@ -35,7 +35,7 @@ def get_subreddit_threads():
     )
 
     if os.getenv("SUBREDDIT"):
-        subreddit = reddit.subreddit(os.getenv("SUBREDDIT"))
+        subreddit = reddit.subreddit(re.sub(r"r\/", "", os.getenv("SUBREDDIT")))
     else:
         # ! Prompt the user to enter a subreddit
         try:

From 03f96e7a89780fb3ec8d8df16ff9653fa6cfed79 Mon Sep 17 00:00:00 2001
From: Luka Hietala <95122845+LukaHietala@users.noreply.github.com>
Date: Sat, 4 Jun 2022 14:48:13 +0300
Subject: [PATCH 09/15] Fixed link to documentation

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 10e84e9..dbb0250 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ These videos on TikTok, YouTube and Instagram get MILLIONS of views across all p
 5. Run `python3 main.py`
 6. Enjoy 😎
 
-If you want to see more detailed guide, please refer to the official [documentation](https://immaharry.gitbook.io/reddit-automated-video-bot/).
+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!
 
 ## Contributing & Ways to improve 📈

From 5f2070d34497d6e2bfa5716f4dffdf53a96c3fe8 Mon Sep 17 00:00:00 2001
From: jacesleeman <46321222+jacesleeman@users.noreply.github.com>
Date: Sat, 4 Jun 2022 09:04:43 -0400
Subject: [PATCH 10/15] Added opacity setting to the screen shots

---
 .env.template                 |  3 +++
 video_creation/final_video.py | 14 +++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.env.template b/.env.template
index 5ab4ae4..43cb7d9 100644
--- a/.env.template
+++ b/.env.template
@@ -9,3 +9,6 @@ REDDIT_2FA=""
 THEME=""
 
 SUBREDDIT=""
+
+# Range is 0 -> 1
+OPACITY=""
diff --git a/video_creation/final_video.py b/video_creation/final_video.py
index e1f71ff..9db757e 100644
--- a/video_creation/final_video.py
+++ b/video_creation/final_video.py
@@ -8,12 +8,18 @@ from moviepy.editor import (
     CompositeVideoClip,
 )
 from utils.console import print_step
-
+from dotenv import load_dotenv
+import os
 
 W, H = 1080, 1920
 
 
+
 def make_final_video(number_of_clips):
+   # Calls opacity from the .env
+    load_dotenv()
+    opacity = os.getenv('OPACITY')
+
     print_step("Creating the final video...")
     VideoFileClip.reW = lambda clip: clip.resize(width=W)
     VideoFileClip.reH = lambda clip: clip.resize(width=H)
@@ -39,14 +45,16 @@ def make_final_video(number_of_clips):
             ImageClip(f"assets/png/comment_{i}.png")
             .set_duration(audio_clips[i + 1].duration)
             .set_position("center")
-            .resize(width=W - 100),
+            .resize(width=W - 100)
+            .set_opacity(float(opacity)),
         )
     image_clips.insert(
         0,
         ImageClip(f"assets/png/title.png")
         .set_duration(audio_clips[0].duration)
         .set_position("center")
-        .resize(width=W - 100),
+        .resize(width=W - 100)
+        .set_opacity(float(opacity)),
     )
     image_concat = concatenate_videoclips(image_clips).set_position(
         ("center", "center")

From 84c8eb25ce3a8735dfb9486330647006e4891a5f Mon Sep 17 00:00:00 2001
From: jacesleeman <46321222+jacesleeman@users.noreply.github.com>
Date: Sat, 4 Jun 2022 10:02:01 -0400
Subject: [PATCH 11/15] updated .env to explain better

---
 .env.template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.env.template b/.env.template
index 43cb7d9..5115d89 100644
--- a/.env.template
+++ b/.env.template
@@ -3,12 +3,13 @@ REDDIT_CLIENT_SECRET=""
 REDDIT_USERNAME=""
 REDDIT_PASSWORD=""
 
-# Valid options are "yes" and "no" for the variable below
+SUBREDDIT=""
+
+# Valid options are "yes" and "no" 
 REDDIT_2FA=""
 
+# Valid options are "light "dark"
 THEME=""
 
-SUBREDDIT=""
-
 # Range is 0 -> 1
 OPACITY=""

From 102f791684caddfdd3bb7de1b63c3391790e565b Mon Sep 17 00:00:00 2001
From: Callum Leslie <github@cleslie.uk>
Date: Sat, 4 Jun 2022 15:43:21 +0100
Subject: [PATCH 12/15] Update .env.template

---
 .env.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.template b/.env.template
index 5115d89..58f3fd3 100644
--- a/.env.template
+++ b/.env.template
@@ -8,8 +8,8 @@ SUBREDDIT=""
 # Valid options are "yes" and "no" 
 REDDIT_2FA=""
 
-# Valid options are "light "dark"
+# Valid options are "light" and "dark"
 THEME=""
 
 # Range is 0 -> 1
-OPACITY=""
+OPACITY="0.9"

From fe92918823c0dbfc1dd03d7b675b0bfcb94b15b5 Mon Sep 17 00:00:00 2001
From: jacesleeman <46321222+jacesleeman@users.noreply.github.com>
Date: Sat, 4 Jun 2022 10:59:07 -0400
Subject: [PATCH 13/15] updated

---
 .env.template                 | 2 +-
 main.py                       | 2 ++
 video_creation/final_video.py | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.env.template b/.env.template
index 43cb7d9..d90bac7 100644
--- a/.env.template
+++ b/.env.template
@@ -11,4 +11,4 @@ THEME=""
 SUBREDDIT=""
 
 # Range is 0 -> 1
-OPACITY=""
+OPACITY=".9"
diff --git a/main.py b/main.py
index 8cc3c9a..b0a4c28 100644
--- a/main.py
+++ b/main.py
@@ -9,6 +9,8 @@ from video_creation.final_video import make_final_video
 from dotenv import load_dotenv
 import os
 
+REQUIRED_VALUES = ["REDDIT_CLIENT_ID","REDDIT_CLIENT_SECRET","REDDIT_USERNAME","REDDIT_PASSWORD", "OPACITY"]
+
 print_markdown(
     "### Thanks for using this tool! [Feel free to contribute to this project on GitHub!](https://lewismenelaws.com) If you have any questions, feel free to reach out to me on Twitter or submit a GitHub issue."
 )
diff --git a/video_creation/final_video.py b/video_creation/final_video.py
index 9db757e..0a2afb0 100644
--- a/video_creation/final_video.py
+++ b/video_creation/final_video.py
@@ -30,6 +30,11 @@ def make_final_video(number_of_clips):
         .resize(height=H)
         .crop(x1=1166.6, y1=0, x2=2246.6, y2=1920)
     )
+    try:
+        float(os.getenv("OPACITY"))
+    except:
+        print(f"Please ensure that OPACITY is set between 0 and 1 in your .env file")
+    configured = False
     # Gather all audio clips
     audio_clips = []
     for i in range(0, number_of_clips):

From c318e4e0425f288a7189ea9ec6e2f2361367a973 Mon Sep 17 00:00:00 2001
From: jacesleeman <46321222+jacesleeman@users.noreply.github.com>
Date: Sat, 4 Jun 2022 11:06:52 -0400
Subject: [PATCH 14/15] default OPACITY

---
 .env.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.template b/.env.template
index a7f6dd3..3fc5e13 100644
--- a/.env.template
+++ b/.env.template
@@ -12,4 +12,4 @@ THEME=""
 SUBREDDIT=""
 
 # Range is 0 -> 1
-OPACITY=""
\ No newline at end of file
+OPACITY=".9"

From b9ffdd186d1638da22d9d725a320afd5e795047c Mon Sep 17 00:00:00 2001
From: Callum Leslie <github@cleslie.uk>
Date: Sat, 4 Jun 2022 16:09:26 +0100
Subject: [PATCH 15/15] Added a zero to make it clearer to users

---
 .env.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.template b/.env.template
index 3fc5e13..cab265e 100644
--- a/.env.template
+++ b/.env.template
@@ -12,4 +12,4 @@ THEME=""
 SUBREDDIT=""
 
 # Range is 0 -> 1
-OPACITY=".9"
+OPACITY="0.9"