diff --git a/files/assets/css/main.css b/files/assets/css/main.css index ece210613..a29f088f7 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/routes/admin.py b/files/routes/admin.py index 8b3e77557..e8c40bfdc 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 diff --git a/files/routes/static.py b/files/routes/static.py index 74c143d88..37883e45e 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 diff --git a/files/templates/header.html b/files/templates/header.html index 74aec29d3..a2350efe3 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/home.html b/files/templates/home.html index 6d91eb974..7b64addba 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/settings.html b/files/templates/settings.html index 75627ad30..6a39db51c 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 d0cc3ab6b..fbdaf874f 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 819ad2414..86da58800 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/sub/subs.html b/files/templates/sub/subs.html index e671a274a..071cf7f04 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 %} diff --git a/files/templates/submission.html b/files/templates/submission.html index 13d76e745..24e5dc8e9 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 %} diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html index 02c6c9701..7d09281df 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, diff --git a/snappy_rDrama.txt b/snappy_rDrama.txt index 76204a327..3d7cf8350 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