diff --git a/files/classes/badges.py b/files/classes/badges.py index 4af64c338a..22ef035316 100644 --- a/files/classes/badges.py +++ b/files/classes/badges.py @@ -25,7 +25,7 @@ class BadgeDef(Base): @lazy def path(self): - return f"/assets/images/{site_name}/badges/{self.icon}" + return f"/assets/images/badges/{self.icon}" @property @lazy diff --git a/files/routes/admin.py b/files/routes/admin.py index 7db305391f..80285cc07b 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -184,7 +184,7 @@ def monthly(v): grant_awards["shit"] = 10 grant_awards["fireflies"] = 10 grant_awards["ban"] = 3 - elif u.patron == 5 or u.patron == 8: + elif u.patron == 5: grant_awards["shit"] = 20 grant_awards["fireflies"] = 20 grant_awards["ban"] = 6 @@ -402,7 +402,8 @@ def badge_grant_post(v): if badge_id == 16 and user.has_badge(17): g.db.query(Badge).options(lazyload('*')).filter_by(badge_id=17, user_id=user.id).delete() - elif badge_id in [21,22,23,24,28]: + elif badge_id in [21,22,23,24,25,28]: + if badge_id == 28: badge_id = 25 user.patron = int(str(badge_id)[-1]) grant_awards = {} diff --git a/files/routes/settings.py b/files/routes/settings.py index 5d382da308..85bbf937c7 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -26,11 +26,6 @@ tiers={ "(Landchad)": 3, "(Terminally online turboautist)": 4, "(Footpig)": 5, - "(Chad)": 1, - "(Megachad)": 2, - "(Gigachad)": 3, - "(Terachad)": 4, - "(Petachad)": 5 } @app.post("/settings/removebackground") @@ -307,8 +302,7 @@ def gumroad(v): response = response[0] tier = tiers[response["variants_and_quantity"]] - if v.patron == tier: - return {"error": f"{patron} rewards already claimed"}, 400 + if v.patron == tier: return {"error": f"{patron} rewards already claimed"}, 400 v.patron = tier g.db.add(v) diff --git a/files/templates/header.html b/files/templates/header.html index 660950eb5d..0c2c3e179c 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -124,7 +124,7 @@ Changelog Source code Discord - Donate + {% if 'pcm' not in request.host %}Donate{% endif %} {% if 'rdrama' in request.host %}Subreddit archives{% endif %} Contact us @@ -185,7 +185,7 @@