diff --git a/files/helpers/const.py b/files/helpers/const.py index 642e3b9e5..0429a6f65 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -149,7 +149,7 @@ AWARDS = { "grass": { "kind": "grass", "title": "Grass", - "description": "Ban the recipient for 30 days (if they provide a timestamped picture of them touching grass/snow/sand/ass to the admins, they will get unbanned immediately)", + "description": "Doesn't do anything", "icon": "fas fa-seedling", "color": "text-success", "price": 10000 diff --git a/files/routes/awards.py b/files/routes/awards.py index feaaa510c..ac148b847 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -182,12 +182,6 @@ def award_post(pid, v): author.is_banned = 0 author.ban_evade = 0 send_repeatable_notification(author.id, "You have been unbanned!") - elif kind == "grass": - author.is_banned = AUTOJANNY_ID - author.ban_reason = f"grass award used by @{v.username} on /post/{post.id}" - author.unban_utc = int(time.time()) + 30 * 86400 - link = f"[this post]({post.shortlink})" - send_repeatable_notification(author.id, f"Your account has been banned permanently for {link}. You must [provide the admins](/contact) a timestamped picture of you touching grass/snow/sand/ass to get unbanned!") elif kind == "pin": if post.stickied and post.stickied_utc: post.stickied_utc += 3600 @@ -291,12 +285,6 @@ def award_comment(cid, v): author.is_banned = 0 author.ban_evade = 0 send_repeatable_notification(author.id, "You have been unbanned!") - elif kind == "grass": - author.is_banned = AUTOJANNY_ID - author.ban_reason = f"grass award used by @{v.username} on /comment/{c.id}" - author.unban_utc = int(time.time()) + 30 * 86400 - link = f"[this comment]({c.shortlink})" - send_repeatable_notification(author.id, f"Your account has been banned permanently for {link}. You must [provide the admins](/contact) a timestamped picture of you touching grass/snow/sand/ass to get unbanned!") elif kind == "pin": if c.is_pinned and c.is_pinned_utc: c.is_pinned_utc += 3600 else: diff --git a/files/routes/users.py b/files/routes/users.py index bc101019a..9be784ef9 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -156,10 +156,6 @@ def downvoters_comments(v, username, uid): return render_template("voted_comments.html", next_exists=next_exists, listing=listing, page=page, v=v, standalone=True) - - - - @app.get("/@/upvoting//posts") @admin_level_required(3) def upvoting_posts(v, username, uid): @@ -243,18 +239,6 @@ def downvoting_comments(v, username, uid): return render_template("voted_comments.html", next_exists=next_exists, listing=listing, page=page, v=v, standalone=True) - - - - -@app.get("/grassed") -@auth_required -def grassed(v): - users = g.db.query(User).filter(User.ban_reason.like('grass award used by @%')).all() - - return render_template("grassed.html", v=v, users=users) - - @app.get("/@/upvoters") @admin_level_required(3) def upvoters(v, username): diff --git a/files/templates/grassed.html b/files/templates/grassed.html deleted file mode 100644 index c57fb176d..000000000 --- a/files/templates/grassed.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "settings2.html" %} - -{% block content %} -
- - - - - - - - -{% for user in users %} - - - - - -{% endfor %} -
#NameGrasser
{{loop.index}}{{user.username}}{{user.ban_reason.split('by ')[1]}}
- -{% endblock %}