diff --git a/files/assets/images/GigaChadLife/badges/agendaposter.webp b/files/assets/images/GigaChadLife/badges/agendaposter.webp
deleted file mode 100644
index 7263f6125..000000000
Binary files a/files/assets/images/GigaChadLife/badges/agendaposter.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/alpha.webp b/files/assets/images/GigaChadLife/badges/alpha.webp
deleted file mode 100644
index e1f6c5507..000000000
Binary files a/files/assets/images/GigaChadLife/badges/alpha.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/art.webp b/files/assets/images/GigaChadLife/badges/art.webp
deleted file mode 100644
index 5cc632cdd..000000000
Binary files a/files/assets/images/GigaChadLife/badges/art.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/beta.webp b/files/assets/images/GigaChadLife/badges/beta.webp
deleted file mode 100644
index 752b464d3..000000000
Binary files a/files/assets/images/GigaChadLife/badges/beta.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/carpballs.webp b/files/assets/images/GigaChadLife/badges/carpballs.webp
deleted file mode 100644
index 666e143e0..000000000
Binary files a/files/assets/images/GigaChadLife/badges/carpballs.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/git.webp b/files/assets/images/GigaChadLife/badges/git.webp
deleted file mode 100644
index b8aa3ba52..000000000
Binary files a/files/assets/images/GigaChadLife/badges/git.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/idea.webp b/files/assets/images/GigaChadLife/badges/idea.webp
deleted file mode 100644
index 9b0f92171..000000000
Binary files a/files/assets/images/GigaChadLife/badges/idea.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/labrat.webp b/files/assets/images/GigaChadLife/badges/labrat.webp
deleted file mode 100644
index 067e36d76..000000000
Binary files a/files/assets/images/GigaChadLife/badges/labrat.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/lolcow.webp b/files/assets/images/GigaChadLife/badges/lolcow.webp
deleted file mode 100644
index 6325e18cb..000000000
Binary files a/files/assets/images/GigaChadLife/badges/lolcow.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/mail.webp b/files/assets/images/GigaChadLife/badges/mail.webp
deleted file mode 100644
index 7ca423f12..000000000
Binary files a/files/assets/images/GigaChadLife/badges/mail.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/marseybadge-1.webp b/files/assets/images/GigaChadLife/badges/marseybadge-1.webp
deleted file mode 100644
index a7f0e49fb..000000000
Binary files a/files/assets/images/GigaChadLife/badges/marseybadge-1.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/marseybadge-2.webp b/files/assets/images/GigaChadLife/badges/marseybadge-2.webp
deleted file mode 100644
index a4f2709ea..000000000
Binary files a/files/assets/images/GigaChadLife/badges/marseybadge-2.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/patron-1.webp b/files/assets/images/GigaChadLife/badges/patron-1.webp
deleted file mode 100644
index bf7c89d89..000000000
Binary files a/files/assets/images/GigaChadLife/badges/patron-1.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/patron-2.webp b/files/assets/images/GigaChadLife/badges/patron-2.webp
deleted file mode 100644
index 2b47725d1..000000000
Binary files a/files/assets/images/GigaChadLife/badges/patron-2.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/patron-3.webp b/files/assets/images/GigaChadLife/badges/patron-3.webp
deleted file mode 100644
index 298fe9800..000000000
Binary files a/files/assets/images/GigaChadLife/badges/patron-3.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/patron-4.webp b/files/assets/images/GigaChadLife/badges/patron-4.webp
deleted file mode 100644
index 2abc848fd..000000000
Binary files a/files/assets/images/GigaChadLife/badges/patron-4.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/patron-5.webp b/files/assets/images/GigaChadLife/badges/patron-5.webp
deleted file mode 100644
index 290059b40..000000000
Binary files a/files/assets/images/GigaChadLife/badges/patron-5.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/patron-8.webp b/files/assets/images/GigaChadLife/badges/patron-8.webp
deleted file mode 100644
index 047ed7724..000000000
Binary files a/files/assets/images/GigaChadLife/badges/patron-8.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/recruit-1.webp b/files/assets/images/GigaChadLife/badges/recruit-1.webp
deleted file mode 100644
index ba1860479..000000000
Binary files a/files/assets/images/GigaChadLife/badges/recruit-1.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/recruit-10.webp b/files/assets/images/GigaChadLife/badges/recruit-10.webp
deleted file mode 100644
index f4473cf1e..000000000
Binary files a/files/assets/images/GigaChadLife/badges/recruit-10.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/recruit-100.webp b/files/assets/images/GigaChadLife/badges/recruit-100.webp
deleted file mode 100644
index 5c85cc9e0..000000000
Binary files a/files/assets/images/GigaChadLife/badges/recruit-100.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/recruit-1000.webp b/files/assets/images/GigaChadLife/badges/recruit-1000.webp
deleted file mode 100644
index a92f94f0d..000000000
Binary files a/files/assets/images/GigaChadLife/badges/recruit-1000.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/retarded.webp b/files/assets/images/GigaChadLife/badges/retarded.webp
deleted file mode 100644
index ca55c2019..000000000
Binary files a/files/assets/images/GigaChadLife/badges/retarded.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/sitebreaker.webp b/files/assets/images/GigaChadLife/badges/sitebreaker.webp
deleted file mode 100644
index 80f9ab954..000000000
Binary files a/files/assets/images/GigaChadLife/badges/sitebreaker.webp and /dev/null differ
diff --git a/files/assets/images/GigaChadLife/badges/whitehat.webp b/files/assets/images/GigaChadLife/badges/whitehat.webp
deleted file mode 100644
index d69b2d087..000000000
Binary files a/files/assets/images/GigaChadLife/badges/whitehat.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/agendaposter.webp b/files/assets/images/PCM/badges/agendaposter.webp
deleted file mode 100644
index 7263f6125..000000000
Binary files a/files/assets/images/PCM/badges/agendaposter.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/alpha.webp b/files/assets/images/PCM/badges/alpha.webp
deleted file mode 100644
index e1f6c5507..000000000
Binary files a/files/assets/images/PCM/badges/alpha.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/art.webp b/files/assets/images/PCM/badges/art.webp
deleted file mode 100644
index 5cc632cdd..000000000
Binary files a/files/assets/images/PCM/badges/art.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/beta.webp b/files/assets/images/PCM/badges/beta.webp
deleted file mode 100644
index 752b464d3..000000000
Binary files a/files/assets/images/PCM/badges/beta.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/git.webp b/files/assets/images/PCM/badges/git.webp
deleted file mode 100644
index b8aa3ba52..000000000
Binary files a/files/assets/images/PCM/badges/git.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/idea.webp b/files/assets/images/PCM/badges/idea.webp
deleted file mode 100644
index 9b0f92171..000000000
Binary files a/files/assets/images/PCM/badges/idea.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/labrat.webp b/files/assets/images/PCM/badges/labrat.webp
deleted file mode 100644
index 067e36d76..000000000
Binary files a/files/assets/images/PCM/badges/labrat.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/lolcow.webp b/files/assets/images/PCM/badges/lolcow.webp
deleted file mode 100644
index 6325e18cb..000000000
Binary files a/files/assets/images/PCM/badges/lolcow.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/mail.webp b/files/assets/images/PCM/badges/mail.webp
deleted file mode 100644
index 7ca423f12..000000000
Binary files a/files/assets/images/PCM/badges/mail.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/marseybadge-1.webp b/files/assets/images/PCM/badges/marseybadge-1.webp
deleted file mode 100644
index a7f0e49fb..000000000
Binary files a/files/assets/images/PCM/badges/marseybadge-1.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/marseybadge-2.webp b/files/assets/images/PCM/badges/marseybadge-2.webp
deleted file mode 100644
index a4f2709ea..000000000
Binary files a/files/assets/images/PCM/badges/marseybadge-2.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/patron-1.webp b/files/assets/images/PCM/badges/patron-1.webp
deleted file mode 100644
index 48091770d..000000000
Binary files a/files/assets/images/PCM/badges/patron-1.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/patron-2.webp b/files/assets/images/PCM/badges/patron-2.webp
deleted file mode 100644
index 8f3babe43..000000000
Binary files a/files/assets/images/PCM/badges/patron-2.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/patron-3.webp b/files/assets/images/PCM/badges/patron-3.webp
deleted file mode 100644
index ae4ca0b45..000000000
Binary files a/files/assets/images/PCM/badges/patron-3.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/patron-4.webp b/files/assets/images/PCM/badges/patron-4.webp
deleted file mode 100644
index ac0c5f634..000000000
Binary files a/files/assets/images/PCM/badges/patron-4.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/patron-5.webp b/files/assets/images/PCM/badges/patron-5.webp
deleted file mode 100644
index 3239af3e2..000000000
Binary files a/files/assets/images/PCM/badges/patron-5.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/patron-8.webp b/files/assets/images/PCM/badges/patron-8.webp
deleted file mode 100644
index 047ed7724..000000000
Binary files a/files/assets/images/PCM/badges/patron-8.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/recruit-1.webp b/files/assets/images/PCM/badges/recruit-1.webp
deleted file mode 100644
index ba1860479..000000000
Binary files a/files/assets/images/PCM/badges/recruit-1.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/recruit-10.webp b/files/assets/images/PCM/badges/recruit-10.webp
deleted file mode 100644
index f4473cf1e..000000000
Binary files a/files/assets/images/PCM/badges/recruit-10.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/recruit-100.webp b/files/assets/images/PCM/badges/recruit-100.webp
deleted file mode 100644
index 5c85cc9e0..000000000
Binary files a/files/assets/images/PCM/badges/recruit-100.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/recruit-1000.webp b/files/assets/images/PCM/badges/recruit-1000.webp
deleted file mode 100644
index a92f94f0d..000000000
Binary files a/files/assets/images/PCM/badges/recruit-1000.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/retarded.webp b/files/assets/images/PCM/badges/retarded.webp
deleted file mode 100644
index ca55c2019..000000000
Binary files a/files/assets/images/PCM/badges/retarded.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/sitebreaker.webp b/files/assets/images/PCM/badges/sitebreaker.webp
deleted file mode 100644
index 80f9ab954..000000000
Binary files a/files/assets/images/PCM/badges/sitebreaker.webp and /dev/null differ
diff --git a/files/assets/images/PCM/badges/whitehat.webp b/files/assets/images/PCM/badges/whitehat.webp
deleted file mode 100644
index d69b2d087..000000000
Binary files a/files/assets/images/PCM/badges/whitehat.webp and /dev/null differ
diff --git a/files/assets/images/Drama/badges/agendaposter.webp b/files/assets/images/badges/agendaposter.webp
similarity index 100%
rename from files/assets/images/Drama/badges/agendaposter.webp
rename to files/assets/images/badges/agendaposter.webp
diff --git a/files/assets/images/Drama/badges/alpha.webp b/files/assets/images/badges/alpha.webp
similarity index 100%
rename from files/assets/images/Drama/badges/alpha.webp
rename to files/assets/images/badges/alpha.webp
diff --git a/files/assets/images/Drama/badges/art.webp b/files/assets/images/badges/art.webp
similarity index 100%
rename from files/assets/images/Drama/badges/art.webp
rename to files/assets/images/badges/art.webp
diff --git a/files/assets/images/Drama/badges/bait.webp b/files/assets/images/badges/bait.webp
similarity index 100%
rename from files/assets/images/Drama/badges/bait.webp
rename to files/assets/images/badges/bait.webp
diff --git a/files/assets/images/Drama/badges/beta.webp b/files/assets/images/badges/beta.webp
similarity index 100%
rename from files/assets/images/Drama/badges/beta.webp
rename to files/assets/images/badges/beta.webp
diff --git a/files/assets/images/Drama/badges/carpballs.webp b/files/assets/images/badges/carpballs.webp
similarity index 100%
rename from files/assets/images/Drama/badges/carpballs.webp
rename to files/assets/images/badges/carpballs.webp
diff --git a/files/assets/images/Drama/badges/git.webp b/files/assets/images/badges/git.webp
similarity index 100%
rename from files/assets/images/Drama/badges/git.webp
rename to files/assets/images/badges/git.webp
diff --git a/files/assets/images/Drama/badges/halloween21.webp b/files/assets/images/badges/halloween21.webp
similarity index 100%
rename from files/assets/images/Drama/badges/halloween21.webp
rename to files/assets/images/badges/halloween21.webp
diff --git a/files/assets/images/Drama/badges/idea.webp b/files/assets/images/badges/idea.webp
similarity index 100%
rename from files/assets/images/Drama/badges/idea.webp
rename to files/assets/images/badges/idea.webp
diff --git a/files/assets/images/Drama/badges/labrat.webp b/files/assets/images/badges/labrat.webp
similarity index 100%
rename from files/assets/images/Drama/badges/labrat.webp
rename to files/assets/images/badges/labrat.webp
diff --git a/files/assets/images/Drama/badges/lolcow.webp b/files/assets/images/badges/lolcow.webp
similarity index 100%
rename from files/assets/images/Drama/badges/lolcow.webp
rename to files/assets/images/badges/lolcow.webp
diff --git a/files/assets/images/Drama/badges/mail.webp b/files/assets/images/badges/mail.webp
similarity index 100%
rename from files/assets/images/Drama/badges/mail.webp
rename to files/assets/images/badges/mail.webp
diff --git a/files/assets/images/Drama/badges/marseybadge-1.webp b/files/assets/images/badges/marseybadge-1.webp
similarity index 100%
rename from files/assets/images/Drama/badges/marseybadge-1.webp
rename to files/assets/images/badges/marseybadge-1.webp
diff --git a/files/assets/images/Drama/badges/marseybadge-2.webp b/files/assets/images/badges/marseybadge-2.webp
similarity index 100%
rename from files/assets/images/Drama/badges/marseybadge-2.webp
rename to files/assets/images/badges/marseybadge-2.webp
diff --git a/files/assets/images/Drama/badges/patron-1.webp b/files/assets/images/badges/patron-1.webp
similarity index 100%
rename from files/assets/images/Drama/badges/patron-1.webp
rename to files/assets/images/badges/patron-1.webp
diff --git a/files/assets/images/Drama/badges/patron-2.webp b/files/assets/images/badges/patron-2.webp
similarity index 100%
rename from files/assets/images/Drama/badges/patron-2.webp
rename to files/assets/images/badges/patron-2.webp
diff --git a/files/assets/images/Drama/badges/patron-3.webp b/files/assets/images/badges/patron-3.webp
similarity index 100%
rename from files/assets/images/Drama/badges/patron-3.webp
rename to files/assets/images/badges/patron-3.webp
diff --git a/files/assets/images/Drama/badges/patron-4.webp b/files/assets/images/badges/patron-4.webp
similarity index 100%
rename from files/assets/images/Drama/badges/patron-4.webp
rename to files/assets/images/badges/patron-4.webp
diff --git a/files/assets/images/Drama/badges/patron-5.webp b/files/assets/images/badges/patron-5.webp
similarity index 100%
rename from files/assets/images/Drama/badges/patron-5.webp
rename to files/assets/images/badges/patron-5.webp
diff --git a/files/assets/images/Drama/badges/patron-8.webp b/files/assets/images/badges/patron-8.webp
similarity index 100%
rename from files/assets/images/Drama/badges/patron-8.webp
rename to files/assets/images/badges/patron-8.webp
diff --git a/files/assets/images/Drama/badges/public_relations.webp b/files/assets/images/badges/public_relations.webp
similarity index 100%
rename from files/assets/images/Drama/badges/public_relations.webp
rename to files/assets/images/badges/public_relations.webp
diff --git a/files/assets/images/Drama/badges/publicrelations.webp b/files/assets/images/badges/publicrelations.webp
similarity index 100%
rename from files/assets/images/Drama/badges/publicrelations.webp
rename to files/assets/images/badges/publicrelations.webp
diff --git a/files/assets/images/Drama/badges/recruit-1.webp b/files/assets/images/badges/recruit-1.webp
similarity index 100%
rename from files/assets/images/Drama/badges/recruit-1.webp
rename to files/assets/images/badges/recruit-1.webp
diff --git a/files/assets/images/Drama/badges/recruit-10.webp b/files/assets/images/badges/recruit-10.webp
similarity index 100%
rename from files/assets/images/Drama/badges/recruit-10.webp
rename to files/assets/images/badges/recruit-10.webp
diff --git a/files/assets/images/Drama/badges/recruit-100.webp b/files/assets/images/badges/recruit-100.webp
similarity index 100%
rename from files/assets/images/Drama/badges/recruit-100.webp
rename to files/assets/images/badges/recruit-100.webp
diff --git a/files/assets/images/Drama/badges/recruit-1000.webp b/files/assets/images/badges/recruit-1000.webp
similarity index 100%
rename from files/assets/images/Drama/badges/recruit-1000.webp
rename to files/assets/images/badges/recruit-1000.webp
diff --git a/files/assets/images/Drama/badges/retarded.webp b/files/assets/images/badges/retarded.webp
similarity index 100%
rename from files/assets/images/Drama/badges/retarded.webp
rename to files/assets/images/badges/retarded.webp
diff --git a/files/assets/images/Drama/badges/sitebreaker.webp b/files/assets/images/badges/sitebreaker.webp
similarity index 100%
rename from files/assets/images/Drama/badges/sitebreaker.webp
rename to files/assets/images/badges/sitebreaker.webp
diff --git a/files/assets/images/Drama/badges/skater.webp b/files/assets/images/badges/skater.webp
similarity index 100%
rename from files/assets/images/Drama/badges/skater.webp
rename to files/assets/images/badges/skater.webp
diff --git a/files/assets/images/Drama/badges/whitehat.webp b/files/assets/images/badges/whitehat.webp
similarity index 100%
rename from files/assets/images/Drama/badges/whitehat.webp
rename to files/assets/images/badges/whitehat.webp
diff --git a/files/classes/badges.py b/files/classes/badges.py
index 4af64c338..22ef03531 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 7db305391..80285cc07 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 5d382da30..85bbf937c 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 660950eb5..0c2c3e179 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 @@
Source code
Discord
- Donate
+ {% if 'pcm' not in request.host %}Donate{% endif %}
{% if 'rdrama' in request.host %}Subreddit archives{% endif %}
Contact us
diff --git a/files/templates/patrons.html b/files/templates/patrons.html
index b87c23d58..d6c1b5d57 100644
--- a/files/templates/patrons.html
+++ b/files/templates/patrons.html
@@ -15,7 +15,7 @@
| {{loop.index}} |
 {{row['username']}} |
-  |
+  |
{% for (a,count) in row['awards'].values() %}
|