fsdfsd

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

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 = {}

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:
+	if v.patron == tier: return {"error": f"{patron} rewards already claimed"}, 400
-		return {"error": f"{patron} rewards already claimed"}, 400
 
 	v.patron = tier
 	g.db.add(v)

files/templates/header.html

@@ -124,7 +124,7 @@
 								<a class="dropdown-item" href="/changelog"><i class="fas fa-clipboard fa-fw text-left mr-3"></i>Changelog</a>
 								<a class="dropdown-item" rel="nofollow noopener noreferrer" href="https://github.com/Aevann1/Drama"><i class="fab fa-github fa-fw text-left mr-3"></i>Source code</a>
 								<a class="dropdown-item" href="/discord"><i class="fab fa-discord fa-fw text-left mr-3"></i>Discord</a>
-								<a class="dropdown-item" rel="nofollow noopener noreferrer" href="{{'GUMROAD_LINK' | app_config}}"><i class="fas fa-dollar-sign fa-fw text-left mr-3"></i>Donate</a>
+								{% if 'pcm' not in request.host %}<a class="dropdown-item" rel="nofollow noopener noreferrer" href="{{'GUMROAD_LINK' | app_config}}"><i class="fas fa-dollar-sign fa-fw text-left mr-3"></i>Donate</a>{% endif %}
 								{% if 'rdrama' in request.host %}<a class="dropdown-item" href="/archives"><i class="fas fa-book fa-fw text-left mr-3"></i>Subreddit archives</a>{% endif %}
 								<a class="dropdown-item" href="/contact"><i class="fas fa-file-signature fa-fw text-left mr-3"></i>Contact us</a>
 							</div>
@@ -185,7 +185,7 @@
 
 			<li class="nav-item"><a class="nav-link" rel="nofollow noopener noreferrer" href="https://github.com/Aevann1/Drama"><i class="fab fa-github fa-fw mr-3"></i>Source code</a></li>
 			<li class="nav-item"><a class="nav-link" href="/discord"><i class="fab fa-discord fa-fw mr-3"></i>Discord</a></li>
-			<li class="nav-item"><a class="nav-link" rel="nofollow noopener noreferrer" href="{{'GUMROAD_LINK' | app_config}}"><i class="fas fa-dollar-sign fa-fw mr-3"></i>Donate</a></li>
+			{% if 'pcm' not in request.host %}<li class="nav-item"><a class="nav-link" rel="nofollow noopener noreferrer" href="{{'GUMROAD_LINK' | app_config}}"><i class="fas fa-dollar-sign fa-fw mr-3"></i>Donate</a></li>{% endif %}
 			{% if 'rdrama' in request.host %}<li class="nav-item"><a class="nav-link" href="/archives"><i class="fas fa-book fa-fw mr-3"></i>Subreddit archives</a></li>{% endif %}
 			<li class="nav-item"><a class="nav-link" href="/contact"><i class="fas fa-file-signature fa-fw mr-3"></i>Contact us</a></li>
 

files/templates/patrons.html

@@ -15,7 +15,7 @@
 		<td style="font-weight:bold;">{{loop.index}}</td>
 		<td><a style="color:#{{row['namecolor']}};  font-weight:bold;" href="/@{{row['username']}}"><img loading="lazy" src="/uid/{{uid}}/pic/profile" class="profile-pic-20 mr-1"><span {% if row['patron'] %}class="patron" style="background-color:#{{row['namecolor']}};"{% endif %}>{{row['username']}}</span></a></td>
 
-		<td><img loading="lazy" style="width: 32px; height: 32px" src="/assets/images/{{'SITE_NAME' | app_config}}/badges/patron-{{row['patron']}}.webp"></td>
+		<td><img loading="lazy" style="width: 32px; height: 32px" src="/assets/images/badges/patron-{{row['patron']}}.webp"></td>
 
 		<td style="font-weight:bold;">
 			{% for (a,count) in row['awards'].values() %}