From e0a297fb0a331c69969b78552298e8266520157e Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 5 Sep 2021 13:38:07 +0200 Subject: [PATCH 01/14] fd --- files/routes/posts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/routes/posts.py b/files/routes/posts.py index 5ee1b90c0..776b8dccd 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -198,7 +198,7 @@ def post_id(pid, anything=None, v=None): post.tree_comments() if request.headers.get("Authorization"): return post.json - else: return post.rendered_page(v=v, read, sort=sort) + else: return post.rendered_page(v=v, read=read, sort=sort) @app.post("/edit_post/") From edf1d471ea0176dd738f4a58a60bae02201e6ff6 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 5 Sep 2021 13:38:57 +0200 Subject: [PATCH 02/14] fd --- files/routes/posts.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/files/routes/posts.py b/files/routes/posts.py index 776b8dccd..daea8ff6b 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -181,11 +181,11 @@ def post_id(pid, anything=None, v=None): post.preloaded_comments = [x for x in comments if not (x.author and x.author.shadowbanned) or (v and v.id == x.author_id)] - read = session["read_comments"] - read_comments = [x.id for x in post.preloaded_comments] - if session.get("read_comments"): session["read_comments"] += read_comments - else: session["read_comments"] = read_comments + read = session["read_comments"] + read_comments = [x.id for x in post.preloaded_comments] + if session.get("read_comments"): session["read_comments"] += read_comments + else: session["read_comments"] = read_comments post.views += 1 g.db.add(post) From 756177f1928256ba6c4f02d05b4150402a7c5b7f Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 5 Sep 2021 13:39:27 +0200 Subject: [PATCH 03/14] fd --- files/routes/posts.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/files/routes/posts.py b/files/routes/posts.py index daea8ff6b..94ccf1aa8 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -182,7 +182,9 @@ def post_id(pid, anything=None, v=None): post.preloaded_comments = [x for x in comments if not (x.author and x.author.shadowbanned) or (v and v.id == x.author_id)] - read = session["read_comments"] + if session.get("read_comments"): read = session["read_comments"] + else: read = None + read_comments = [x.id for x in post.preloaded_comments] if session.get("read_comments"): session["read_comments"] += read_comments else: session["read_comments"] = read_comments From 09da60090fb61439bb9d5d9f7bfb72c685450fbf Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 5 Sep 2021 13:39:45 +0200 Subject: [PATCH 04/14] fd --- files/routes/posts.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/files/routes/posts.py b/files/routes/posts.py index 94ccf1aa8..4dd459bf2 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -182,9 +182,7 @@ def post_id(pid, anything=None, v=None): post.preloaded_comments = [x for x in comments if not (x.author and x.author.shadowbanned) or (v and v.id == x.author_id)] - if session.get("read_comments"): read = session["read_comments"] - else: read = None - + print(session.get("read_comments")) read_comments = [x.id for x in post.preloaded_comments] if session.get("read_comments"): session["read_comments"] += read_comments else: session["read_comments"] = read_comments From 9c3a35d6110793647edd549d21c502d8e90cd3c0 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 5 Sep 2021 13:40:13 +0200 Subject: [PATCH 05/14] fd --- files/routes/posts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/routes/posts.py b/files/routes/posts.py index 4dd459bf2..9668500e9 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -182,10 +182,10 @@ def post_id(pid, anything=None, v=None): post.preloaded_comments = [x for x in comments if not (x.author and x.author.shadowbanned) or (v and v.id == x.author_id)] - print(session.get("read_comments")) read_comments = [x.id for x in post.preloaded_comments] if session.get("read_comments"): session["read_comments"] += read_comments else: session["read_comments"] = read_comments + print(session.get("read_comments")) post.views += 1 g.db.add(post) From b34fdf436c52a770b8d6bb8e87f994ee4fe8717e Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 5 Sep 2021 13:40:43 +0200 Subject: [PATCH 06/14] fd --- files/routes/posts.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/files/routes/posts.py b/files/routes/posts.py index 9668500e9..87b2c0588 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -181,11 +181,10 @@ def post_id(pid, anything=None, v=None): post.preloaded_comments = [x for x in comments if not (x.author and x.author.shadowbanned) or (v and v.id == x.author_id)] - + read = session.get("read_comments") read_comments = [x.id for x in post.preloaded_comments] if session.get("read_comments"): session["read_comments"] += read_comments else: session["read_comments"] = read_comments - print(session.get("read_comments")) post.views += 1 g.db.add(post) @@ -194,7 +193,6 @@ def post_id(pid, anything=None, v=None): if request.headers.get("Authorization"): return {"error":"Must be 18+ to view"}, 451 else: return render_template("errors/nsfw.html", v=v) - post.tree_comments() if request.headers.get("Authorization"): return post.json From b00ed608bb845465f3d9a17878045e3f76bc1272 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 5 Sep 2021 13:41:08 +0200 Subject: [PATCH 07/14] fd --- files/classes/submission.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/classes/submission.py b/files/classes/submission.py index 8ec244768..38238e095 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -134,7 +134,7 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing): return f"/post/{self.id}/{output}" - def rendered_page(self, sort=None, comment=None, comment_info=None, v=None): + def rendered_page(self, read=None, sort=None, comment=None, comment_info=None, v=None): # check for banned if v and (v.admin_level >= 3 or self.author_id == v.id): From 0af09c1d304d55a047be4e48c3f5006cf1ec572d Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 5 Sep 2021 13:43:45 +0200 Subject: [PATCH 08/14] fd --- files/templates/comments.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/comments.html b/files/templates/comments.html index f4b0c5f29..348f18cd2 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -111,7 +111,7 @@
-
+