diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..d9fbee9
Binary files /dev/null and b/.DS_Store differ
diff --git a/.env.template b/.env.template
index f00c2ac..9e2218f 100644
--- a/.env.template
+++ b/.env.template
@@ -1,10 +1,14 @@
REDDIT_CLIENT_ID=""
REDDIT_CLIENT_SECRET=""
+
REDDIT_USERNAME=""
REDDIT_PASSWORD=""
# Valid options are "yes" and "no" for the variable below
REDDIT_2FA=""
+SUBREDDIT="askReddit"
-SUBREDDIT=""
+# Link of the thread
+# (e.g. https://www.reddit.com/r/memes/comments/sbr31o/discordggrmemes_the_official_rmemes_discord_server/)
+THREAD=""
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/RedditVideoMakerBot.iml b/.idea/RedditVideoMakerBot.iml
new file mode 100644
index 0000000..8e5446a
--- /dev/null
+++ b/.idea/RedditVideoMakerBot.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..653ebc1
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..1fd5644
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/reddit/subreddit.py b/reddit/subreddit.py
index 5d020fe..c2f6547 100644
--- a/reddit/subreddit.py
+++ b/reddit/subreddit.py
@@ -13,7 +13,6 @@ def get_subreddit_threads():
load_dotenv()
- print_step("Getting AskReddit threads...")
if os.getenv("REDDIT_2FA").lower() == "yes":
print(
@@ -35,24 +34,36 @@ def get_subreddit_threads():
username=os.getenv("REDDIT_USERNAME"),
password=passkey,
)
+ # If the user inserts a thread link, pick that one
+ if os.getenv("THREAD_LINK"):
- if os.getenv("SUBREDDIT"):
- subreddit = reddit.subreddit(os.getenv("SUBREDDIT"))
+ print_step(f"Getting the inserted thread...")
+
+ thread_id = os.getenv("THREAD_LINK").split("/")[6]
+ submission = reddit.submission(thread_id)
else:
- # ! Prompt the user to enter a subreddit
- try:
- subreddit = reddit.subreddit(
- input("What subreddit would you like to pull from? ")
- )
- except ValueError:
- subreddit = reddit.subreddit("askreddit")
- print_substep("Subreddit not defined. Using AskReddit.")
+ # Otherwise, picks a random thread from the inserted subreddit
+ if os.getenv("SUBREDDIT"):
+ subreddit_name = os.getenv("SUBREDDIT")
+ print_step(f"Getting a random thread from r/{subreddit_name}")
+ subreddit = reddit.subreddit(subreddit_name)
+ else:
+ # ! Prompt the user to enter a subreddit
+ try:
+ subreddit = reddit.subreddit(
+ input("What subreddit would you like to pull from? ")
+ )
+ except ValueError:
+ subreddit = reddit.subreddit("askreddit")
+ print_substep("Subreddit not defined. Using AskReddit.")
+
+ threads = subreddit.hot(limit=25)
+ submission = list(threads)[random.randrange(0, 25)]
+
+
- threads = subreddit.hot(limit=25)
- submission = list(threads)[random.randrange(0, 25)]
print_substep(f"Video will be: {submission.title} :thumbsup:")
try:
-
content["thread_url"] = submission.url
content["thread_title"] = submission.title
content["comments"] = []