From 0cbd70a8d6daf4b25a7616f717ff0657e2b3ea72 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 24 Apr 2022 22:39:37 +0200 Subject: [PATCH] fad --- files/routes/comments.py | 4 ++-- files/routes/posts.py | 4 ++-- files/routes/settings.py | 8 ++++---- files/routes/static.py | 42 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 49 insertions(+), 9 deletions(-) diff --git a/files/routes/comments.py b/files/routes/comments.py index b7bf61c8b..2da7d2c5b 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -204,7 +204,7 @@ def api_comment(v): if not body and not request.files.get('file'): return {"error":"You need to actually write something!"}, 400 - body = image_regex.sub(r'\1![](\2)\3', body) + body = image_regex.sub(r'\1![](\2)\4', body) options = [] for i in poll_regex.finditer(body): @@ -694,7 +694,7 @@ def edit_comment(cid, v): elif v.bird and len(body) > 140: return {"error":"You have to type less than 140 characters!"}, 403 - body = image_regex.sub(r'\1![](\2)\3', body) + body = image_regex.sub(r'\1![](\2)\4', body) if v.agendaposter and not v.marseyawarded: body = torture_ap(body, v.username) diff --git a/files/routes/posts.py b/files/routes/posts.py index 7a03acacc..02b851039 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -474,7 +474,7 @@ def edit_post(pid, v): else: return {"error": "Image/Video files only"}, 400 if body != p.body: - body = image_regex.sub(r'\1![](\2)\3', body) + body = image_regex.sub(r'\1![](\2)\4', body) if v.id == p.author_id and v.agendaposter and not v.marseyawarded: body = torture_ap(body, v.username) @@ -1054,7 +1054,7 @@ def submit_post(v, sub=None): if len(url) > 2048: return error("There's a 2048 character limit for URLs.") - body = image_regex.sub(r'\1![](\2)\3', body) + body = image_regex.sub(r'\1![](\2)\4', body) if v and v.admin_level > 2: bet_options = [] diff --git a/files/routes/settings.py b/files/routes/settings.py index b1f16ae5e..e4fce3f5b 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -136,7 +136,7 @@ def settings_profile_post(v): elif (v.patron or v.id == MOOSE_ID) and request.values.get("sig"): sig = request.values.get("sig")[:200] - sig = image_regex.sub(r'\1![](\2)\3', sig) + sig = image_regex.sub(r'\1![](\2)\4', sig) sig_html = sanitize(sig) @@ -159,7 +159,7 @@ def settings_profile_post(v): elif request.values.get("friends"): friends = request.values.get("friends")[:500] - friends = image_regex.sub(r'\1![](\2)\3', friends) + friends = image_regex.sub(r'\1![](\2)\4', friends) friends_html = sanitize(friends) @@ -188,7 +188,7 @@ def settings_profile_post(v): elif request.values.get("enemies"): enemies = request.values.get("enemies")[:500] - enemies = image_regex.sub(r'\1![](\2)\3', enemies) + enemies = image_regex.sub(r'\1![](\2)\4', enemies) enemies_html = sanitize(enemies) @@ -217,7 +217,7 @@ def settings_profile_post(v): elif request.values.get("bio") or request.files.get('file') and request.headers.get("cf-ipcountry") != "T1": bio = request.values.get("bio")[:1500] - bio = image_regex.sub(r'\1![](\2)\3', bio) + bio = image_regex.sub(r'\1![](\2)\4', bio) if request.files.get('file'): file = request.files['file'] diff --git a/files/routes/static.py b/files/routes/static.py index b2ddaeb72..458ea1dd3 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -88,6 +88,26 @@ def stats(): vampires = g.db.query(User.id).filter(User.house.like('Vampire%')).count() racists = g.db.query(User.id).filter(User.house.like('Racist%')).count() + furries2 = g.db.query(User.id).filter(User.house == 'Furry Founder').count() + femboys2 = g.db.query(User.id).filter(User.house == 'Femboy Founder').count() + vampires2 = g.db.query(User.id).filter(User.house == 'Vampire Founder').count() + racists2 = g.db.query(User.id).filter(User.house == 'Racist Founder').count() + + furries3 = g.db.query(func.sum(User.truecoins)).filter(User.house.like('Furry%')).scalar() + femboys3 = g.db.query(func.sum(User.truecoins)).filter(User.house.like('Femboy%')).scalar() + vampires3 = g.db.query(func.sum(User.truecoins)).filter(User.house.like('Vampire%')).scalar() + racists3 = g.db.query(func.sum(User.truecoins)).filter(User.house.like('Racist%')).scalar() + + furries4 = g.db.query(func.sum(User.post_count)).filter(User.house.like('Furry%')).scalar() + femboys4 = g.db.query(func.sum(User.post_count)).filter(User.house.like('Femboy%')).scalar() + vampires4 = g.db.query(func.sum(User.post_count)).filter(User.house.like('Vampire%')).scalar() + racists4 = g.db.query(func.sum(User.post_count)).filter(User.house.like('Racist%')).scalar() + + furries5 = g.db.query(func.sum(User.comment_count)).filter(User.house.like('Furry%')).scalar() + femboys5 = g.db.query(func.sum(User.comment_count)).filter(User.house.like('Femboy%')).scalar() + vampires5 = g.db.query(func.sum(User.comment_count)).filter(User.house.like('Vampire%')).scalar() + racists5 = g.db.query(func.sum(User.comment_count)).filter(User.house.like('Racist%')).scalar() + return {"marseys": g.db.query(Marsey.name).count(), "users": g.db.query(User.id).count(), "private users": g.db.query(User.id).filter_by(is_private=True).count(), @@ -119,7 +139,27 @@ def stats(): "House furry members": furries, "House femboy members": femboys, "House vampire members": vampires, - "House racist members": racists + "House racist members": racists, + + "House furry founders": furries2, + "House femboy founders": femboys2, + "House vampire founders": vampires2, + "House racist founders": racists2, + + "House furry total truescore": furries3, + "House femboy total truescore": femboys3, + "House vampire total truescore": vampires3, + "House racist total truescore": racists3, + + "House furry total posts": furries4, + "House femboy total posts": femboys4, + "House vampire total posts": vampires4, + "House racist total posts": racists4, + + "House furry total comments": furries5, + "House femboy total comments": femboys5, + "House vampire total comments": vampires5, + "House racist total comments": racists5, } @app.get("/chart")