clean up legacy stuff

pull/83/head
Aevann 2023-01-01 03:17:07 +02:00
parent 7a529e70f8
commit 78351abc4c
7 changed files with 8 additions and 8 deletions

View File

@ -306,7 +306,7 @@ class User(Base):
@lazy
def mods(self, sub):
if self.is_suspended_permanently or self.shadowbanned: return False
if self.id in {AEVANN_ID, SNAKES_ID}: return True
if self.id in {AEVANN_ID}: return True
try:
return any(map(lambda x: x.sub == sub, self.sub_mods))
except:

View File

@ -649,7 +649,7 @@ TIERS_ID_TO_NAME = {
6: "Rich Bich",
}
BADGE_BLACKLIST = { # only grantable by AEVANN_ID and SNAKES_ID
BADGE_BLACKLIST = { # only grantable by AEVANN_ID
1, 2, 6, 10, 11, 12, # Alpha, Verified Email, Beta, Recruiter x3
16, 17, 143, 21, 22, 23, 24, 25, 26, 27, # Marsey Artist x3 / Patron Tiers
94, 95, 96, 97, 98, 109, 67, 68, 83, 84, 87, 90, 179, 185, # Award Status except Y'all-seeing eye

View File

@ -509,7 +509,7 @@ def under_attack(v):
def admin_badges_grantable_list(v):
query = g.db.query(BadgeDef)
if BADGE_BLACKLIST and v.id not in {AEVANN_ID, SNAKES_ID}:
if BADGE_BLACKLIST and v.id not in {AEVANN_ID}:
query = query.filter(BadgeDef.id.notin_(BADGE_BLACKLIST))
badge_types = query.order_by(BadgeDef.id).all()

View File

@ -13,8 +13,8 @@ from files.routes.wrappers import *
from files.__main__ import app, cache, limiter
ASSET_TYPES = (Marsey, HatDef)
CAN_APPROVE_ASSETS = (AEVANN_ID, CARP_ID, SNAKES_ID)
CAN_UPDATE_ASSETS = (AEVANN_ID, CARP_ID, SNAKES_ID)
CAN_APPROVE_ASSETS = (AEVANN_ID, CARP_ID)
CAN_UPDATE_ASSETS = (AEVANN_ID, CARP_ID)
@app.get("/submit/marseys")
@auth_required

View File

@ -169,7 +169,7 @@ def award_thing(v, thing_type, id):
else:
safe_username = f"@{author.username}"
if SITE == 'rdrama.net' and author.id == PIZZASHILL_ID and v.id not in {AEVANN_ID, SNAKES_ID}:
if SITE == 'rdrama.net' and author.id == PIZZASHILL_ID and v.id not in {AEVANN_ID}:
abort(403, f"{safe_username} is immune to awards.")
if kind == "benefactor" and author.id == v.id:

View File

@ -106,7 +106,7 @@ def daily_chart(v:User):
@app.get("/paypigs")
@admin_level_required(PERMS['VIEW_PATRONS'])
def patrons(v):
if AEVANN_ID and v.id not in {AEVANN_ID, CARP_ID, SNAKES_ID}:
if AEVANN_ID and v.id not in {AEVANN_ID, CARP_ID}:
abort(404)
users = g.db.query(User).filter(User.patron > 0).order_by(User.patron.desc(), User.id).all()

View File

@ -51,7 +51,7 @@
<li><a href="/chuds">Chudded Users</a></li>
<li><a href="/grassed">Currently Grassed Users</a></li>
{%- endif %}
{% if FEATURES['MARSEYBUX'] and (not AEVANN_ID or v.id in (AEVANN_ID, CARP_ID, SNAKES_ID)) -%}
{% if FEATURES['MARSEYBUX'] and (not AEVANN_ID or v.id in (AEVANN_ID, CARP_ID)) -%}
<li><a href="/patrons">Patrons</a></li>
{%- endif %}
{% if v.admin_level >= PERMS['VIEW_ACTIVE_USERS'] %}