From 5cfda324cb8a6766fd9bfc6ba45ecc49e32600b2 Mon Sep 17 00:00:00 2001 From: Domiziano Scarcelli Date: Sat, 4 Jun 2022 12:22:40 +0200 Subject: [PATCH 1/4] Comments can be filtered by lenght --- .env.template | 5 +++++ reddit/subreddit.py | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.env.template b/.env.template index 5ab4ae4..bd2cbe4 100644 --- a/.env.template +++ b/.env.template @@ -9,3 +9,8 @@ REDDIT_2FA="" THEME="" SUBREDDIT="" + +# Filters the comments by range of lenght (min and max characters) +# Min has to be less or equal to max +# DO NOT INSERT ANY SPACES BETWEEN THE COMMA AND THE VALUES +COMMENT_LENGHT_RANGE = "min,max" \ No newline at end of file diff --git a/reddit/subreddit.py b/reddit/subreddit.py index 5d020fe..5212375 100644 --- a/reddit/subreddit.py +++ b/reddit/subreddit.py @@ -1,3 +1,4 @@ +from numpy import Infinity from utils.console import print_markdown, print_step, print_substep import praw import random @@ -58,13 +59,17 @@ def get_subreddit_threads(): content["comments"] = [] for top_level_comment in submission.comments: - content["comments"].append( - { - "comment_body": top_level_comment.body, - "comment_url": top_level_comment.permalink, - "comment_id": top_level_comment.id, - } - ) + COMMENT_LENGHT_RANGE = [0, Infinity] + if os.getenv("COMMENT_LENGHT_RANGE"): + COMMENT_LENGHT_RANGE = [int(i) for i in os.getenv("COMMENT_LENGHT_RANGE").split(",")] + if COMMENT_LENGHT_RANGE[0] <= len(top_level_comment.body) <= COMMENT_LENGHT_RANGE[1]: + content["comments"].append( + { + "comment_body": top_level_comment.body, + "comment_url": top_level_comment.permalink, + "comment_id": top_level_comment.id, + } + ) except AttributeError as e: pass From 8c8b344881cf6847d6c1c9410e06d30e610f44c2 Mon Sep 17 00:00:00 2001 From: Domiziano Scarcelli Date: Sat, 4 Jun 2022 12:31:35 +0200 Subject: [PATCH 2/4] Typo correction --- reddit/subreddit.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/reddit/subreddit.py b/reddit/subreddit.py index 5212375..30f6b2f 100644 --- a/reddit/subreddit.py +++ b/reddit/subreddit.py @@ -59,10 +59,10 @@ def get_subreddit_threads(): content["comments"] = [] for top_level_comment in submission.comments: - COMMENT_LENGHT_RANGE = [0, Infinity] - if os.getenv("COMMENT_LENGHT_RANGE"): - COMMENT_LENGHT_RANGE = [int(i) for i in os.getenv("COMMENT_LENGHT_RANGE").split(",")] - if COMMENT_LENGHT_RANGE[0] <= len(top_level_comment.body) <= COMMENT_LENGHT_RANGE[1]: + COMMENT_LENGTH_RANGE = [0, Infinity] + if os.getenv("COMMENT_LENGTH_RANGE"): + COMMENT_LENGTH_RANGE = [int(i) for i in os.getenv("COMMENT_LENGTH_RANGE").split(",")] + if COMMENT_LENGTH_RANGE[0] <= len(top_level_comment.body) <= COMMENT_LENGTH_RANGE[1]: content["comments"].append( { "comment_body": top_level_comment.body, From 0b161932ea0c5219ac8c7bc0957e78653abb1153 Mon Sep 17 00:00:00 2001 From: Domiziano Scarcelli Date: Sat, 4 Jun 2022 12:56:18 +0200 Subject: [PATCH 3/4] Typo correction --- .env.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.template b/.env.template index bd2cbe4..c3f32dc 100644 --- a/.env.template +++ b/.env.template @@ -13,4 +13,4 @@ SUBREDDIT="" # Filters the comments by range of lenght (min and max characters) # Min has to be less or equal to max # DO NOT INSERT ANY SPACES BETWEEN THE COMMA AND THE VALUES -COMMENT_LENGHT_RANGE = "min,max" \ No newline at end of file +COMMENT_LENGTH_RANGE = "min,max" \ No newline at end of file From 20f087ea930e3e0a00811a487592b048d5950dec Mon Sep 17 00:00:00 2001 From: Domiziano Scarcelli Date: Sun, 5 Jun 2022 20:20:35 +0200 Subject: [PATCH 4/4] Merge conficts --- .env.template | 8 -------- reddit/subreddit.py | 19 ++++++++----------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/.env.template b/.env.template index 3c38548..7ae0ac6 100644 --- a/.env.template +++ b/.env.template @@ -16,10 +16,6 @@ THEME="" # Enter a subreddit, e.g. "AskReddit" SUBREDDIT="" -<<<<<<< HEAD -======= - ->>>>>>> b5393694ca852b5b29d6acb7779af1efd2f345db # Filters the comments by range of lenght (min and max characters) # Min has to be less or equal to max # DO NOT INSERT ANY SPACES BETWEEN THE COMMA AND THE VALUES @@ -27,7 +23,3 @@ COMMENT_LENGTH_RANGE = "min,max" # Range is 0 -> 1 OPACITY="0.9" -<<<<<<< HEAD -======= - ->>>>>>> b5393694ca852b5b29d6acb7779af1efd2f345db diff --git a/reddit/subreddit.py b/reddit/subreddit.py index 190dc8a..a84dffc 100644 --- a/reddit/subreddit.py +++ b/reddit/subreddit.py @@ -66,21 +66,18 @@ def get_subreddit_threads(): content["comments"] = [] for top_level_comment in submission.comments: -<<<<<<< HEAD COMMENT_LENGTH_RANGE = [0, Infinity] if os.getenv("COMMENT_LENGTH_RANGE"): COMMENT_LENGTH_RANGE = [int(i) for i in os.getenv("COMMENT_LENGTH_RANGE").split(",")] if COMMENT_LENGTH_RANGE[0] <= len(top_level_comment.body) <= COMMENT_LENGTH_RANGE[1]: -======= - if not top_level_comment.stickied: ->>>>>>> upstream/master - content["comments"].append( - { - "comment_body": top_level_comment.body, - "comment_url": top_level_comment.permalink, - "comment_id": top_level_comment.id, - } - ) + if not top_level_comment.stickied: + content["comments"].append( + { + "comment_body": top_level_comment.body, + "comment_url": top_level_comment.permalink, + "comment_id": top_level_comment.id, + } + ) except AttributeError as e: pass