removed the complex code about user given thread link, this would instead use the -t parameter in command line

pull/280/head
iaacornus 3 years ago
parent e076492a55
commit 65f74f586b
No known key found for this signature in database
GPG Key ID: 281739AE7252598C

@ -8,7 +8,7 @@ from dotenv import load_dotenv
from utils.console import print_step, print_substep from utils.console import print_step, print_substep
def get_subreddit_threads(subreddit_): def get_subreddit_threads(subreddit_, thread_link_):
""" """
Takes subreddit_ as parameter which defaults to None, but in this Takes subreddit_ as parameter which defaults to None, but in this
case since it is None, it would raise ValueError, thus defaulting case since it is None, it would raise ValueError, thus defaulting
@ -20,8 +20,6 @@ def get_subreddit_threads(subreddit_):
global submission global submission
load_dotenv() load_dotenv()
print_step("Getting AskReddit threads...")
if os.getenv("REDDIT_2FA", default="no").casefold() == "yes": if os.getenv("REDDIT_2FA", default="no").casefold() == "yes":
print( print(
"\nEnter your two-factor authentication code from your authenticator app.\n" "\nEnter your two-factor authentication code from your authenticator app.\n"
@ -53,17 +51,39 @@ def get_subreddit_threads(subreddit_):
subreddit = reddit.subreddit("askreddit") subreddit = reddit.subreddit("askreddit")
print_substep("Subreddit not defined. Using AskReddit.") print_substep("Subreddit not defined. Using AskReddit.")
threads = subreddit.hot(limit=25) # If the user specifies that he doesnt want a random thread, or if
submission = list(threads)[random.randrange(0, 25)] # he doesn't insert the "RANDOM_THREAD" variable at all, ask the thread link
if thread_link_ is not None:
thread_link = thread_link_
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? "))
)
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)]
print_substep(f"Video will be: {submission.title} :thumbsup:") print_substep(f"Video will be: {submission.title} :thumbsup:")
try: try:
content["thread_url"] = submission.url content["thread_url"] = submission.url
content["thread_title"] = submission.title content["thread_title"] = submission.title
content["thread_post"] = submission.selftext
content["comments"] = [] content["comments"] = []
for top_level_comment in submission.comments: for top_level_comment in submission.comments:
if not top_level_comment.stickied: if not top_level_comment.stickied:
content["comments"].append( content["comments"].append(
{ {
"comment_body": top_level_comment.body, "comment_body": top_level_comment.body,

Loading…
Cancel
Save