diff --git a/env b/env index fa07c3756..782d84ee7 100644 --- a/env +++ b/env @@ -1,16 +1,16 @@ -export MASTER_KEY="3435tdfsdudebussylmaoxxt43" +export MASTER_KEY="blahblahblah" export DOMAIN="localhost" export SITE_NAME="Drama" -export GIPHY_KEY="3435tdfsdudebussylmaoxxt43" -export DISCORD_SERVER_ID="3435tdfsdudebussylmaoxxt43" -export DISCORD_CLIENT_ID="3435tdfsdudebussylmaoxxt43" -export DISCORD_CLIENT_SECRET="3435tdfsdudebussylmaoxxt43" -export DISCORD_BOT_TOKEN="3435tdfsdudebussylmaoxxt43" -export HCAPTCHA_SECRET="3435tdfsdudebussylmaoxxt43" -export YOUTUBE_KEY="3435tdfsdudebussylmaoxxt43" -export PUSHER_ID="3435tdfsdudebussylmaoxxt43" -export PUSHER_KEY="3435tdfsdudebussylmaoxxt43" -export IMGUR_KEY="3435tdfsdudebussylmaoxxt43" +export GIPHY_KEY="blahblahblah" +export DISCORD_SERVER_ID="blahblahblah" +export DISCORD_CLIENT_ID="blahblahblah" +export DISCORD_CLIENT_SECRET="blahblahblah" +export DISCORD_BOT_TOKEN="blahblahblah" +export HCAPTCHA_SECRET="blahblahblah" +export YOUTUBE_KEY="blahblahblah" +export PUSHER_ID="blahblahblah" +export PUSHER_KEY="blahblahblah" +export IMGUR_KEY="45ec598cad8462c" export SPAM_SIMILARITY_THRESHOLD="0.5" export SPAM_URL_SIMILARITY_THRESHOLD="0.1" export SPAM_SIMILAR_COUNT_THRESHOLD="10" @@ -19,7 +19,7 @@ export COMMENT_SPAM_COUNT_THRESHOLD="10" export READ_ONLY="0" export BOT_DISABLE="0" export DEFAULT_TIME_FILTER="all" -export GUMROAD_TOKEN="3435tdfsdudebussylmaoxxt43" +export GUMROAD_TOKEN="blahblahblah" export GUMROAD_LINK="https://marsey1.gumroad.com/l/tfcvri" export GUMROAD_ID="tfcvri" export CARD_VIEW="0" @@ -28,8 +28,8 @@ export DUES="10" export DEFAULT_THEME="midnight" export DEFAULT_COLOR="ff66ac" export MAIL_USERNAME="blahblahblah@gmail.com" -export MAIL_PASSWORD="3435tdfsdudebussylmaoxxt43" +export MAIL_PASSWORD="blahblahblah" export DESCRIPTION="rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all!" -export CF_KEY="3435tdfsdudebussylmaoxxt43" -export CF_ZONE="3435tdfsdudebussylmaoxxt43" +export CF_KEY="blahblahblah" +export CF_ZONE="blahblahblah" export DEBIAN_FRONTEND="noninteractive" \ No newline at end of file diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 2edb9bd49..9244a7a1b 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -4463,7 +4463,7 @@ blockquote p { margin: 1.75rem auto !important; } } -.in-comment-image:not(img[src*="/uid/"]):not(img[src*="/pp/"]), .preview img { +.in-comment-image:not(img[src*="/uid/"]):not(img[src*="/pp/"]), .preview img, .img:not(img[src*="/uid/"]):not(img[src*="/pp/"]), .preview img { max-height: 150px !important; max-width: 100% !important; border-radius: 0.2rem !important; @@ -4471,7 +4471,7 @@ blockquote p { margin-bottom: 0.5rem !important; cursor: pointer; } -.embedvid { +.embedvid, .vid { max-height: 20rem !important; max-width: 100% !important; margin-top: 0.5rem !important; diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index 8c565d70b..b6adea0ca 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -176,7 +176,7 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False): for tag in soup.find_all("img"): if tag.get("src") and not tag["src"].startswith('/pp/'): - tag["class"] = "in-comment-image" + tag["class"] = "img" tag["loading"] = "lazy" tag["data-src"] = tag["src"] tag["src"] = "/static/assets/images/loading.webp" @@ -311,7 +311,7 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False): sanitized = unlinked_regex.sub(r'\1\2', sanitized) if not noimages: - sanitized = video_regex.sub(r'

', sanitized) + sanitized = video_regex.sub(r'

', sanitized) if comment: for marsey in g.db.query(Marsey).filter(Marsey.name.in_(marseys_used)).all(): diff --git a/files/routes/static.py b/files/routes/static.py index 2adcf43f3..dd542c8e1 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -307,7 +307,7 @@ def submit_contact(v): name = f'/images/{time.time()}'.replace('.','')[:-5] + '.webp' file.save(name) url = process_image(name) - body_html += f'' + body_html += f'' elif file.content_type.startswith('video/'): file.save("video.mp4") with open("video.mp4", 'rb') as f: diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 3072fe661..2b22b764b 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -15,7 +15,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index edc427c58..af0a86fb6 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -7,7 +7,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/formatting.html b/files/templates/formatting.html index b7d2316bc..73800d246 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -64,7 +64,7 @@ You can use Markdown formatting: Video Files https://files.catbox.moe/v4om92.mp4 - + Emojis diff --git a/files/templates/log.html b/files/templates/log.html index d5921093d..a130a110f 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -6,7 +6,7 @@ {% block content %} {% if v %} - + {% if v.agendaposter %} - + {% endif %}

diff --git a/files/templates/login.html b/files/templates/login.html index 3d2d81879..944605dd0 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -18,7 +18,7 @@ {% endblock %} - + diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index 53e73004a..80bfecae6 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -14,7 +14,7 @@ 2-Step Login - {{SITE_NAME}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index a2d5bd952..9d11e2e4a 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -34,7 +34,7 @@ - + {% if v.agendaposter %} - + {% else %} - + {% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 6f4d60cbf..4997e78cb 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %} - + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index e2472d112..557bd9810 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -32,7 +32,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %} - + diff --git a/files/templates/submission.html b/files/templates/submission.html index 2b256b3a7..8065fdf0c 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -717,7 +717,7 @@ {% elif p.is_video %}
-
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 2fc7a271b..2402d642b 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -357,7 +357,7 @@
{% elif p.is_video %}
-
diff --git a/files/templates/submit.html b/files/templates/submit.html index 7939a6908..5e8fbf8e6 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -26,7 +26,7 @@ {% block stylesheets %} {% if v %} - + {% if v.agendaposter %} - + {% endif %} {% endblock %}