From 3962434898af537ff3b6dab4fc92b70d6c854c63 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 5ee1b90c0e..776b8dccdd 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 86d8840b8e574f0056445e9545eba99811e0c5a4 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 776b8dccdd..daea8ff6ba 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 406ac493ccabf8ff486f6f3e1ea41b8fde51471a 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 daea8ff6ba..94ccf1aa83 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 4b53afdd16eb6f3acf92877ba38d218c3d3316b1 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 94ccf1aa83..4dd459bf22 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 a9c942eef5a173dcf3ce6f4d52cc30605b107866 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 4dd459bf22..9668500e9b 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 5776f956d436852ff4d261ccde07e070116f41a9 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 9668500e9b..87b2c05888 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 255eb4edaa4465fffd5db0a44ce3a408bc23453f 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 8ec244768b..38238e0958 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 d77bfe7d034f01eb5e57a61f1b9d430b238d57a3 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 f4b0c5f290..348f18cd27 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -111,7 +111,7 @@
-
+