carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost

master
Aevann1 2022-09-10 03:53:38 +00:00
parent 65b6c743b4 770e818d67
commit e128d77722
12 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/assets/css/main.css
View File

@ -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;

2
files/routes/admin.py
View File

@ -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

8
files/routes/static.py
View File

@ -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

4
files/templates/header.html
View File

@ -242,6 +242,8 @@
<a class="dropdown-item" rel="nofollow noopener noreferrer" href="https://rdrama.net/post/18459"><i class="fas fa-bug fa-fw mr-3"></i>Bugs/Suggestions</a>
{% if SITE_NAME == 'rDrama' %}
<a class="dropdown-item" href="https://t.me/rdramanet"><i class="fab fa-telegram fa-fw mr-3"></i>Telegram Channel</a>
<a class="dropdown-item" href="https://t.me/+tOgq7xeeir83OTU0"><i class="fab fa-telegram fa-fw mr-3"></i>Telegram Chat</a>
<a class="dropdown-item" href="/discord"><i class="fab fa-discord fa-fw mr-3"></i>Discord</a>
{% endif %}
@ -307,6 +309,8 @@
<a class="nav-item nav-link" rel="nofollow noopener noreferrer" href="https://rdrama.net/post/18459"><i class="fas fa-bug fa-fw mr-3"></i>Bugs/Suggestions</a>
{% if SITE_NAME == 'rDrama' %}
<a class="nav-item nav-link" href="https://t.me/rdramanet"><i class="fab fa-telegram fa-fw mr-3"></i>Telegram Channel</a>
<a class="nav-item nav-link" href="https://t.me/+tOgq7xeeir83OTU0"><i class="fab fa-telegram fa-fw mr-3"></i>Telegram Chat</a>
<a class="nav-item nav-link" href="/discord"><i class="fab fa-discord fa-fw mr-3"></i>Discord</a>
{% endif %}

16
files/templates/home.html
View File

@ -47,18 +47,18 @@
{%- set hole_prefix = '/h/' if not HOLE_STYLE_FLAIR else '' -%}
{% if sub.stealth %}
<a id="subscribe-sub" class="btn btn-primary btn-block {% if v.subscribes(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/subscribe','subscribe-sub','unsubscribe-sub','d-none')"><i class="fas fa-eye mr-2"></i>Show posts in main feed</a>
<a id="unsubscribe-sub" class="btn btn-primary btn-block {% if not v.subscribes(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unsubscribe','subscribe-sub','unsubscribe-sub','d-none')"><i class="fas fa-eye-slash mr-2"></i>Hide posts from main feed</a>
<a id="subscribe-sub" class="btn btn-primary btn-block {% if v.subscribes(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/subscribe','subscribe-sub','unsubscribe-sub','d-none')"><i class="fas fa-eye mr-2"></i>Unblock {{hole_prefix}}{{sub.name}}</a>
<a id="unsubscribe-sub" class="btn btn-primary btn-block {% if not v.subscribes(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unsubscribe','subscribe-sub','unsubscribe-sub','d-none')"><i class="fas fa-eye-slash mr-2"></i>Block {{hole_prefix}}{{sub.name}}</a>
{% else %}
<a id="block-sub" class="btn btn-primary btn-block mt-3 {% if v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/block','block-sub','unblock-sub','d-none')"><i class="fas fa-eye-slash mr-2"></i>Hide posts from main feed</a>
<a id="unblock-sub" class="btn btn-primary btn-block mt-3 {% if not v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unblock','block-sub','unblock-sub','d-none')"><i class="fas fa-eye mr-2"></i>Show posts in main feed</a>
<a id="block-sub" class="btn btn-primary btn-block mt-3 {% if v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/block','block-sub','unblock-sub','d-none')"><i class="fas fa-eye-slash mr-2"></i>Block {{hole_prefix}}{{sub.name}}</a>
<a id="unblock-sub" class="btn btn-primary btn-block mt-3 {% if not v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unblock','block-sub','unblock-sub','d-none')"><i class="fas fa-eye mr-2"></i>Unblock {{hole_prefix}}{{sub.name}}</a>
{% endif %}
<a id="follow-sub" class="btn btn-primary btn-follow {% if v.follows(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/follow','follow-sub','unfollow-sub','d-none')"><i class="fas fa-bell mr-2"></i>Notify me of new posts</a>
<a id="unfollow-sub" class="btn btn-primary btn-follow {% if not v.follows(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unfollow','follow-sub','unfollow-sub','d-none')"><i class="fas fa-bell-slash mr-2"></i>Don't notify me of new posts</a>
<a id="follow-sub" class="btn btn-primary btn-follow {% if v.follows(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/follow','follow-sub','unfollow-sub','d-none')"><i class="fas fa-bell mr-2"></i>Follow {{hole_prefix}}{{sub.name}}</a>
<a id="unfollow-sub" class="btn btn-primary btn-follow {% if not v.follows(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unfollow','follow-sub','unfollow-sub','d-none')"><i class="fas fa-bell-slash mr-2"></i>Unfollow {{hole_prefix}}{{sub.name}}</a>
{% else %}
<a class="btn btn-primary btn-block" href="/login"><i class="fas fa-eye-slash mr-2"></i>Hide posts from main feed</a>
<a class="btn btn-primary btn-block" href="/login"><i class="fas fa-bell mr-2"></i>Notify me of new posts</a>
<a class="btn btn-primary btn-block" href="/login"><i class="fas fa-eye-slash mr-2"></i>Block {{hole_prefix}}{{sub.name}}</a>
<a class="btn btn-primary btn-block" href="/login"><i class="fas fa-bell mr-2"></i>Follow {{hole_prefix}}{{sub.name}}</a>
{% endif %}
{% endif %}

4
files/templates/settings.html
View File

@ -20,7 +20,7 @@
<meta property="og:title" content="{{SITE_NAME}}">
<meta property="og:site_name" content="{{SITE}}">
<meta property="og:image" content="{{asset_siteimg('site_preview.webp')}}">
<meta property="og:url" content="{{SITE}}">
<meta property="og:url" content="{{SITE_FULL}}">
<meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta property="og:author" name="author" content="{{SITE_FULL}}">
@ -30,7 +30,7 @@
<meta name="twitter:creator" content="{{SITE_FULL}}">
<meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta name="twitter:image" content="{{asset_siteimg('site_preview.webp')}}">
<meta name="twitter:url" content="{{SITE}}">
<meta name="twitter:url" content="{{SITE_FULL}}">
<style>:root{--primary:#{{v.themecolor}}}</style>

4
files/templates/sign_up.html
View File

@ -18,7 +18,7 @@
<meta property="og:title" content="{{SITE_NAME}}">
<meta property="og:site_name" content="{{SITE}}">
<meta property="og:image" content="{{asset_siteimg('site_preview.webp')}}">
<meta property="og:url" content="{{SITE}}">
<meta property="og:url" content="{{SITE_FULL}}">
<meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta property="og:author" name="author" content="{{SITE_FULL}}">
@ -28,7 +28,7 @@
<meta name="twitter:creator" content="{{SITE_FULL}}">
<meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta name="twitter:image" content="{{asset_siteimg('site_preview.webp')}}">
<meta name="twitter:url" content="{{SITE}}">
<meta name="twitter:url" content="{{SITE_FULL}}">
<title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}</title>

4
files/templates/sign_up_failed_ref.html
View File

@ -19,7 +19,7 @@
<meta property="og:title" content="{{SITE_NAME}}">
<meta property="og:site_name" content="{{SITE}}">
<meta property="og:image" content="{{asset_siteimg('site_preview.webp')}}">
<meta property="og:url" content="{{SITE}}">
<meta property="og:url" content="{{SITE_FULL}}">
<meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta property="og:author" name="author" content="{{SITE_FULL}}">
@ -29,7 +29,7 @@
<meta name="twitter:creator" content="{{SITE_FULL}}">
<meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta name="twitter:image" content="{{asset_siteimg('site_preview.webp')}}">
<meta name="twitter:url" content="{{SITE}}">
<meta name="twitter:url" content="{{SITE_FULL}}">
<title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}</title>

4
files/templates/sub/subs.html
View File

@ -13,6 +13,8 @@
<th>#</th>
<th>Name</th>
<th onclick="sort_table(2)">Posts</th>
<th onclick="sort_table(3)">Followers</th>
<th onclick="sort_table(4)">Blockers</th>
</tr>
</thead>
@ -21,6 +23,8 @@
<td>{{loop.index}}</td>
<td><a href="/h/{{sub.name}}">{{sub.name}} {% if sub.name in v.all_blocks %}<span class="text-danger">[hidden from your main feed, visit it to unhide it]</span>{% endif %}</a></td>
<td><a href="/h/{{sub.name}}" >{{count}}</a></td>
<td><a href="/h/{{sub.name}}/followers">{{sub.follow_num}}</a></td>
<td><a href="/h/{{sub.name}}/blockers">{{sub.block_num}}</a></td>
</tr>
{% endfor %}
</table>

97
files/templates/submission.html
View File

@ -506,61 +506,58 @@
<meta charset="utf-8">
<meta property="og:type" content="article">
{% if comment_info and not comment_info.is_banned and not comment_info.deleted_utc %}
<title>{{'@'+comment_info.author_name}} comments on "{{p.plaintitle(v)}} - {{SITE_NAME}}"</title>
<meta property="og:article:author" content="{{'@'+comment_info.author_name}}">
<meta property="article:published_time" content="{{comment_info.created_datetime}}">
{% if comment_info.edited_utc %}<meta property="article:modified_time" content="{{comment_info.edited_string}}">{% endif %}
<meta property="og:description" name="description" content="{{comment_info.plainbody(v)}}">
<meta property="og:author" name="author" content="{{'@'+comment_info.author_name}}">
<meta property="og:title" content="{{'@'+comment_info.author_name}} comments on {{p.plaintitle(v)}} - {{SITE_NAME}}">
<meta property="og:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{SITE}}{{asset_siteimg('site_preview.webp')}}{% endif %}">
{% if p.is_video %}
<meta property="og:video" content="{{p.realurl(v)}}">
{% elif p.is_audio %}
<meta property="og:audio" content="{{p.realurl(v)}}">
{% endif %}
<meta property="og:url" content="{{comment_info.permalink}}">
<meta property="og:site_name" content="{{SITE}}">
<meta name="twitter:card" content="summary">
<meta name="twitter:site" content="{{SITE_FULL}}">
<meta name="twitter:title" content="{{'@'+comment_info.author_name}} comments on {{p.plaintitle(v)}} - {{SITE_NAME}}">
<meta name="twitter:creator" content="{{'@'+comment_info.author_name}}">
<meta name="twitter:description" content="{{comment_info.plainbody(v)}}">
<meta name="twitter:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{SITE}}{{asset_siteimg('site_preview.webp')}}{% endif %}">
<meta name="twitter:url" content="{{p.permalink}}">
{% else %}
<title>{{p.plaintitle(v)}} - {{SITE_NAME}}</title>
{% if p.author %}<meta property="og:article:author" content="{{'@'+p.author_name}}">{% endif %}
<meta property="article:published_time" content="{{p.created_datetime}}">
{% if p.edited_utc %}<meta property="article:modified_time" content="{{p.edited_string}}">{% endif %}
{% if p.author %}<meta property="og:author" name="author" content="{{'@'+p.author_name}}">{% endif %}
{% if not v_forbid_deleted -%}
<meta property="og:description" name="description" content="{{p.plainbody(v)}}">
<meta property="og:title" content="{{p.plaintitle(v)}} - {{SITE_NAME}}">
<meta property="og:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{SITE}}{{asset_siteimg('site_preview.webp')}}{% endif %}">
<meta property="og:url" content="{{p.permalink}}">
{%- endif %}
<meta property="og:site_name" content="{{SITE}}">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:site" content="{{SITE_FULL}}">
<meta name="twitter:title" content="{{p.plaintitle(v)}} - {{SITE_NAME}}">
{% if not v_forbid_deleted -%}
{% if p.author %}<meta name="twitter:creator" content="{{'@'+p.author_name}}">{% endif %}
<meta name="twitter:description" content="{{p.plainbody(v)}}">
<meta name="twitter:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb %}{{p.thumb_url}}{% else %}{{SITE}}{{asset_siteimg('site_preview.webp')}}{% endif %}">
{%- endif %}
<meta name="twitter:url" content="{{p.permalink}}">
{% if not v_forbid_deleted -%}
<meta property="og:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{SITE_FULL}}{{asset_siteimg('site_preview.webp')}}{% endif %}">
{% if p.is_video %}
<meta property="og:video" content="{{p.realurl(v)}}">
{% elif p.is_audio %}
<meta property="og:audio" content="{{p.realurl(v)}}">
{% endif %}
<meta name="twitter:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{SITE_FULL}}{{asset_siteimg('site_preview.webp')}}{% endif %}">
{% endif %}
{% if comment_info and not comment_info.is_banned and not comment_info.deleted_utc %}
<title>{{'@'+comment_info.author_name}} comments on "{{p.plaintitle(v)}} - {{SITE_NAME}}"</title>
<meta property="og:author" content="{{'@'+comment_info.author_name}}">
<meta property="og:description" name="description" content="{{comment_info.plainbody(v)}}">
<meta property="og:title" content="{{'@'+comment_info.author_name}} comments on {{p.plaintitle(v)}} - {{SITE_NAME}}">
<meta property="og:url" content="{{comment_info.permalink}}">
<meta property="article:author" content="{{'@'+comment_info.author_name}}">
<meta property="article:published_time" content="{{comment_info.created_datetime}}">
{% if comment_info.edited_utc %}
<meta property="article:modified_time" content="{{comment_info.edited_string}}">
{% endif %}
<meta name="twitter:title" content="{{'@'+comment_info.author_name}} comments on {{p.plaintitle(v)}} - {{SITE_NAME}}">
<meta name="twitter:creator" content="{{'@'+comment_info.author_name}}">
<meta name="twitter:description" content="{{comment_info.plainbody(v)}}">
<meta name="twitter:url" content="{{comment_info.permalink}}">
{% else %}
<title>{{p.plaintitle(v)}} - {{SITE_NAME}}</title>
<meta property="og:author" name="author" content="{{'@'+p.author_name}}">
<meta property="og:description" name="description" content="{{p.plainbody(v)}}">
<meta property="og:title" content="{{p.plaintitle(v)}} - {{SITE_NAME}}">
<meta property="og:url" content="{{p.permalink}}">
<meta property="article:author" content="{{'@'+p.author_name}}">
<meta property="article:published_time" content="{{p.created_datetime}}">
{% if p.edited_utc %}
<meta property="article:modified_time" content="{{p.edited_string}}">
{% endif %}
<meta name="twitter:title" content="{{p.plaintitle(v)}} - {{SITE_NAME}}">
<meta name="twitter:creator" content="{{'@'+p.author_name}}">
<meta name="twitter:description" content="{{p.plainbody(v)}}">
<meta name="twitter:url" content="{{p.permalink}}">
{%- endif %}
{% endblock %}
{% block pagetype %}thread{% endblock %}

2
files/templates/util/assetcache.html
View File

@ -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,

6
snappy_rDrama.txt
View File

@ -2991,10 +2991,4 @@ https://rdrama.net/videos/16624761306946733.mp4
{[para]}
@joebiden @soren
{[para]}
> Discuss
No.
:#marseyorthodox:
{[para]}
TRANS LIVES MATTER