From 143de8a1bf619aa22fe1302c192b6965ec02fcd0 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 20 Sep 2021 22:35:32 +0200 Subject: [PATCH] fdsfs --- docker-compose.yml | 3 +-- env | 3 +-- files/helpers/images.py | 2 -- files/templates/submission.html | 2 +- files/templates/submission_listing.html | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7546e040d..cd0c3ca1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,8 +11,6 @@ services: - MASTER_KEY=${MASTER_KEY:-KTVciAUQFpFh2WdJ/oiHJlxl6FvzRZp8kYzAAv3l2OA=} - DOMAIN=localhost - SITE_NAME=Drama - - CLOUDFLARE_ZONE=3435tdfsdudebussylmaoxxt43 - - CLOUDFLARE_KEY=3435tdfsdudebussylmaoxxt43 - GIPHY_KEY=3435tdfsdudebussylmaoxxt43 - MAILGUN_KEY=3435tdfsdudebussylmaoxxt43 - MAILGUN_DOMAIN=rdrama.net @@ -43,6 +41,7 @@ services: - GUMROAD_LINK=https://marsey1.gumroad.com/l/tfcvri - CARD_VIEW=1 - DISABLE_DOWNVOTES=0 + - DUES=0 links: - "redis" - "postgres" diff --git a/env b/env index d2e6205ff..6ed13b61c 100644 --- a/env +++ b/env @@ -2,8 +2,6 @@ export DATABASE_URL="postgresql://postgres@postgres:5432/postgres" export MASTER_KEY="-KTVciAUQFpFh2WdJ/oiHJlxl6FvzRZp8kYzAAv3l2OA=" export DOMAIN="localhost" export SITE_NAME="Drama" -export CLOUDFLARE_ZONE="3435tdfsdudebussylmaoxxt43" -export CLOUDFLARE_KEY="3435tdfsdudebussylmaoxxt43" export GIPHY_KEY="3435tdfsdudebussylmaoxxt43" export MAILGUN_KEY="3435tdfsdudebussylmaoxxt43" export MAILGUN_DOMAIN="rdrama.net" @@ -31,5 +29,6 @@ export GUMROAD_TOKEN="3435tdfsdudebussylmaoxxt43" export GUMROAD_LINK="https://marsey1.gumroad.com/l/tfcvri" export CARD_VIEW="1" export DISABLE_DOWNVOTES="0" +export DUES="0" export DEFAULT_THEME="dark" export 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 \ No newline at end of file diff --git a/files/helpers/images.py b/files/helpers/images.py index 9aba3d4a3..dcb06bfa8 100644 --- a/files/helpers/images.py +++ b/files/helpers/images.py @@ -7,8 +7,6 @@ from flask import g from werkzeug.utils import secure_filename from webptools import gifwebp -CF_KEY = environ.get("CLOUDFLARE_KEY", "").strip() -CF_ZONE = environ.get("CLOUDFLARE_ZONE", "").strip() IMGUR_KEY = environ.get("IMGUR_KEY", "").strip() IBB_KEY = environ.get("IBB_KEY", "").strip() diff --git a/files/templates/submission.html b/files/templates/submission.html index 8d87c6c88..336a7e243 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -119,7 +119,7 @@ {% endif %} {% endif %} - + {% if v and v.id!=p.author_id %} diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 6e278f4a1..66e3b7314 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -311,7 +311,7 @@ {% endif %} {% endif %} - + {% if v and v.id!=p.author_id %}