diff --git a/files/classes/mod_logs.py b/files/classes/mod_logs.py index 6adf58e7be..ee18fe9030 100644 --- a/files/classes/mod_logs.py +++ b/files/classes/mod_logs.py @@ -274,11 +274,6 @@ ACTIONTYPES = { "icon": 'fa-user-crown', "color": 'bg-success' }, - 'make_meme_admin': { - "str": 'made {self.target_link} meme admin', - "icon": 'fa-user-crown', - "color": 'bg-success' - }, 'monthly': { "str": 'distributed monthly marseybux', "icon": 'fa-sack-dollar', @@ -319,11 +314,6 @@ ACTIONTYPES = { "icon": 'fa-user-crown', "color": 'bg-danger' }, - 'remove_meme_admin': { - "str": 'removed {self.target_link} as meme admin', - "icon": 'fa-user-crown', - "color": 'bg-danger' - }, 'revert': { "str": 'reverted {self.target_link} mod actions', "icon": 'fa-history', diff --git a/files/routes/admin.py b/files/routes/admin.py index 686dea0fff..4cdf68c4d1 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -368,46 +368,6 @@ def club_ban(v, username): return {"message": f"@{username} has been kicked from the {CC_TITLE}. Deserved."} -@app.post("/@/make_meme_admin") -@limiter.limit("1/second;30/minute;200/hour;1000/day") -@admin_level_required(3) -def make_meme_admin(v, username): - user = get_user(username) - if not user: abort(404) - user.admin_level = 1 - g.db.add(user) - - ma = ModAction( - kind="make_meme_admin", - user_id=v.id, - target_user_id=user.id - ) - g.db.add(ma) - - g.db.commit() - return {"message": "User has been made meme admin!"} - - -@app.post("/@/remove_meme_admin") -@limiter.limit("1/second;30/minute;200/hour;1000/day") -@admin_level_required(3) -def remove_meme_admin(v, username): - user = get_user(username) - if not user: abort(404) - user.admin_level = 0 - g.db.add(user) - - ma = ModAction( - kind="remove_meme_admin", - user_id=v.id, - target_user_id=user.id - ) - g.db.add(ma) - - g.db.commit() - return {"message": "Meme admin removed!"} - - @app.post("/admin/monthly") @limiter.limit("1/day") @admin_level_required(3) diff --git a/files/templates/admins.html b/files/templates/admins.html index d35f54cab8..00fe35b6f8 100644 --- a/files/templates/admins.html +++ b/files/templates/admins.html @@ -22,7 +22,7 @@ {% for user in admins %} {{loop.index}} - {{user.username}}{% if user.admin_level == 1 and v and v.admin_level > 1 %}{% endif %} + {{user.username}} {{user.truecoins}} {{user.modaction_num}} diff --git a/files/templates/userpage.html b/files/templates/userpage.html index 11273509ed..0a3d61ee11 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -69,13 +69,9 @@ {% endif %} {% if u.admin_level > 1 or (u.admin_level == 1 and not(v and v.admin_level > 1)) %} - - - - {% elif u.admin_level == 1 and v and v.admin_level > 1 %} - - - + + + {% endif %} {% if v and v.has_follower(u) %} Follows you @@ -188,9 +184,6 @@ Remove admin - Make meme admin - Remove meme admin - {% if u.admin_level > 1 %} Revert admin actions {% endif %} @@ -394,13 +387,9 @@ {% endif %} {% if u.admin_level > 1 or (u.admin_level == 1 and not(v and v.admin_level > 1)) %} - - - - {% elif u.admin_level == 1 and v and v.admin_level > 1 %} - - - + + + {% endif %} {% if v and v.has_follower(u) and not v.is_nofollow %} Follows you @@ -502,9 +491,6 @@ Remove admin - Make meme admin - Remove meme admin - {% if u.admin_level > 1 %} Revert admin actions {% endif %}