From dedb9bbaa04182898abdbd8766c259e3d4c97875 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 24 Jan 2022 22:04:23 +0200 Subject: [PATCH] vc --- files/classes/user.py | 2 +- files/routes/admin.py | 4 ++-- files/routes/discord.py | 2 +- files/routes/settings.py | 2 +- files/routes/users.py | 2 +- files/templates/default.html | 2 +- files/templates/header.html | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/files/classes/user.py b/files/classes/user.py index 9063b1461..521dcd0f5 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -433,7 +433,7 @@ class User(Base): def profile_url(self): if self.agendaposter: return f"{SITE_FULL}/static/assets/images/defaultpictures/agendaposter/{random.randint(1, 51)}.webp?a=1008" if self.profileurl: return self.profileurl - if SITE_NAME == 'rdrama.net': return f"{SITE_FULL}/static/assets/images/defaultpictures/{random.randint(1, 150)}.webp?a=1008" + if SITE_NAME == 'Drama': return f"{SITE_FULL}/static/assets/images/defaultpictures/{random.randint(1, 150)}.webp?a=1008" return f"{SITE_FULL}/static/assets/images/default-profile-pic.webp?a=1008" @lazy diff --git a/files/routes/admin.py b/files/routes/admin.py index 46a7cf561..6dc77c60c 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -175,7 +175,7 @@ def club_ban(v, username): @limiter.limit("1/second;30/minute;200/hour;1000/day") @admin_level_required(2) def make_meme_admin(v, username): - if request.host == 'pcmemes.net' or (SITE_NAME == 'rdrama.net' and v.admin_level > 2) or (request.host != 'rdrama.net' and request.host != 'pcmemes.net'): + if request.host == 'pcmemes.net' or (SITE_NAME == 'Drama' and v.admin_level > 2) or (request.host != 'rdrama.net' and request.host != 'pcmemes.net'): user = get_user(username) if not user: abort(404) user.admin_level = 1 @@ -188,7 +188,7 @@ def make_meme_admin(v, username): @limiter.limit("1/second;30/minute;200/hour;1000/day") @admin_level_required(2) def remove_meme_admin(v, username): - if request.host == 'pcmemes.net' or (SITE_NAME == 'rdrama.net' and v.admin_level > 2) or (request.host != 'rdrama.net' and request.host != 'pcmemes.net'): + if request.host == 'pcmemes.net' or (SITE_NAME == 'Drama' and v.admin_level > 2) or (request.host != 'rdrama.net' and request.host != 'pcmemes.net'): user = get_user(username) if not user: abort(404) user.admin_level = 0 diff --git a/files/routes/discord.py b/files/routes/discord.py index 461450cc0..7e00b254c 100644 --- a/files/routes/discord.py +++ b/files/routes/discord.py @@ -17,7 +17,7 @@ def join_discord(v): if v.shadowbanned: return {"error": "Internal server error"} - if SITE_NAME == 'rdrama.net' and v.admin_level == 0 and v.patron == 0 and v.truecoins < 150: + if SITE_NAME == 'Drama' and v.admin_level == 0 and v.patron == 0 and v.truecoins < 150: return "You must receive 150 upvotes/downvotes from other users before being able to join the Discord server." now=int(time.time()) diff --git a/files/routes/settings.py b/files/routes/settings.py index 38b563a9b..1a965b217 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -432,7 +432,7 @@ def themecolor(v): @limiter.limit("1/second;30/minute;200/hour;1000/day") @auth_required def gumroad(v): - if SITE_NAME == 'rdrama.net': patron = 'Paypig' + if SITE_NAME == 'Drama': patron = 'Paypig' else: patron = 'Patron' if not (v.email and v.is_activated): diff --git a/files/routes/users.py b/files/routes/users.py index 1a38b97c1..3f3e4d550 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -342,7 +342,7 @@ def leaderboard(v): else: pos11 = (users11.count()+1, 0) users11 = users11.limit(25).all() - if SITE_NAME == 'rdrama.net': + if SITE_NAME == 'Drama': sq = g.db.query(Marsey.author_id, func.count(Marsey.author_id).label("count"), func.rank().over(order_by=func.count(Marsey.author_id).desc()).label("rank")).group_by(Marsey.author_id).subquery() users12 = g.db.query(User, sq.c.count).join(sq, User.id==sq.c.author_id).order_by(sq.c.count.desc()) pos12 = g.db.query(User.id, sq.c.rank, sq.c.count).join(sq, User.id==sq.c.author_id).filter(User.id == v.id).one_or_none() diff --git a/files/templates/default.html b/files/templates/default.html index cf162fe4d..d111ac7fb 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -216,7 +216,7 @@ {% if '@' not in request.path %} {% if v %} - {% if SITE_NAME == 'rdrama.net' %} + {% if SITE_NAME == 'Drama' %} {% set path = "assets/images/" + SITE_NAME + "/banners" %} {% set image = "/static/" + path + "/" + listdir('files/' + path)|random() + '?a=20' %} diff --git a/files/templates/header.html b/files/templates/header.html index e3773fe40..cab6c2130 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -1,5 +1,5 @@