From 73b2a29f1ac0eca1a2ada98ff880b04072eac1c5 Mon Sep 17 00:00:00 2001 From: PatatjeMC Date: Thu, 9 Jun 2022 16:11:12 +0200 Subject: [PATCH] Better anti NSFW Instead of looking at the screen to look if it's nsfw it checks it earlier so it doesn't have to create all the mp3's and open the browser to do it. Also it fixes some errors because of it cause playwright was being buggy with it for some reason. --- utils/subreddit.py | 7 ++++++- video_creation/screenshot_downloader.py | 6 ------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/utils/subreddit.py b/utils/subreddit.py index 3fc1613..7a7dca0 100644 --- a/utils/subreddit.py +++ b/utils/subreddit.py @@ -1,6 +1,7 @@ from typing import List import json - +from os import getenv +from utils.console import print_substep def get_subreddit_undone(submissions: List, subreddit): """ @@ -11,6 +12,10 @@ def get_subreddit_undone(submissions: List, subreddit): for submission in submissions: if already_done(done_videos, submission): continue + if submission.over_18: + if getenv("ALLOW_NSFW").casefold() == "false": + print_substep("NSFW Post Detected. Skipping...") + continue return submission return get_subreddit_undone( subreddit.top(time_filter="hour"), subreddit diff --git a/video_creation/screenshot_downloader.py b/video_creation/screenshot_downloader.py index 89d6728..d401811 100644 --- a/video_creation/screenshot_downloader.py +++ b/video_creation/screenshot_downloader.py @@ -42,12 +42,6 @@ def download_screenshots_of_reddit_posts(reddit_object, screenshot_num): if page.locator('[data-testid="content-gate"]').is_visible(): # This means the post is NSFW and requires to click the proceed button. - if getenv("ALLOW_NSFW").casefold() == "false": - print_substep("NSFW Post Detected. Skipping...") - from main import main - - main() - print_substep("Post is NSFW. You are spicy... :fire:") page.locator('[data-testid="content-gate"] button').click()