From 8e6fc96135f42db0125a887d60940fe600635a09 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 10 Sep 2022 03:42:13 +0200 Subject: [PATCH 01/12] testing on devrama --- files/templates/submission.html | 97 ++++++++++++++++----------------- 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/files/templates/submission.html b/files/templates/submission.html index 13d76e745f..9d212ca6b3 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -506,61 +506,58 @@ - -{% if comment_info and not comment_info.is_banned and not comment_info.deleted_utc %} -{{'@'+comment_info.author_name}} comments on "{{p.plaintitle(v)}} - {{SITE_NAME}}" - - - - -{% if comment_info.edited_utc %}{% endif %} - - - - -{% if p.is_video %} - -{% elif p.is_audio %} - -{% endif %} - - - - - - - - - - -{% else %} -{{p.plaintitle(v)}} - {{SITE_NAME}} - - -{% if p.author %}{% endif %} - -{% if p.edited_utc %}{% endif %} -{% if p.author %}{% endif %} -{% if not v_forbid_deleted -%} - - - - -{%- endif %} - - - -{% if not v_forbid_deleted -%} -{% if p.author %}{% endif %} - - -{%- endif %} - +{% if not v_forbid_deleted -%} + + {% if p.is_video %} + + {% elif p.is_audio %} + + {% endif %} + {% endif %} + + +{% if comment_info and not comment_info.is_banned and not comment_info.deleted_utc %} + {{'@'+comment_info.author_name}} comments on "{{p.plaintitle(v)}} - {{SITE_NAME}}" + + + + + + + + + {% if comment_info.edited_utc %} + + {% endif %} + + + + + +{% else %} + {{p.plaintitle(v)}} - {{SITE_NAME}} + + + + + + + + + {% if p.edited_utc %} + + {% endif %} + + + + + +{%- endif %} {% endblock %} {% block pagetype %}thread{% endblock %} From b712b93c6eaa6c053fa66e5b69a3beafaf65afe3 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 10 Sep 2022 03:54:03 +0200 Subject: [PATCH 02/12] useless commit but just in case --- files/templates/settings.html | 4 ++-- files/templates/sign_up.html | 4 ++-- files/templates/sign_up_failed_ref.html | 4 ++-- files/templates/submission.html | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/files/templates/settings.html b/files/templates/settings.html index 75627ad302..6a39db51c1 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -20,7 +20,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index d0cc3ab6be..fbdaf874f6 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -18,7 +18,7 @@ - + @@ -28,7 +28,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 819ad24148..86da588005 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -19,7 +19,7 @@ - + @@ -29,7 +29,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 9d212ca6b3..24e5dc8e99 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -511,13 +511,13 @@ {% if not v_forbid_deleted -%} - + {% if p.is_video %} {% elif p.is_audio %} {% endif %} - + {% endif %} From 89f4a88f0453af6177cb6ea07c5fc1870091c60e Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 10 Sep 2022 05:04:58 +0200 Subject: [PATCH 03/12] .strip() --- files/routes/static.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/files/routes/static.py b/files/routes/static.py index 74c143d88c..37883e45ec 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -478,7 +478,7 @@ def submit_marsey(v): if not file or not file.content_type.startswith('image/'): return error("You need to submit an image!") - name = request.values.get('name').lower() + name = request.values.get('name').lower().strip() if not marsey_regex.fullmatch(name): return error("Invalid name!") @@ -486,11 +486,11 @@ def submit_marsey(v): if existing: return error("A marsey with this name already exists!") - tags = request.values.get('tags').lower() + tags = request.values.get('tags').lower().strip() if not tags_regex.fullmatch(tags): return error("Invalid tags!") - author = request.values.get('author') + author = request.values.get('author').strip() author = get_user(author) highquality = f'/asset_submissions/{name}.png' @@ -516,7 +516,7 @@ def approve_marsey(v, name): if not marsey: return {"error": f"This marsey '{name}' doesn't exist!"}, 404 - tags = request.values.get('tags') + tags = request.values.get('tags').lower().strip() if not tags: return {"error": "You need to include tags!"}, 400 From fe97633f05adbf24c5e9cf1195a8e305d5480a29 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 10 Sep 2022 05:05:24 +0200 Subject: [PATCH 04/12] delete lame snappy quote --- snappy_rDrama.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/snappy_rDrama.txt b/snappy_rDrama.txt index 76204a3279..3d7cf83509 100644 --- a/snappy_rDrama.txt +++ b/snappy_rDrama.txt @@ -2991,10 +2991,4 @@ https://rdrama.net/videos/16624761306946733.mp4 {[para]} @joebiden @soren {[para]} -> Discuss - -No. - -:#marseyorthodox: -{[para]} TRANS LIVES MATTER \ No newline at end of file From 07d0d328e805b7b0f0cea0e00ffdcf590289598f Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 10 Sep 2022 05:07:19 +0200 Subject: [PATCH 05/12] testing on devrama --- files/templates/submission.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/submission.html b/files/templates/submission.html index 24e5dc8e99..f8679065d6 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -556,7 +556,7 @@ - + {%- endif %} {% endblock %} From 9b72491937d8ad7559b4f7cd257977471d580311 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 10 Sep 2022 05:07:29 +0200 Subject: [PATCH 06/12] same ast last commit --- files/templates/submission.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/submission.html b/files/templates/submission.html index f8679065d6..e324041d5d 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -545,7 +545,7 @@ - + From d2186258c2a862db55da78cc63e361be5992a06d Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 10 Sep 2022 05:12:19 +0200 Subject: [PATCH 07/12] test on devrama --- files/templates/submission.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/files/templates/submission.html b/files/templates/submission.html index e324041d5d..1d8e06e582 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -545,7 +545,7 @@ - + @@ -556,7 +556,8 @@ - + + {%- endif %} {% endblock %} From 34f95d155c56d3872084c05adeaa5901ec462396 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 10 Sep 2022 05:13:12 +0200 Subject: [PATCH 08/12] fix 500 error --- files/routes/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/routes/admin.py b/files/routes/admin.py index 8b3e77557e..e8c40bfdc8 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -846,7 +846,7 @@ def agendaposter(user_id, v): days = request.values.get("days") if days: - expiry = int(time.time() + int(days)*60*60*24) + expiry = int(time.time() + float(days)*60*60*24) else: expiry = 1 user.agendaposter = expiry From 3501a917bb47e071683576f3e48cbb70c5afd9b9 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 10 Sep 2022 05:14:39 +0200 Subject: [PATCH 09/12] last test --- files/templates/submission.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/files/templates/submission.html b/files/templates/submission.html index 1d8e06e582..aee152057f 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -513,7 +513,7 @@ {% if not v_forbid_deleted -%} {% if p.is_video %} - + {% elif p.is_audio %} {% endif %} @@ -545,7 +545,7 @@ - + @@ -556,8 +556,8 @@ - - + + {%- endif %} {% endblock %} From 77a0a83bed40ea29a4c50f56f9531a90c6439547 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 10 Sep 2022 05:16:00 +0200 Subject: [PATCH 10/12] I give up --- files/templates/submission.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/files/templates/submission.html b/files/templates/submission.html index aee152057f..24e5dc8e99 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -513,7 +513,7 @@ {% if not v_forbid_deleted -%} {% if p.is_video %} - + {% elif p.is_audio %} {% endif %} @@ -545,7 +545,7 @@ - + @@ -556,8 +556,7 @@ - - + {%- endif %} {% endblock %} From e118ca355558cf0b00e4e3fafba0016ae864a1b4 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 10 Sep 2022 05:26:27 +0200 Subject: [PATCH 11/12] restore hole stats --- files/templates/home.html | 16 ++++++++-------- files/templates/sub/subs.html | 4 ++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/files/templates/home.html b/files/templates/home.html index 6d91eb9742..7b64addbac 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -47,18 +47,18 @@ {%- set hole_prefix = '/h/' if not HOLE_STYLE_FLAIR else '' -%} {% if sub.stealth %} - Show posts in main feed - Hide posts from main feed + Unblock {{hole_prefix}}{{sub.name}} + Block {{hole_prefix}}{{sub.name}} {% else %} - Hide posts from main feed - Show posts in main feed + Block {{hole_prefix}}{{sub.name}} + Unblock {{hole_prefix}}{{sub.name}} {% endif %} - Notify me of new posts - Don't notify me of new posts + Follow {{hole_prefix}}{{sub.name}} + Unfollow {{hole_prefix}}{{sub.name}} {% else %} - Hide posts from main feed - Notify me of new posts + Block {{hole_prefix}}{{sub.name}} + Follow {{hole_prefix}}{{sub.name}} {% endif %} {% endif %} diff --git a/files/templates/sub/subs.html b/files/templates/sub/subs.html index e671a274a0..071cf7f04f 100644 --- a/files/templates/sub/subs.html +++ b/files/templates/sub/subs.html @@ -13,6 +13,8 @@ # Name Posts + Followers + Blockers @@ -21,6 +23,8 @@ {{loop.index}} {{sub.name}} {% if sub.name in v.all_blocks %}[hidden from your main feed, visit it to unhide it]{% endif %} {{count}} + {{sub.follow_num}} + {{sub.block_num}} {% endfor %} From 770e818d679a9560383d955c366a10cbb781f757 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 10 Sep 2022 05:52:56 +0200 Subject: [PATCH 12/12] add telegram links --- files/assets/css/main.css | 1 + files/templates/header.html | 4 ++++ files/templates/util/assetcache.html | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/files/assets/css/main.css b/files/assets/css/main.css index ece210613b..a29f088f7f 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -6062,6 +6062,7 @@ g { .fa-star-of-david:before{content:"\f69a"} .fa-hat-cowboy:before{content:"\f8c0"} .fa-cloud-rainbow:before{content:"\f73e"} +.fa-telegram:before{content:"\f2c6"} .pronouns { font-size: 9px; diff --git a/files/templates/header.html b/files/templates/header.html index 74aec29d31..a2350efe33 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -242,6 +242,8 @@ Bugs/Suggestions {% if SITE_NAME == 'rDrama' %} + Telegram Channel + Telegram Chat Discord {% endif %} @@ -307,6 +309,8 @@ Bugs/Suggestions {% if SITE_NAME == 'rDrama' %} + Telegram Channel + Telegram Chat Discord {% endif %} diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html index 02c6c97017..7d09281dfe 100644 --- a/files/templates/util/assetcache.html +++ b/files/templates/util/assetcache.html @@ -1,6 +1,6 @@ {%- set CACHE_VER = { - 'css/main.css': 4021, + 'css/main.css': 4022, 'css/catalog.css': 4007, 'css/4chan.css': 4007, 'css/classic.css': 4007,