From a666a2d12ab20d8a48ba7ac07e3e7177f97822e6 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 5 Feb 2022 13:10:16 +0200 Subject: [PATCH] fds --- docker-compose.yml | 1 - env.sh => env | 1 - files/__main__.py | 1 - files/classes/comment.py | 14 ++++++++++---- files/classes/submission.py | 14 ++++++++++---- files/templates/default.html | 4 ++-- files/templates/settings.html | 4 ++-- files/templates/settings2.html | 4 ++-- files/templates/sign_up.html | 4 ++-- files/templates/sign_up_failed_ref.html | 4 ++-- 10 files changed, 30 insertions(+), 21 deletions(-) rename env.sh => env (98%) diff --git a/docker-compose.yml b/docker-compose.yml index c7575871d..363d0b0ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,7 +33,6 @@ services: - DEFAULT_TIME_FILTER=all - DEFAULT_THEME=midnight - DEFAULT_COLOR=ff66ac #YOU HAVE TO PICK ONE OF THOSE COLORS OR SHIT WILL BREAK: ff66ac, 805ad5, 62ca56, 38a169, 80ffff, 2a96f3, eb4963, ff0000, f39731, 30409f, 3e98a7, e4432d, 7b9ae4, ec72de, 7f8fa6, f8db58 - - SLOGAN=Dude bussy lmao - GUMROAD_TOKEN=3435tdfsdudebussylmaoxxt43 - GUMROAD_LINK=https://marsey1.gumroad.com/l/tfcvri - GUMROAD_ID=tfcvri diff --git a/env.sh b/env similarity index 98% rename from env.sh rename to env index 76028b79a..4e2b4e1b4 100644 --- a/env.sh +++ b/env @@ -20,7 +20,6 @@ export COMMENT_SPAM_COUNT_THRESHOLD="10" export READ_ONLY="0" export BOT_DISABLE="0" export DEFAULT_TIME_FILTER="all" -export SLOGAN="Dude bussy lmao" export GUMROAD_TOKEN="3435tdfsdudebussylmaoxxt43" export GUMROAD_LINK="https://marsey1.gumroad.com/l/tfcvri" export GUMROAD_ID="tfcvri" diff --git a/files/__main__.py b/files/__main__.py index 5787cc038..89a6f0795 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -40,7 +40,6 @@ app.config['MAX_CONTENT_LENGTH'] = 8 * 1024 * 1024 app.config["SESSION_COOKIE_SECURE"] = True app.config["SESSION_COOKIE_SAMESITE"] = "Lax" app.config["PERMANENT_SESSION_LIFETIME"] = 60 * 60 * 24 * 365 -app.config["SLOGAN"] = environ.get("SLOGAN", "").strip() app.config["DEFAULT_COLOR"] = environ.get("DEFAULT_COLOR", "ff0000").strip() app.config["DEFAULT_THEME"] = environ.get("DEFAULT_THEME", "midnight").strip() app.config["FORCE_HTTPS"] = 1 diff --git a/files/classes/comment.py b/files/classes/comment.py index 7fa5bf0fa..96d93be19 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -169,10 +169,16 @@ class Comment(Base): years = int(months / 12) return f"{years}yr ago" - @property - @lazy - def score(self): - return self.upvotes - self.downvotes + if SITE_NAME == 'Too4You': + @property + @lazy + def score(self): + return self.upvotes + else: + @property + @lazy + def score(self): + return self.upvotes - self.downvotes @property @lazy diff --git a/files/classes/submission.py b/files/classes/submission.py index 7157d4a32..727f0149b 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -180,10 +180,16 @@ class Submission(Base): return str(time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(self.edited_utc))) - @property - @lazy - def score(self): - return self.upvotes - self.downvotes + if SITE_NAME == 'Too4You': + @property + @lazy + def score(self): + return self.upvotes + else: + @property + @lazy + def score(self): + return self.upvotes - self.downvotes @property @lazy diff --git a/files/templates/default.html b/files/templates/default.html index e5e103ffc..31b5c5467 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -49,7 +49,7 @@ - + @@ -57,7 +57,7 @@ - + {% endblock %} diff --git a/files/templates/settings.html b/files/templates/settings.html index ddc6a2c99..2096c0c71 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -20,7 +20,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/files/templates/settings2.html b/files/templates/settings2.html index 72cf56803..6d565ea22 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -20,7 +20,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index fb36512df..d5700dbe1 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -16,7 +16,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index c27681f66..34530d57d 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -17,7 +17,7 @@ - + @@ -25,7 +25,7 @@ - +