From 26f55c806b71d87f3f54574d65d04651b8ee5402 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 16 Jan 2022 10:08:55 +0200 Subject: [PATCH 01/24] bb --- files/templates/comments.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/comments.html b/files/templates/comments.html index 07af7358df..caa188b0e3 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -149,8 +149,8 @@ {% if c.post and c.post.over_18 %}+18{% endif %} {% if c.post %} - {% if c.author_id==v.id and c.child_comments and is_notification_page%} - Comment {{'Replies' if (c.child_comments | length)>1 else 'Reply'}}: {{c.post.realtitle(v) | safe}} + {% if c.author_id==v.id and replies and is_notification_page%} + Comment {{'Replies' if (replies | length)>1 else 'Reply'}}: {{c.post.realtitle(v) | safe}} {% elif c.post.author_id==v.id and c.level == 1 and is_notification_page%} Post Reply: {{c.post.realtitle(v) | safe}} {% elif is_notification_page and c.parent_submission in v.subscribed_idlist() %} From b617163a1c15b0d5575b34a720e772c3b69caeec Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 17 Jan 2022 13:06:12 +0200 Subject: [PATCH 02/24] vvv --- files/routes/admin.py | 5 +---- files/routes/awards.py | 6 ++++-- files/routes/comments.py | 3 ++- files/routes/errors.py | 15 ++++++++------- files/routes/front.py | 10 +++------- files/routes/login.py | 20 ++++++++++++-------- files/routes/posts.py | 11 ++++++----- files/routes/search.py | 2 +- files/routes/users.py | 12 +++++++----- 9 files changed, 44 insertions(+), 40 deletions(-) diff --git a/files/routes/admin.py b/files/routes/admin.py index e0b2ef440b..65f8167ccb 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -500,14 +500,11 @@ def users_list(v): @admin_level_required(2) def alt_votes_get(v): - if not request.values.get("u1") or not request.values.get("u2"): - return render_template("admin/alt_votes.html", v=v) - u1 = request.values.get("u1") u2 = request.values.get("u2") if not u1 or not u2: - return redirect("/admin/alt_votes") + return render_template("admin/alt_votes.html", v=v) u1 = get_user(u1) u2 = get_user(u2) diff --git a/files/routes/awards.py b/files/routes/awards.py index 5abef536b2..f99c9a3417 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -356,7 +356,8 @@ def award_post(pid, v): g.db.add(post.author) g.db.commit() - if request.referrer and len(request.referrer) > 1: return redirect(request.referrer) + if request.referrer and len(request.referrer) > 1 and (request.referrer.startswith('/') or request.referrer.startswith(request.host_url)): + return redirect(request.referrer) else: return redirect("/") @@ -540,7 +541,8 @@ def award_comment(cid, v): g.db.add(c.author) g.db.commit() - if request.referrer and len(request.referrer) > 1: return redirect(request.referrer) + if request.referrer and len(request.referrer) > 1 and (request.referrer.startswith('/') or request.referrer.startswith(request.host_url)): + return redirect(request.referrer) else: return redirect("/") @app.get("/admin/awards") diff --git a/files/routes/comments.py b/files/routes/comments.py index 166c4ef3d0..e4bbbf80b1 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -467,7 +467,8 @@ def api_comment(v): if parent.author.id != v.id: if len(c.body) > 500: notifbody = c.body[:500] + '...' - else: notifbody = c.body + elif c.body: notifbody = c.body + else: notifbody = '' beams_client.publish_to_interests( interests=[f'{request.host}{parent.author.id}'], diff --git a/files/routes/errors.py b/files/routes/errors.py index 31a33760f2..9c36a9a404 100644 --- a/files/routes/errors.py +++ b/files/routes/errors.py @@ -13,13 +13,12 @@ def error_400(e): @app.errorhandler(401) def error_401(e): - path = request.path - qs = urlencode(dict(request.values)) - argval = quote(f"{path}?{qs}", safe='') - output = f"/login?redirect={argval}" - if request.headers.get("Authorization") or request.headers.get("xhr"): return {"error": "401 Not Authorized"}, 401 - else: return redirect(output) + else: + path = request.path + qs = urlencode(dict(request.values)) + argval = quote(f"{path}?{qs}", safe='') + return redirect(f"/login?redirect={argval}") @app.errorhandler(403) @@ -61,4 +60,6 @@ def error_500(e): @app.post("/allow_nsfw") def allow_nsfw(): session["over_18"] = int(time.time()) + 3600 - return redirect(request.values.get("redir", "/")) \ No newline at end of file + redir = request.values.get("redir") + if redir and redir.startswith(request.host_url) or redir.startswith('/'): return redirect(redir) + return redirect('/') \ No newline at end of file diff --git a/files/routes/front.py b/files/routes/front.py index de7a471beb..a8f3cc0355 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -6,11 +6,6 @@ from files.classes.submission import Submission defaulttimefilter = environ.get("DEFAULT_TIME_FILTER", "all").strip() SITE_NAME = environ.get("SITE_NAME", "").strip() -@app.get("/post/") -@auth_required -def slash_post(v): - return redirect("/") - @app.post("/clear") @auth_required def clear(v): @@ -123,7 +118,8 @@ def notifications(v): @auth_desired def front_all(v): - if not v and request.path == "/" and not request.headers.get("Authorization"): return redirect(f"/logged_out{request.full_path}") + if not v and request.path == "/" and not request.headers.get("Authorization"): + return redirect(f"/logged_out{request.full_path}") if v and request.path.startswith('/logged_out'): v = None @@ -436,7 +432,7 @@ def comment_idlist(page=1, v=None, nsfw=False, sort="new", t="all"): elif sort == "controversial": comments = comments.order_by(-1 * Comment.upvotes * Comment.downvotes * Comment.downvotes) elif sort == "top": - comments = comments.order_by(Comment.realupvotes.desc()) + comments = comments.order_by(Comment.downvotes - Comment.upvotes) elif sort == "bottom": comments = comments.order_by(Comment.upvotes - Comment.downvotes) diff --git a/files/routes/login.py b/files/routes/login.py index 0a44b9c615..bdeb5b44e0 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -12,13 +12,14 @@ valid_password_regex = re.compile("^.{8,100}$") @auth_desired def login_get(v): - redir = request.values.get("redirect", "/").replace("/logged_out", "").strip() - if v: - return redirect(redir) + redir = request.values.get("redirect") + if redir: + redir = replace("/logged_out", "").strip() + if not redir.startswith(request.host_url) and not redir.startswith('/'): redir = None - return render_template("login.html", - failed=False, - redirect=redir) + if v and redir: return redirect(redir) + + return render_template("login.html", failed=False, redirect=redir) def check_for_alts(current_id): @@ -137,10 +138,13 @@ def login_post(): if account.id != PW_ID: check_for_alts(account.id) - redir = request.values.get("redirect", "/").replace("/logged_out", "").strip() - g.db.commit() + redir = request.values.get("redirect") + if redir: + redir = replace("/logged_out", "").strip() + if not redir.startswith(request.host_url) and not redir.startswith('/'): redir = '/' + return redirect(redir) diff --git a/files/routes/posts.py b/files/routes/posts.py index 3618feda77..8f42777819 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -96,7 +96,8 @@ def submit_get(v): @app.get("/logged_out/post//") @auth_desired def post_id(pid, anything=None, v=None): - if not v and not request.path.startswith('/logged_out') and not request.headers.get("Authorization"): return redirect(f"/logged_out{request.full_path}") + if not v and not request.path.startswith('/logged_out') and not request.headers.get("Authorization"): + return redirect(f"/logged_out{request.full_path}") if v and request.path.startswith('/logged_out'): v = None @@ -169,7 +170,7 @@ def post_id(pid, anything=None, v=None): elif sort == "controversial": comments = comments.order_by(-1 * Comment.upvotes * Comment.downvotes * Comment.downvotes) elif sort == "top": - comments = comments.order_by(-Comment.upvotes - Comment.downvotes) + comments = comments.order_by(Comment.realupvotes.desc()) elif sort == "bottom": comments = comments.order_by(Comment.upvotes - Comment.downvotes) @@ -186,7 +187,7 @@ def post_id(pid, anything=None, v=None): elif sort == "controversial": comments = comments.order_by(-1 * Comment.upvotes * Comment.downvotes * Comment.downvotes) elif sort == "top": - comments = comments.order_by(-Comment.upvotes - Comment.downvotes) + comments = comments.order_by(Comment.realupvotes.desc()) elif sort == "bottom": comments = comments.order_by(Comment.upvotes - Comment.downvotes) @@ -288,7 +289,7 @@ def viewmore(v, pid, sort, offset): elif sort == "controversial": comments = comments.order_by(-1 * Comment.upvotes * Comment.downvotes * Comment.downvotes) elif sort == "top": - comments = comments.order_by(-Comment.upvotes - Comment.downvotes) + comments = comments.order_by(Comment.realupvotes.desc()) elif sort == "bottom": comments = comments.order_by(Comment.upvotes - Comment.downvotes) @@ -305,7 +306,7 @@ def viewmore(v, pid, sort, offset): elif sort == "controversial": comments = comments.order_by(-1 * Comment.upvotes * Comment.downvotes * Comment.downvotes) elif sort == "top": - comments = comments.order_by(-Comment.upvotes - Comment.downvotes) + comments = comments.order_by(Comment.realupvotes.desc()) elif sort == "bottom": comments = comments.order_by(Comment.upvotes - Comment.downvotes) diff --git a/files/routes/search.py b/files/routes/search.py index cc80f82f0f..f23843f74b 100644 --- a/files/routes/search.py +++ b/files/routes/search.py @@ -255,7 +255,7 @@ def searchcomments(v): elif sort == "controversial": comments = comments.order_by(-1 * Comment.upvotes * Comment.downvotes * Comment.downvotes) elif sort == "top": - comments = comments.order_by(Comment.realupvotes.desc()) + comments = comments.order_by(Comment.downvotes - Comment.upvotes) elif sort == "bottom": comments = comments.order_by(Comment.upvotes - Comment.downvotes) diff --git a/files/routes/users.py b/files/routes/users.py index cb423d2fa6..b5f3895862 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -435,8 +435,9 @@ def message2(v, username): g.db.add(notif) if len(message) > 500: notifbody = message[:500] + '...' - else: notifbody = message - + elif message: notifbody = message + else: notifbody = '' + beams_client.publish_to_interests( interests=[f'{request.host}{user.id}'], publish_body={ @@ -502,7 +503,8 @@ def messagereply(v): g.db.add(notif) if len(message) > 500: notifbody = message[:500] + '...' - else: notifbody = message + elif message: notifbody = message + else: notifbody = '' beams_client.publish_to_interests( interests=[f'{request.host}{user_id}'], @@ -628,7 +630,7 @@ def u_username(username, v=None): if username != u.username: - return redirect(request.path.replace(username, u.username)) + return redirect(request.full_path.replace(username, u.username)) if u.reserved: if request.headers.get("Authorization") or request.headers.get("xhr"): return {"error": f"That username is reserved for: {u.reserved}"} @@ -796,7 +798,7 @@ def u_username_comments(username, v=None): elif sort == "controversial": comments = comments.order_by(-1 * Comment.upvotes * Comment.downvotes * Comment.downvotes) elif sort == "top": - comments = comments.order_by(Comment.realupvotes.desc()) + comments = comments.order_by(Comment.downvotes - Comment.upvotes) elif sort == "bottom": comments = comments.order_by(Comment.upvotes - Comment.downvotes) From 7a9a78c027ee53ff0d1c89f45c9c081c92d377e6 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 17 Jan 2022 13:47:30 +0200 Subject: [PATCH 03/24] bbb --- files/classes/submission.py | 2 +- files/helpers/const.py | 9 ++++++--- files/helpers/sanitize.py | 6 +++--- files/routes/admin.py | 10 +++++----- files/routes/comments.py | 10 +++++++++- files/routes/posts.py | 3 ++- files/templates/submission_listing.html | 8 +++----- 7 files changed, 29 insertions(+), 19 deletions(-) diff --git a/files/classes/submission.py b/files/classes/submission.py index 4b5a1e8d3d..4326a55e11 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -68,7 +68,7 @@ class Submission(Base): @property @lazy def comments(self): - return g.db.query(Comment.author_id, Comment.created_utc, Comment.id).filter_by(parent_submission=self.id) + return g.db.query(Comment.author_id, Comment.created_utc, Comment.id).filter(Submission.parent_submission == self.id, Submission.author_id.notin_((AUTOPOLLER_ID,AUTOBETTER_ID))) @property @lazy diff --git a/files/helpers/const.py b/files/helpers/const.py index 5976f5e6f7..1d7d67e8c1 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -141,7 +141,8 @@ if SITE == 'rdrama.net': AUTOPOLLER_ID = 6176 AUTOBETTER_ID = 7668 TAX_RECEIVER_ID = 995 - AUTO_UPVOTE_IDS = (2424,4245) + PIZZASHILL_ID = 2424 + HIL_ID = 4245 CRAT_ID = 747 IDIO_ID = 30 CARP_ID = 995 @@ -167,7 +168,8 @@ elif SITE == "pcmemes.net": AUTOPOLLER_ID = 3369 AUTOBETTER_ID = 1867 TAX_RECEIVER_ID = 1592 - AUTO_UPVOTE_IDS = () + PIZZASHILL_ID = 0 + HIL_ID = 0 CRAT_ID = 0 IDIO_ID = 0 CARP_ID = 0 @@ -193,7 +195,8 @@ else: AUTOPOLLER_ID = 6 AUTOBETTER_ID = 7 TAX_RECEIVER_ID = 8 - AUTO_UPVOTE_IDS = () + PIZZASHILL_ID = 0 + HIL_ID = 0 CRAT_ID = 0 IDIO_ID = 0 CARP_ID = 0 diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index 62bf6c4ff3..bb01f318eb 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -113,14 +113,14 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False): else: sanitized = re.sub('(^|\s|\n|

)\/?((r|u)\/\w{3,25})', r'\1\2', sanitized) - for i in re.finditer('(^|\s|\n|

)@((\w|-){1,25})', sanitized): + for i in re.finditer('(^|\s|\n|

)@((\w|-){1,25})($|\s|\n|<\p>)', sanitized): u = get_user(i.group(2), graceful=True) if u and (not g.v.any_block_exists(u) or g.v.admin_level > 1): if noimages: - sanitized = sanitized.replace(i.group(0), f'{i.group(1)}@{u.username}') + sanitized = sanitized.replace(i.group(0), f'{i.group(1)}@{u.username}{i.group(4)}') else: - sanitized = sanitized.replace(i.group(0), f'''{i.group(1)}@{u.username}'s profile picture@{u.username}''') + sanitized = sanitized.replace(i.group(0), f'''{i.group(1)}@{u.username}'s profile picture@{u.username}{i.group(4)}''') for i in re.finditer('https://i\.imgur\.com/(([^_]*?)\.(jpg|png|jpeg))', sanitized): diff --git a/files/routes/admin.py b/files/routes/admin.py index 65f8167ccb..a35f71f978 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -67,6 +67,11 @@ def distribute(v, comment): for option in post.bet_options: pool += option.upvotes pool *= 200 + autobetter = g.db.query(User).filter_by(id=AUTOBETTER_ID).one_or_none() + autobetter.coins -= pool + if autobetter.coins < 0: autobetter.coins = 0 + g.db.add(autobetter) + votes = g.db.query(CommentVote).filter_by(comment_id=comment) coinsperperson = int(pool / votes.count()) @@ -76,11 +81,6 @@ def distribute(v, comment): u.coins += coinsperperson add_notif(cid, u.id) - autobetter = g.db.query(User).filter_by(id=AUTOBETTER_ID).one_or_none() - autobetter.coins -= pool - if autobetter.coins < 0: return {"error": "Not enough coins in bool"}, 400 - g.db.add(autobetter) - cid = notif_comment(f"You lost the 200 coins you bet on [{post.permalink}]({post.permalink}) :marseylaugh:") cids = [x.id for x in post.bet_options] cids.remove(comment) diff --git a/files/routes/comments.py b/files/routes/comments.py index e4bbbf80b1..5c05d86ac0 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -513,7 +513,7 @@ def api_comment(v): c.voted = 1 - if v.id in AUTO_UPVOTE_IDS: + if v.id == PIZZASHILL_ID: autovote = CommentVote(user_id=CARP_ID, comment_id=c.id, vote_type=1) g.db.add(autovote) autovote = CommentVote(user_id=AEVANN_ID, comment_id=c.id, vote_type=1) @@ -525,6 +525,14 @@ def api_comment(v): g.db.add(v) c.upvotes += 3 g.db.add(c) + elif v.id == HIL_ID: + autovote = CommentVote(user_id=CARP_ID, comment_id=c.id, vote_type=1) + g.db.add(autovote) + v.coins += 1 + v.truecoins += 1 + g.db.add(v) + c.upvotes += 1 + g.db.add(c) g.db.commit() diff --git a/files/routes/posts.py b/files/routes/posts.py index 8f42777819..28b6700d81 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -1065,6 +1065,7 @@ def submit_post(v): title = url_match.group(5) if "Snapshots:\n\n" not in body: body += "Snapshots:\n\n" + if f'**[{title}]({href})**:\n\n' in body: continue body += f'**[{title}]({href})**:\n\n' if href.startswith('https://old.reddit.com/'): body += f'* [unddit.com](https://unddit.com/{href.replace("https://old.reddit.com/", "")})\n' @@ -1107,7 +1108,7 @@ def submit_post(v): send_discord_message(f"https://{site}{new_post.permalink}") cache.delete_memoized(changeloglist) - if v.id in AUTO_UPVOTE_IDS: + if v.id in (PIZZASHILL_ID, HIL_ID): autovote = Vote(user_id=CARP_ID, submission_id=new_post.id, vote_type=1) g.db.add(autovote) autovote = Vote(user_id=AEVANN_ID, submission_id=new_post.id, vote_type=1) diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 0734877a34..b92c476c9e 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -63,11 +63,9 @@ {% for p in listing %} {% set ups=p.upvotes %} From f20c8ae2a4bde4fe3959d931370691574e0a0d4a Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 17 Jan 2022 13:50:03 +0200 Subject: [PATCH 04/24] bbb --- files/helpers/sanitize.py | 2 +- files/routes/login.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index bb01f318eb..6cc40ea5d8 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -113,7 +113,7 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False): else: sanitized = re.sub('(^|\s|\n|

)\/?((r|u)\/\w{3,25})', r'\1\2', sanitized) - for i in re.finditer('(^|\s|\n|

)@((\w|-){1,25})($|\s|\n|<\p>)', sanitized): + for i in re.finditer('(^|\s|\n|

)@((\w|-){1,25})($|\s|\n|<\\p>)', sanitized): u = get_user(i.group(2), graceful=True) if u and (not g.v.any_block_exists(u) or g.v.admin_level > 1): diff --git a/files/routes/login.py b/files/routes/login.py index bdeb5b44e0..ff479a9ec0 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -14,7 +14,7 @@ def login_get(v): redir = request.values.get("redirect") if redir: - redir = replace("/logged_out", "").strip() + redir = redir.replace("/logged_out", "").strip() if not redir.startswith(request.host_url) and not redir.startswith('/'): redir = None if v and redir: return redirect(redir) @@ -142,7 +142,7 @@ def login_post(): redir = request.values.get("redirect") if redir: - redir = replace("/logged_out", "").strip() + redir = redir.replace("/logged_out", "").strip() if not redir.startswith(request.host_url) and not redir.startswith('/'): redir = '/' return redirect(redir) From b95b401d7e0dc5bb8114fe84bbb630b02ea2db98 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 17 Jan 2022 13:51:03 +0200 Subject: [PATCH 05/24] bbb --- files/helpers/sanitize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index 6cc40ea5d8..ae260232f9 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -113,7 +113,7 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False): else: sanitized = re.sub('(^|\s|\n|

)\/?((r|u)\/\w{3,25})', r'\1\2', sanitized) - for i in re.finditer('(^|\s|\n|

)@((\w|-){1,25})($|\s|\n|<\\p>)', sanitized): + for i in re.finditer('(^|\s|\n|

)@((\w|-){1,25})($|\s|\n|

)', sanitized): u = get_user(i.group(2), graceful=True) if u and (not g.v.any_block_exists(u) or g.v.admin_level > 1): From 8f6c0bf457f96fe25e825d0a68e8d0fc88fba1cf Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 17 Jan 2022 14:06:26 +0200 Subject: [PATCH 06/24] fdf --- files/routes/front.py | 16 +++++- files/routes/users.py | 6 ++- files/templates/home_comments.html | 82 +++++++++++++++--------------- 3 files changed, 60 insertions(+), 44 deletions(-) diff --git a/files/routes/front.py b/files/routes/front.py index a8f3cc0355..f7a87f0294 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -462,4 +462,18 @@ def all_comments(v): idlist = idlist[:25] if request.headers.get("Authorization"): return {"data": [x.json for x in comments]} - return render_template("home_comments.html", v=v, sort=sort, t=t, page=page, comments=comments, standalone=True, next_exists=next_exists) \ No newline at end of file + return render_template("home_comments.html", v=v, sort=sort, t=t, page=page, comments=comments, standalone=True, next_exists=next_exists) + + +@app.get("/transfers") +@auth_required +def transfers(v): + + page = int(request.values.get("page", 1)) + + comments = g.db.query(Comment).filter(Comment.author_id == NOTIFICATIONS_ID, Comment.parent_submission == None, Comment.distinguish_level == 6, Comment.body_html.like("% has transferred %"), Comment.created_utc == 0).offset(25 * (page - 1)).limit(26).all() + + next_exists = len(comments) > 25 + comments = comments[:25] + + return render_template("home_comments.html", v=v, page=page, comments=comments, standalone=True, next_exists=next_exists) \ No newline at end of file diff --git a/files/routes/users.py b/files/routes/users.py index b5f3895862..142ba995b2 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -244,11 +244,13 @@ def transfer_coins(v, username): tax = math.ceil(amount*0.03) tax_receiver = g.db.query(User).filter_by(id=TAX_RECEIVER_ID).one_or_none() tax_receiver.coins += tax - log_message = f"[@{v.username}](/id/{v.id}) has transferred {amount} {app.config['COINS_NAME']} to [@{receiver.username}]({receiver.id})" - send_repeatable_notification(TAX_RECEIVER_ID, log_message) g.db.add(tax_receiver) else: tax = 0 + if TAX_RECEIVED_ID: + log_message = f"[@{v.username}](/id/{v.id}) has transferred {amount} {app.config['COINS_NAME']} to [@{receiver.username}]({receiver.id})" + send_repeatable_notification(TAX_RECEIVER_ID, log_message) + receiver.coins += amount-tax v.coins -= amount send_repeatable_notification(receiver.id, f"🤑 [@{v.username}](/id/{v.id}) has gifted you {amount-tax} {app.config['COINS_NAME']}!") diff --git a/files/templates/home_comments.html b/files/templates/home_comments.html index ceb3bc2084..018d90e2f6 100644 --- a/files/templates/home_comments.html +++ b/files/templates/home_comments.html @@ -4,54 +4,54 @@ {% block sortnav %}{% endblock %} {% block content %} - 

-	

+	{% if request.path != '/transfers' %}
+		

 
-		

-			
‎

-			

-				
-				

-					{% if t !="hour" %}Hour{% endif %}
-					{% if t !="day" %}Day{% endif %}
-					{% if t !="week" %}Week{% endif %}
-					{% if t !="month" %}Month{% endif %}
-					{% if t !="year" %}Year{% endif %}
-					{% if t !="all" %}All{% endif %}
+			

+				
‎

+				

+					
+					

+						{% if t !="hour" %}Hour{% endif %}
+						{% if t !="day" %}Day{% endif %}
+						{% if t !="week" %}Week{% endif %}
+						{% if t !="month" %}Month{% endif %}
+						{% if t !="year" %}Year{% endif %}
+						{% if t !="all" %}All{% endif %}
+					

 				

-			

 
-			
‎

-			

-				
-				

-					{% if sort != "top" %}Top{% endif %}
-					{% if sort != "bottom" %}Bottom{% endif %}
-					{% if sort != "new" %}New{% endif %}
-					{% if sort != "old" %}Old{% endif %}
-					{% if sort != "controversial" %}Controversial{% endif %}
+				
‎

+				

+					
+					

+						{% if sort != "top" %}Top{% endif %}
+						{% if sort != "bottom" %}Bottom{% endif %}
+						{% if sort != "new" %}New{% endif %}
+						{% if sort != "old" %}Old{% endif %}
+						{% if sort != "controversial" %}Controversial{% endif %}
+					

 				

 			

 		

-	

-
+	{% endif %}
 
 	

 

From dcdafd305b19bf3b8da4a1c9c2d945a2972469c0 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Mon, 17 Jan 2022 14:07:50 +0200
Subject: [PATCH 07/24] fgfg\

---
 files/routes/admin.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/routes/admin.py b/files/routes/admin.py
index a35f71f978..19f12588cd 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -58,6 +58,9 @@ def remove_admin(v, username):
 @limiter.limit("1/second;30/minute;200/hour;1000/day")
 @admin_level_required(3)
 def distribute(v, comment):
+	autobetter = g.db.query(User).filter_by(id=AUTOBETTER_ID).one_or_none()
+	if autobetter.coins == 0: return {"error": "@AutoBetter has 0 coins"}
+
 	try: comment = int(comment)
 	except: abort(400)
 	post = g.db.query(Comment.parent_submission).filter_by(id=comment).one_or_none()[0]
@@ -67,7 +70,6 @@ def distribute(v, comment):
 	for option in post.bet_options: pool += option.upvotes
 	pool *= 200
 
-	autobetter = g.db.query(User).filter_by(id=AUTOBETTER_ID).one_or_none()
 	autobetter.coins -= pool
 	if autobetter.coins < 0: autobetter.coins = 0
 	g.db.add(autobetter)

From dd4b82cd2ab5986d0b3d06ce303ad5937b0017ba Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Mon, 17 Jan 2022 14:23:09 +0200
Subject: [PATCH 09/24] b

---
 files/templates/authforms.html          | 4 ++--
 files/templates/default.html            | 4 ++--
 files/templates/log.html                | 4 ++--
 files/templates/login.html              | 2 +-
 files/templates/login_2fa.html          | 2 +-
 files/templates/settings.html           | 2 +-
 files/templates/settings2.html          | 4 ++--
 files/templates/sign_up.html            | 2 +-
 files/templates/sign_up_failed_ref.html | 2 +-
 files/templates/submission_listing.html | 5 +++++
 files/templates/submit.html             | 4 ++--
 11 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index 5645ac9048..8b504bda97 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -15,7 +15,7 @@
 
 		{% if v %}
 			
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 		{% endif %}
 
 
diff --git a/files/templates/default.html b/files/templates/default.html
index dca273a80a..1075cd4e04 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -7,7 +7,7 @@
 	
 	{% if v %}
 		
-		
+		
 		
 		{% if v.agendaposter %}
 			
-		
+		
 	{% endif %}
 
 	
diff --git a/files/templates/log.html b/files/templates/log.html
index 6ad865e599..d121177cb4 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -6,7 +6,7 @@
 {% block content %}
 {% if v %}
 	
-	
+	
 	{% if v.agendaposter %}
 		
-	
+	
 {% endif %}
 
 

diff --git a/files/templates/login.html b/files/templates/login.html
index b8cb6d9f54..c9c85428ed 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -18,7 +18,7 @@
 	{% endblock %}
 	
 	
-	
+	
 	
 
 
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index dd6f064ad1..f07db536d9 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -14,7 +14,7 @@
 		2-Step Login - {{SITE_NAME}}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index a394ad030f..c1f2ecb8bd 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -34,7 +34,7 @@
 
 
 	
-	
+	
 	{% if v.agendaposter %}
 		
-		
+		
 	{% else %}
 		
-		
+		
 	{% endif %}
 
 
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 56cd4596a8..c98019ce52 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -31,7 +31,7 @@
 		{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index a260ae1ddf..d6cb0b2152 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -32,7 +32,7 @@
 		{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index b92c476c9e..0c6cc48905 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -691,6 +691,11 @@
 		background: -webkit-linear-gradient(left, red, orange, yellow, green, blue, indigo, violet );
 		text-shadow:-1px -1px 0 black,1px -1px 0 black,-1px 1px 0 black,1px 1px 0 black;
 	}
+	@media (max-width: 767.98px) {
+		.post-actions .list-inline .list-inline-item {
+			margin-top: 5px;
+		}
+	}
 
 
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 1b54ec235b..8af04492e5 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -26,7 +26,7 @@
 		{% block stylesheets %}
 		{% if v %}
 			
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 			
 		{% endif %}
 		{% endblock %}

From 1a2f8f14b0f2383b90318e321dd37acd0f70eeaf Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Mon, 17 Jan 2022 14:27:16 +0200
Subject: [PATCH 10/24] bb

---
 files/templates/authforms.html          | 4 ++--
 files/templates/default.html            | 4 ++--
 files/templates/log.html                | 4 ++--
 files/templates/login.html              | 2 +-
 files/templates/login_2fa.html          | 2 +-
 files/templates/settings.html           | 2 +-
 files/templates/settings2.html          | 4 ++--
 files/templates/sign_up.html            | 2 +-
 files/templates/sign_up_failed_ref.html | 2 +-
 files/templates/submission_listing.html | 5 -----
 files/templates/submit.html             | 4 ++--
 11 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index 8b504bda97..d6d5998013 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -15,7 +15,7 @@
 
 		{% if v %}
 			
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 		{% endif %}
 
 
diff --git a/files/templates/default.html b/files/templates/default.html
index 1075cd4e04..bfbd2e07aa 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -7,7 +7,7 @@
 	
 	{% if v %}
 		
-		
+		
 		
 		{% if v.agendaposter %}
 			
-		
+		
 	{% endif %}
 
 	
diff --git a/files/templates/log.html b/files/templates/log.html
index d121177cb4..659b546bde 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -6,7 +6,7 @@
 {% block content %}
 {% if v %}
 	
-	
+	
 	{% if v.agendaposter %}
 		
-	
+	
 {% endif %}
 
 

diff --git a/files/templates/login.html b/files/templates/login.html
index c9c85428ed..e6641d4105 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -18,7 +18,7 @@
 	{% endblock %}
 	
 	
-	
+	
 	
 
 
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index f07db536d9..9a1990f8fd 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -14,7 +14,7 @@
 		2-Step Login - {{SITE_NAME}}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index c1f2ecb8bd..d1fc0cb448 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -34,7 +34,7 @@
 
 
 	
-	
+	
 	{% if v.agendaposter %}
 		
-		
+		
 	{% else %}
 		
-		
+		
 	{% endif %}
 
 
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index c98019ce52..ee86f7964d 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -31,7 +31,7 @@
 		{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index d6cb0b2152..9fc9d223a4 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -32,7 +32,7 @@
 		{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 0c6cc48905..b92c476c9e 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -691,11 +691,6 @@
 		background: -webkit-linear-gradient(left, red, orange, yellow, green, blue, indigo, violet );
 		text-shadow:-1px -1px 0 black,1px -1px 0 black,-1px 1px 0 black,1px 1px 0 black;
 	}
-	@media (max-width: 767.98px) {
-		.post-actions .list-inline .list-inline-item {
-			margin-top: 5px;
-		}
-	}
 
 
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 8af04492e5..775d38cd22 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -26,7 +26,7 @@
 		{% block stylesheets %}
 		{% if v %}
 			
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 			
 		{% endif %}
 		{% endblock %}

From d01d2f98e76f8de0206b21beda9474f53c78c0fc Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Mon, 17 Jan 2022 14:28:29 +0200
Subject: [PATCH 11/24] bb

---
 files/templates/authforms.html          | 4 ++--
 files/templates/default.html            | 4 ++--
 files/templates/log.html                | 4 ++--
 files/templates/login.html              | 2 +-
 files/templates/login_2fa.html          | 2 +-
 files/templates/settings.html           | 2 +-
 files/templates/settings2.html          | 4 ++--
 files/templates/sign_up.html            | 2 +-
 files/templates/sign_up_failed_ref.html | 2 +-
 files/templates/submit.html             | 4 ++--
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index d6d5998013..ee16c548b4 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -15,7 +15,7 @@
 
 		{% if v %}
 			
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 		{% endif %}
 
 
diff --git a/files/templates/default.html b/files/templates/default.html
index bfbd2e07aa..96a9c6ea60 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -7,7 +7,7 @@
 	
 	{% if v %}
 		
-		
+		
 		
 		{% if v.agendaposter %}
 			
-		
+		
 	{% endif %}
 
 	
diff --git a/files/templates/log.html b/files/templates/log.html
index 659b546bde..7232ecfd4e 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -6,7 +6,7 @@
 {% block content %}
 {% if v %}
 	
-	
+	
 	{% if v.agendaposter %}
 		
-	
+	
 {% endif %}
 
 

diff --git a/files/templates/login.html b/files/templates/login.html
index e6641d4105..74d131c341 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -18,7 +18,7 @@
 	{% endblock %}
 	
 	
-	
+	
 	
 
 
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index 9a1990f8fd..f49eb815b1 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -14,7 +14,7 @@
 		2-Step Login - {{SITE_NAME}}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index d1fc0cb448..a602b6e063 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -34,7 +34,7 @@
 
 
 	
-	
+	
 	{% if v.agendaposter %}
 		
-		
+		
 	{% else %}
 		
-		
+		
 	{% endif %}
 
 
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index ee86f7964d..a8cfefad9d 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -31,7 +31,7 @@
 		{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 9fc9d223a4..a1eaa24c94 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -32,7 +32,7 @@
 		{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 775d38cd22..6a8105d720 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -26,7 +26,7 @@
 		{% block stylesheets %}
 		{% if v %}
 			
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 			
 		{% endif %}
 		{% endblock %}

From 75f61024dbf0fd087413982ce822bc2cb93c043b Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Mon, 17 Jan 2022 14:44:16 +0200
Subject: [PATCH 12/24] bb

---
 files/templates/userpage.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 31ede85d44..0a1172bd79 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -170,6 +170,10 @@
 								Revert admin actions
 							{% endif %}
 						{% endif %}
+						
+						{% if '/comments' not in request.path %}
+							{% include "emoji_modal.html" %}
+						{% endif %}
 
 						

 							 
@@ -729,11 +733,6 @@
 	}
 
 
-
-{% if v %}
-	{% include "emoji_modal.html" %}
-{% endif %}
-
 {% endblock %}
 
 {% block GIFpicker %}

From eb7435321743569e17959b53d02ecacf2a540925 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Mon, 17 Jan 2022 14:45:24 +0200
Subject: [PATCH 13/24] bbb

---
 files/templates/userpage.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 0a1172bd79..7f5018470e 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -170,10 +170,6 @@
 								Revert admin actions
 							{% endif %}
 						{% endif %}
-						
-						{% if '/comments' not in request.path %}
-							{% include "emoji_modal.html" %}
-						{% endif %}
 
 						
 							 
@@ -733,6 +729,11 @@
 	}
 
 
+
+{% if v and v.id != u.id and '/comments' not in request.path %}
+	{% include "emoji_modal.html" %}
+{% endif %}
+
 {% endblock %}
 
 {% block GIFpicker %}

From 90d44999fc0d3214868e23e3914617f6a814c6a6 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Mon, 17 Jan 2022 14:48:43 +0200
Subject: [PATCH 14/24] bb

---
 files/templates/home.html     | 2 +-
 files/templates/userpage.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/templates/home.html b/files/templates/home.html
index 503c0fcb37..645eb45af8 100644
--- a/files/templates/home.html
+++ b/files/templates/home.html
@@ -170,7 +170,7 @@
 	
{{PUSHER_ID}}

 	
 	
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 7f5018470e..1011e92341 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -184,7 +184,7 @@
 							 
 							
 							 
-							
+							
 						
 
 						

@@ -473,7 +473,7 @@
 						 
 						
 						 
-						
+						
 					
 
 					


From c82bdaa4d3cdb4845d3f9319af2d7f26c1a00d6d Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Mon, 17 Jan 2022 15:09:11 +0200
Subject: [PATCH 15/24] f

---
 files/routes/votes.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/routes/votes.py b/files/routes/votes.py
index 5e8083aa0e..63940a1816 100644
--- a/files/routes/votes.py
+++ b/files/routes/votes.py
@@ -115,7 +115,7 @@ def api_vote_post(post_id, new, v):
 		g.db.flush()
 		post.upvotes = g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=1).count()
 		post.downvotes = g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=-1).count()
-		post.realupvotes = g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=1, real=True).count() - g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=1, real=False).count() + g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=-1).count()
+		post.realupvotes = g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=1, real=True).count() + g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=-1).count()
 		if post.author.progressivestack: post.realupvotes *= 2
 		g.db.add(post)
 		g.db.commit()
@@ -181,7 +181,7 @@ def api_vote_comment(comment_id, new, v):
 		g.db.flush()
 		comment.upvotes = g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=1).count()
 		comment.downvotes = g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=-1).count()
-		comment.realupvotes = g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=1, real=True).count() - g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=1, real=False).count() + g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=-1).count()
+		comment.realupvotes = g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=1, real=True).count() + g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=-1).count()
 		if comment.author.progressivestack: comment.realupvotes *= 2
 		g.db.add(comment)
 		g.db.commit()

From 82a30923c911fe403bc7c4385882bcd600a8baf3 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Mon, 17 Jan 2022 15:15:01 +0200
Subject: [PATCH 16/24] fff

---
 files/routes/votes.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/routes/votes.py b/files/routes/votes.py
index 63940a1816..79c6564a0c 100644
--- a/files/routes/votes.py
+++ b/files/routes/votes.py
@@ -102,7 +102,7 @@ def api_vote_post(post_id, new, v):
 		post.author.coins += 1
 		post.author.truecoins += 1
 		g.db.add(post.author)
-		real = (bool(v.profileurl) or bool(v.customtitle) or v.namecolor != defaultcolor) and not v.agendaposter and not v.shadowbanned
+		real = new == -1 or (not v.agendaposter and not v.shadowbanned and (bool(v.profileurl) or bool(v.customtitle) or v.namecolor != defaultcolor))
 		vote = Vote(user_id=v.id,
 					vote_type=new,
 					submission_id=post_id,
@@ -115,7 +115,7 @@ def api_vote_post(post_id, new, v):
 		g.db.flush()
 		post.upvotes = g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=1).count()
 		post.downvotes = g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=-1).count()
-		post.realupvotes = g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=1, real=True).count() + g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=-1).count()
+		post.realupvotes = g.db.query(Vote.id).filter_by(submission_id=post.id, real=True).count()
 		if post.author.progressivestack: post.realupvotes *= 2
 		g.db.add(post)
 		g.db.commit()
@@ -167,7 +167,7 @@ def api_vote_comment(comment_id, new, v):
 		comment.author.coins += 1
 		comment.author.truecoins += 1
 		g.db.add(comment.author)
-		real = (bool(v.profileurl) or bool(v.customtitle) or v.namecolor != defaultcolor) and not v.agendaposter and not v.shadowbanned
+		real = new == -1 or (not v.agendaposter and not v.shadowbanned and (bool(v.profileurl) or bool(v.customtitle) or v.namecolor != defaultcolor))
 		vote = CommentVote(user_id=v.id,
 						vote_type=new,
 						comment_id=comment_id,
@@ -181,7 +181,7 @@ def api_vote_comment(comment_id, new, v):
 		g.db.flush()
 		comment.upvotes = g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=1).count()
 		comment.downvotes = g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=-1).count()
-		comment.realupvotes = g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=1, real=True).count() + g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=-1).count()
+		comment.realupvotes = g.db.query(CommentVote.id).filter_by(comment_id=comment.id, real=True).count()
 		if comment.author.progressivestack: comment.realupvotes *= 2
 		g.db.add(comment)
 		g.db.commit()

From 678eafdb5847ee76f4d45d6a018371ffc21180f4 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Mon, 17 Jan 2022 15:20:05 +0200
Subject: [PATCH 17/24] bb

---
 files/templates/authforms.html          | 4 ++--
 files/templates/default.html            | 4 ++--
 files/templates/log.html                | 4 ++--
 files/templates/login.html              | 2 +-
 files/templates/login_2fa.html          | 2 +-
 files/templates/settings.html           | 2 +-
 files/templates/settings2.html          | 4 ++--
 files/templates/sign_up.html            | 2 +-
 files/templates/sign_up_failed_ref.html | 2 +-
 files/templates/submit.html             | 4 ++--
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index ee16c548b4..a5c27f1b01 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -15,7 +15,7 @@
 
 		{% if v %}
 			
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 		{% endif %}
 
 
diff --git a/files/templates/default.html b/files/templates/default.html
index 96a9c6ea60..9c87f8813e 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -7,7 +7,7 @@
 	
 	{% if v %}
 		
-		
+		
 		
 		{% if v.agendaposter %}
 			
-		
+		
 	{% endif %}
 
 	
diff --git a/files/templates/log.html b/files/templates/log.html
index 7232ecfd4e..7f840ed4ac 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -6,7 +6,7 @@
 {% block content %}
 {% if v %}
 	
-	
+	
 	{% if v.agendaposter %}
 		
-	
+	
 {% endif %}
 
 

diff --git a/files/templates/login.html b/files/templates/login.html
index 74d131c341..8347ddb64d 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -18,7 +18,7 @@
 	{% endblock %}
 	
 	
-	
+	
 	
 
 
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index f49eb815b1..489f34afbe 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -14,7 +14,7 @@
 		2-Step Login - {{SITE_NAME}}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index a602b6e063..a8e1ab3474 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -34,7 +34,7 @@
 
 
 	
-	
+	
 	{% if v.agendaposter %}
 		
-		
+		
 	{% else %}
 		
-		
+		
 	{% endif %}
 
 
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index a8cfefad9d..5d7aa6108e 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -31,7 +31,7 @@
 		{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index a1eaa24c94..8d0333c844 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -32,7 +32,7 @@
 		{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 6a8105d720..ffad4ca8a8 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -26,7 +26,7 @@
 		{% block stylesheets %}
 		{% if v %}
 			
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 			
 		{% endif %}
 		{% endblock %}

From a09ef26d52a1ba6236160cc610dbce86e544f917 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Mon, 17 Jan 2022 15:33:25 +0200
Subject: [PATCH 18/24] vccv

---
 files/templates/emoji_modal.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index f4a851b352..16d4bcfe45 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -29,6 +29,9 @@
 						
  • 
 							Flags
 						
    • 
+						
  • 
+							Zombie Wolf
+						
    • 
 						
  • 
 							Misc
 						
    • 
@@ -70,6 +73,9 @@
 						
    
 							
    
 						
    
+						
    
+							
    
+						
    
 						
    
 							
    
 						
    
@@ -80,7 +86,7 @@
 	
    
 
    
 
-
+
 
 
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 		{% endif %}
 
 
@@ -111,7 +111,7 @@
 
 										
    
 
-										cover
+										cover
 								
    
 
 						
    
diff --git a/files/templates/badges.html b/files/templates/badges.html
index 364ad22497..f244aab80b 100644
--- a/files/templates/badges.html
+++ b/files/templates/badges.html
@@ -21,7 +21,7 @@
 {% for k,v in badges.items() %}
 	
 		{{v['name']}}
-		{{v['name']}}
+		{{v['name']}}
 		{{v['description']}}
 	
 {% endfor %}
diff --git a/files/templates/comments.html b/files/templates/comments.html
index caa188b0e3..f488fc9a50 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -217,7 +217,7 @@
 				{% endif %}
 
 				@{{c.author.username}}'s profile picture{{c.author.username}}
-				{% if c.author.customtitle %}  {% if c.author.quadrant %}{{c.author.quadrant}} quadrant{% endif %}{{c.author.customtitle | safe}}{% endif %}
+				{% if c.author.customtitle %}  {% if c.author.quadrant %}{{c.author.quadrant}} quadrant{% endif %}{{c.author.customtitle | safe}}{% endif %}
 
 				{% if c.parent_comment_id and not standalone and level != 1 %}{{c.parent_comment.author.username}}{% endif %}
 
diff --git a/files/templates/default.html b/files/templates/default.html
index 9c87f8813e..53bbae16fd 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -7,7 +7,7 @@
 	
 	{% if v %}
 		
-		
+		
 		
 		{% if v.agendaposter %}
 			
-		
+		
 	{% endif %}
 
 	
diff --git a/files/templates/errors/400.html b/files/templates/errors/400.html
index 59eb6c9537..affade6b4e 100644
--- a/files/templates/errors/400.html
+++ b/files/templates/errors/400.html
@@ -10,7 +10,7 @@
 
    
 	
    
 	
    
-			:#marseybrainlet:
+			:#marseybrainlet:
 			
    
 			
    400 Bad Request
    
 			
    That request was bad and you should feel bad.
    
diff --git a/files/templates/errors/401.html b/files/templates/errors/401.html
index 59b2136e4e..595d662892 100644
--- a/files/templates/errors/401.html
+++ b/files/templates/errors/401.html
@@ -11,7 +11,7 @@
 	
    
 	
    
 
-		:#marseydead:
+		:#marseydead:
 		
    
 
 			
    401 Not Authorized
    
diff --git a/files/templates/errors/403.html b/files/templates/errors/403.html
index fddf735095..53f240390d 100644
--- a/files/templates/errors/403.html
+++ b/files/templates/errors/403.html
@@ -10,7 +10,7 @@
 
    
 	
    
 	
    
-		:#marseytroll:
+		:#marseytroll:
 		
    
 		
    403 Forbidden
    
 			
    YOU AREN'T WELCOME HERE GO AWAY
    
diff --git a/files/templates/errors/404.html b/files/templates/errors/404.html
index f59813e8cf..44941daf9e 100644
--- a/files/templates/errors/404.html
+++ b/files/templates/errors/404.html
@@ -10,7 +10,7 @@
 
    
 	
    
 	
    
-		:#marseyconfused
+		:#marseyconfused
 		
    
 		
    404 Page Not Found
    
 			
    Someone typed something wrong and it was probably you, please do better.
    
diff --git a/files/templates/errors/405.html b/files/templates/errors/405.html
index 3e20bfe699..cc4188bb1d 100644
--- a/files/templates/errors/405.html
+++ b/files/templates/errors/405.html
@@ -10,7 +10,7 @@
 
    
 	
    
 	
    
-		:#marseyretard:
+		:#marseyretard:
 		
    
 		
    405 Method Not Allowed
    
 			
    idk how anyone gets this error but if you see this, remember to follow @carpathianflorist
    the original error text here talked about internet gremlins and wtf
    
diff --git a/files/templates/errors/429.html b/files/templates/errors/429.html
index 868f48c3d9..4640474288 100644
--- a/files/templates/errors/429.html
+++ b/files/templates/errors/429.html
@@ -10,7 +10,7 @@
 
    
 	
    
 	
    
-		:#marseyrentfree:
+		:#marseyrentfree:
 		
    
 		
    429 Too Many Requests
    
 			
    go spam somewhere else nerd
    
diff --git a/files/templates/errors/500.html b/files/templates/errors/500.html
index 2f65d07cbe..1dadf2894d 100644
--- a/files/templates/errors/500.html
+++ b/files/templates/errors/500.html
@@ -10,7 +10,7 @@
 
    
 	
    
 		
    
-			:#marseydead:
+			:#marseydead:
 			
    
 			
    500 Internal Server Error
    
 			
    Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page but not other pages, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to fix it. Don't bother them. Thanks ily <3
    
diff --git a/files/templates/errors/nsfw.html b/files/templates/errors/nsfw.html
index 8d17a7ccbc..60c9a55517 100644
--- a/files/templates/errors/nsfw.html
+++ b/files/templates/errors/nsfw.html
@@ -10,7 +10,7 @@
 
    
 	
    
 		
    
-			:#marseytwerking:
+			:#marseytwerking:
 			
    Are you over 18?
    
 			
    This post is rated +18 (Adult-Only). You must be 18 or older to continue. Are you sure you want to proceed?
    
 			
    
diff --git a/files/templates/errors/patron.html b/files/templates/errors/patron.html
index 293decc79c..0088eea1ee 100644
--- a/files/templates/errors/patron.html
+++ b/files/templates/errors/patron.html
@@ -10,7 +10,7 @@
 
    
 	
    
 	
    
-			:#marseymerchant:
+			:#marseymerchant:
 			
    401 Not Authorized
    
 			
    This page is only available to {% if request.host == "rdrama.net" %}paypigs{% else %}patrons{% endif %}:
    
 			{{'GUMROAD_LINK' | app_config}}
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index bcbd977055..812b269d90 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -69,22 +69,22 @@ You can use Markdown formatting:
 		
 			Emojis
 			:marseylove:
-			:marseylove:
+			:marseylove:
 		
 		
 			Mirrored Emojis
 			:!marseylove:
-			:!marseylove:
+			:!marseylove:
 		
 		
 			Large Emojis
 			:#marseylove:
-			:!marseylove:
+			:!marseylove:
 		
 		
 			Large Mirroed Emojis
 			:#!marseylove:
-			:!marseylove:
+			:!marseylove:
 		
 		
 			Poll Options
diff --git a/files/templates/header.html b/files/templates/header.html
index 907fcb796f..c947525ff2 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -10,7 +10,7 @@
 				
 					header icon
 					{% if request.host != 'pcmemes.net' %}
-						logo
+						logo
 					{% endif %}
 				
 			
    
diff --git a/files/templates/log.html b/files/templates/log.html
index 7f840ed4ac..33c4d1b916 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -6,7 +6,7 @@
 {% block content %}
 {% if v %}
 	
-	
+	
 	{% if v.agendaposter %}
 		
-	
+	
 {% endif %}
 
 
    
@@ -56,10 +56,10 @@
 						
    
 
 							
 							
    
-								avatarAll
+								avatarAll
 								{% for a in admins %}
 									avatar{{a}}
 								{% endfor %}
diff --git a/files/templates/login.html b/files/templates/login.html
index 8347ddb64d..37dc3c0b07 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -18,7 +18,7 @@
 	{% endblock %}
 	
 	
-	
+	
 	
 
 
@@ -117,7 +117,7 @@
 
 								
    
 
-								cover
+								cover
 						
    
 
 				
    
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index 489f34afbe..20af269c0b 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -14,7 +14,7 @@
 		2-Step Login - {{SITE_NAME}}
 
 		
-		
+		
 
 
 
@@ -94,7 +94,7 @@
 
 						
    
 
-						cover
+						cover
 				
    
 
 		
    
diff --git a/files/templates/marseys.html b/files/templates/marseys.html
index f9868c2d52..7332d912d0 100644
--- a/files/templates/marseys.html
+++ b/files/templates/marseys.html
@@ -19,7 +19,7 @@
 	
 		{{loop.index}}
 		{{k[0]}}
-		:{{k[0]}}:
+		:{{k[0]}}:
 		{{k[2]}}
 		{% if k[1] in ('anton-d','unknown') %}{{k[1]}}{% else %}@{{k[1]}}'s profile picture{{k[1]}}{% endif %}
 	
diff --git a/files/templates/patrons.html b/files/templates/patrons.html
index be02a72370..e2e36ab0cd 100644
--- a/files/templates/patrons.html
+++ b/files/templates/patrons.html
@@ -14,7 +14,7 @@
 		{{loop.index}}
 		@{{u.username}}'s profile picture{{u.username}}
 
-		Patron-{{u.patron}}
+		Patron-{{u.patron}}
 	
 {% endfor %}
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index a8e1ab3474..f3cb88500c 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -34,7 +34,7 @@
 
 
 	
-	
+	
 	{% if v.agendaposter %}
 		
-		
+		
 	{% else %}
 		
-		
+		
 	{% endif %}
 
 
diff --git a/files/templates/sidebar_Drama.html b/files/templates/sidebar_Drama.html
index 984236bd0f..90128ab051 100644
--- a/files/templates/sidebar_Drama.html
+++ b/files/templates/sidebar_Drama.html
@@ -1,6 +1,6 @@
 
    
 
-    {% set image = "/static/assets/images/" + SITE_NAME + "/banners/" + range(1,num_banners)|random()|string + ".webp?a=9" %}
+    {% set image = "/static/assets/images/" + SITE_NAME + "/banners/" + range(1,num_banners)|random()|string + ".webp?a=10" %}
 
     
         
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 5d7aa6108e..60d4e990cc 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -31,7 +31,7 @@
 		{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}
 
 		
-		
+		
 
 
 
@@ -146,7 +146,7 @@
 
 								
    
 
-								cover
+								cover
 						
    
 
 				
    
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 8d0333c844..49af3aacd8 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -32,7 +32,7 @@
 		{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}
 
 		
-		
+		
 
 
 
@@ -84,7 +84,7 @@
 
 										
    
 
-										cover
+										cover
 								
    
 
 						
    
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 62afd65500..ac2bfec046 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -44,7 +44,7 @@
 	
    
 		
 			
-				:#marseywholesome:
+				:#marseywholesome:
 			
 		
 	
    
@@ -53,7 +53,7 @@
 {% if p.award_count("wholesome") > 1 %}
 	
 		
-			:#marseywholesome:
+			:#marseywholesome:
 		
 	
 {% endif %}
@@ -61,7 +61,7 @@
 {% if p.award_count("wholesome") > 2 %}
 	
 		
-			:#marseywholesome:
+			:#marseywholesome:
 		
 	
 {% endif %}
@@ -69,7 +69,7 @@
 {% if p.award_count("wholesome") > 3 %}
 	
 		
-			:#marseywholesome:
+			:#marseywholesome:
 		
 	
 {% endif %}
@@ -106,25 +106,25 @@
 	
 
 	
-		:#marseytrain:
+		:#marseytrain:
 	
 {% endif %}
 
 {% if p.award_count("train") > 1 %}
 	
-		:#marseytrain:
+		:#marseytrain:
 	
 {% endif %}
 
 {% if p.award_count("train") > 2 %}
 	
-		:#marseytrain:
+		:#marseytrain:
 	
 {% endif %}
 
 {% if p.award_count("train") > 3 %}
 	
-		:#marseytrain:
+		:#marseytrain:
 	
 {% endif %}
 
@@ -355,7 +355,7 @@
 						{% if p.active_flags %}    {{p.active_flags}} Reports{% endif %}
 						{% if p.author.verified %}
 						{% endif %}
-						@{{p.author.username}}'s profile picture{{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %}
+						@{{p.author.username}}'s profile picture{{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %}
 						 {{p.age_string}}
 						({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %})
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index b92c476c9e..d4ab864f32 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -133,7 +133,7 @@
 
 			
    
 				{% if p.club and not (v and (v.paid_dues or v.id == p.author_id)) %}
-					post thumnail
+					post thumnail
 				{% elif not p.url %}
 					
 						post thumnail
@@ -189,7 +189,7 @@
 				{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
 				{% if p.author.verified %}
 				{% endif %}
-				@{{p.author.profile_url}}'s profile picture{{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %}
+				@{{p.author.profile_url}}'s profile picture{{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %}
 				 {{p.age_string}}
 				 
 				({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %})
diff --git a/files/templates/submit.html b/files/templates/submit.html
index ffad4ca8a8..edb069aba4 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -26,7 +26,7 @@
 		{% block stylesheets %}
 		{% if v %}
 			
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 			
 		{% endif %}
 		{% endblock %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 1011e92341..cc72758f49 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -95,7 +95,7 @@
 					
     
 				
    
 
-				{% if u.customtitle %}
    {% if u.quadrant %}{{u.quadrant}} quadrant{% endif %}{{u.customtitle | safe}}
    
+				{% if u.customtitle %}
    {% if u.quadrant %}{{u.quadrant}} quadrant{% endif %}{{u.customtitle | safe}}
    
 				{% else %}
    
 				{% endif %}
 
@@ -368,7 +368,7 @@
 				{% if v and v.has_follower(u) and not v.is_nofollow %}
 					Follows you
 				{% endif %}
-				{% if u.customtitle %}
    {% if u.quadrant %}@{{u.quadrant}} quadrant{% endif %}{{u.customtitle | safe}}
    
+				{% if u.customtitle %}
    {% if u.quadrant %}@{{u.quadrant}} quadrant{% endif %}{{u.customtitle | safe}}
    
 				{% else %}
 					
    
 				{% endif %}

From 06aeb49e071a74cf3c98f43133a2f0dc0ae624d2 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Mon, 17 Jan 2022 17:04:23 +0200
Subject: [PATCH 23/24] b

---
 files/routes/users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/routes/users.py b/files/routes/users.py
index 142ba995b2..bc95ec608d 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -247,7 +247,7 @@ def transfer_coins(v, username):
 			g.db.add(tax_receiver)
 		else: tax = 0
 
-		if TAX_RECEIVED_ID:
+		if TAX_RECEIVER_ID:
 			log_message = f"[@{v.username}](/id/{v.id}) has transferred {amount} {app.config['COINS_NAME']} to [@{receiver.username}]({receiver.id})"
 			send_repeatable_notification(TAX_RECEIVER_ID, log_message)
 

From 21eb20c9dfca9712348495d15b828c16db1d1c45 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Mon, 17 Jan 2022 17:13:35 +0200
Subject: [PATCH 24/24] bb

---
 files/routes/comments.py | 48 +++++++++++++++++++++-------------------
 files/routes/users.py    |  6 ++---
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/files/routes/comments.py b/files/routes/comments.py
index 5c05d86ac0..ef3534d287 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -467,32 +467,34 @@ def api_comment(v):
 
 		if parent.author.id != v.id:
 			if len(c.body) > 500: notifbody = c.body[:500] + '...'
-			elif c.body: notifbody = c.body
-			else: notifbody = ''
+			else: notifbody = c.body
 
-			beams_client.publish_to_interests(
-				interests=[f'{request.host}{parent.author.id}'],
-				publish_body={
-				'web': {
-					'notification': {
-						'title': f'New reply by @{v.username}',
-						'body': notifbody,
-						'deep_link': f'https://{site}/comment/{c.id}?context=9&read=true#context',
-						'icon': f'https://{request.host}/assets/images/{SITE_NAME}/icon.webp',
-					}
-				},
-				'fcm': {
-					'notification': {
-						'title': f'New reply by @{v.username}',
-						'body': notifbody,
+			try:
+				beams_client.publish_to_interests(
+					interests=[f'{request.host}{parent.author.id}'],
+					publish_body={
+					'web': {
+						'notification': {
+							'title': f'New reply by @{v.username}',
+							'body': notifbody,
+							'deep_link': f'https://{site}/comment/{c.id}?context=9&read=true#context',
+							'icon': f'https://{request.host}/assets/images/{SITE_NAME}/icon.webp',
+						}
 					},
-					'data': {
-						'url': f'comment/{c.id}?context=9&read=true#context',
+					'fcm': {
+						'notification': {
+							'title': f'New reply by @{v.username}',
+							'body': notifbody,
+						},
+						'data': {
+							'url': f'comment/{c.id}?context=9&read=true#context',
+						}
 					}
-				}
-				},
-			)
-
+					},
+				)
+			except Exception as e:
+				print(e)
+				print(c.id)
 
 
 	vote = CommentVote(user_id=v.id,
diff --git a/files/routes/users.py b/files/routes/users.py
index bc95ec608d..b8580474ea 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -437,8 +437,7 @@ def message2(v, username):
 	g.db.add(notif)
 
 	if len(message) > 500: notifbody = message[:500] + '...'
-	elif message: notifbody = message
-	else: notifbody = ''
+	else: notifbody = message
 
 	beams_client.publish_to_interests(
 		interests=[f'{request.host}{user.id}'],
@@ -505,8 +504,7 @@ def messagereply(v):
 		g.db.add(notif)
 
 		if len(message) > 500: notifbody = message[:500] + '...'
-		elif message: notifbody = message
-		else: notifbody = ''
+		else: notifbody = message
 		
 		beams_client.publish_to_interests(
 			interests=[f'{request.host}{user_id}'],