From b094e976dc929b64b0b50582c51f9a52773edaf5 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 24 Jan 2022 18:49:23 +0200 Subject: [PATCH] cvvc --- docker-compose.yml | 2 +- env.sh | 2 +- files/classes/badges.py | 2 +- 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 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c7575871d..148ce43e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - MASTER_KEY=3435tdfsdudebussylmaoxxt43 - REDIS_URL=redis://redis - DOMAIN=localhost - - SITE_NAME=Drama + - SITE_NAME=rdrama.net - GIPHY_KEY=3435tdfsdudebussylmaoxxt43 - DISCORD_SERVER_ID=3435tdfsdudebussylmaoxxt43 - DISCORD_CLIENT_ID=3435tdfsdudebussylmaoxxt43 diff --git a/env.sh b/env.sh index 5276d69c8..3a431e8ba 100644 --- a/env.sh +++ b/env.sh @@ -1,7 +1,7 @@ export DATABASE_URL="postgresql://postgres@localhost:5432" export MASTER_KEY="3435tdfsdudebussylmaoxxt43" export DOMAIN="localhost" -export SITE_NAME="Drama" +export SITE_NAME="rdrama.net" export GIPHY_KEY="3435tdfsdudebussylmaoxxt43" export DISCORD_SERVER_ID="3435tdfsdudebussylmaoxxt43" export DISCORD_CLIENT_ID="3435tdfsdudebussylmaoxxt43" diff --git a/files/classes/badges.py b/files/classes/badges.py index 4e1901cbe..4d93ff318 100644 --- a/files/classes/badges.py +++ b/files/classes/badges.py @@ -59,7 +59,7 @@ class Badge(Base): try: return self.badge.name except Exception as e: print(e) - print(self.badge_id) + print(self.badge_id, flush=True) return "" @property diff --git a/files/classes/user.py b/files/classes/user.py index 521dcd0f5..9063b1461 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 == 'Drama': return f"{SITE_FULL}/static/assets/images/defaultpictures/{random.randint(1, 150)}.webp?a=1008" + if SITE_NAME == 'rdrama.net': 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 3d608194f..7c29257bb 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 == 'Drama' and v.admin_level > 2) or (request.host != 'rdrama.net' and request.host != 'pcmemes.net'): + 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'): 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 == 'Drama' and v.admin_level > 2) or (request.host != 'rdrama.net' and request.host != 'pcmemes.net'): + 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'): 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 7e00b254c..461450cc0 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 == 'Drama' and v.admin_level == 0 and v.patron == 0 and v.truecoins < 150: + if SITE_NAME == 'rdrama.net' 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 1a965b217..38b563a9b 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 == 'Drama': patron = 'Paypig' + if SITE_NAME == 'rdrama.net': 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 eafaacc5e..9ccee4b73 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 == 'Drama': + if SITE_NAME == 'rdrama.net': 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 81dcc6b3e..264e1e415 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 == 'Drama' %} + {% if SITE_NAME == 'rdrama.net' %} {% 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 72f849c6f..7c225aa24 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -1,5 +1,5 @@