From 7d5fc1b0907c18a1b4acf75d69de2139a2ed2ad7 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 30 Jan 2022 15:40:11 +0200 Subject: [PATCH] sdf --- files/classes/comment.py | 8 ++++---- files/classes/mod_logs.py | 2 +- files/classes/submission.py | 2 +- files/classes/user.py | 2 +- files/routes/comments.py | 4 ++-- files/routes/posts.py | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/files/classes/comment.py b/files/classes/comment.py index 3ecc16138..3d517c6b8 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -228,7 +228,7 @@ class Comment(Base): @property @lazy def shortlink_context(self): - return f"/comment/{self.id}?context=9#context" + return f"/comment/{self.id}?context=8#context" @property @lazy @@ -239,10 +239,10 @@ class Comment(Base): @property @lazy def permalink(self): - if self.post and self.post.club: return f"{SITE_FULL}/comment/{self.id}?context=9#context" + if self.post and self.post.club: return f"{SITE_FULL}/comment/{self.id}?context=8#context" - if self.post: return f"{self.post.permalink}/{self.id}?context=9#context" - else: return f"{SITE_FULL}/comment/{self.id}?context=9#context" + if self.post: return f"{self.post.permalink}/{self.id}?context=8#context" + else: return f"{SITE_FULL}/comment/{self.id}?context=8#context" @property @lazy diff --git a/files/classes/mod_logs.py b/files/classes/mod_logs.py index 351bfe284..d41b47de8 100644 --- a/files/classes/mod_logs.py +++ b/files/classes/mod_logs.py @@ -93,7 +93,7 @@ class ModAction(Base): elif self.target_post: if self.target_post.club: return f'{CC} ONLY' return f'{self.target_post.title.replace("<","").replace(">","")}' - elif self.target_comment_id: return f'comment' + elif self.target_comment_id: return f'comment' @property @lazy diff --git a/files/classes/submission.py b/files/classes/submission.py index a5bef9608..57560a870 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -336,7 +336,7 @@ class Submission(Base): elif not v.oldreddit: url = self.url.replace("old.reddit.com", "reddit.com") if '/comments/' in url and "sort=" not in url: if "?" in url: url += "&context=9" - else: url += "?context=9" + else: url += "?context=8" if v.controversial: url += "&sort=controversial" return url elif self.url: diff --git a/files/classes/user.py b/files/classes/user.py index 1896b0d19..374e28d70 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -208,7 +208,7 @@ class User(Base): def ban_reason_link(self): if self.ban_reason: if self.ban_reason.startswith("/post/"): return self.ban_reason.split(None, 1)[0] - if self.ban_reason.startswith("/comment/"): return self.ban_reason.split(None, 1)[0] + "?context=9#context" + if self.ban_reason.startswith("/comment/"): return self.ban_reason.split(None, 1)[0] + "?context=8#context" @property @lazy diff --git a/files/routes/comments.py b/files/routes/comments.py index 630d0b753..370a81131 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -534,7 +534,7 @@ def api_comment(v): 'notification': { 'title': f'New reply by @{c.author_name}', 'body': notifbody, - 'deep_link': f'{SITE_FULL}/comment/{c.id}?context=9&read=true#context', + 'deep_link': f'{SITE_FULL}/comment/{c.id}?context=8&read=true#context', 'icon': f'{SITE_FULL}/assets/images/{SITE_NAME}/icon.webp', } }, @@ -544,7 +544,7 @@ def api_comment(v): 'body': notifbody, }, 'data': { - 'url': f'/comment/{c.id}?context=9&read=true#context', + 'url': f'/comment/{c.id}?context=8&read=true#context', } } }, diff --git a/files/routes/posts.py b/files/routes/posts.py index 857920d24..ccc978973 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -666,7 +666,7 @@ def thumbnail_thread(pid): for term in ('rdrama','freeghettohoes.biz'): for i in requests.get(f'https://api.pushshift.io/reddit/{t}/search?html_decode=true&q={term}&size=100').json()["data"]: - body_html = sanitize(f'New rdrama mention: https://old.reddit.com{i["permalink"]}?context=99', noimages=True) + body_html = sanitize(f'New rdrama mention: https://old.reddit.com{i["permalink"]}?context=89', noimages=True) existing_comment = db.query(Comment.id).filter_by(author_id=NOTIFICATIONS_ID, parent_submission=None, distinguish_level=6, body_html=body_html, level=1, sentto=0).first() @@ -689,7 +689,7 @@ def thumbnail_thread(pid): for k,v in REDDIT_NOTIFS.items(): for i in requests.get(f'https://api.pushshift.io/reddit/{t}/search?html_decode=true&q={k}&size=100').json()["data"]: - try: body_html = sanitize(f'New mention of you: https://old.reddit.com{i["permalink"]}?context=99', noimages=True) + try: body_html = sanitize(f'New mention of you: https://old.reddit.com{i["permalink"]}?context=89', noimages=True) except: continue existing_comment = db.query(Comment.id).filter_by(author_id=NOTIFICATIONS_ID, parent_submission=None, distinguish_level=6, body_html=body_html).first() if existing_comment: break