From 51534fbd520572e34c256cdd1d5327e4e3a06a1f Mon Sep 17 00:00:00 2001 From: trisua Date: Mon, 7 Apr 2025 16:32:09 -0400 Subject: [PATCH] add: nsfw marker for posts/communities --- crates/app/src/public/html/auth/base.html | 2 +- crates/app/src/public/html/communities/base.html | 15 ++++++++++++++- crates/app/src/public/html/communities/post.html | 5 +++++ .../app/src/public/html/communities/settings.html | 5 +++++ crates/app/src/public/html/components.html | 12 ++++++++++-- crates/core/src/database/communities.rs | 2 +- crates/core/src/database/posts.rs | 7 +++++-- crates/core/src/model/communities.rs | 8 ++++++++ 8 files changed, 49 insertions(+), 7 deletions(-) diff --git a/crates/app/src/public/html/auth/base.html b/crates/app/src/public/html/auth/base.html index 40ebd28..c1531c0 100644 --- a/crates/app/src/public/html/auth/base.html +++ b/crates/app/src/public/html/auth/base.html @@ -1,4 +1,4 @@ -{% extends "root.html" %} {% block body %} +{% import "macros.html" as macros %} {% extends "root.html" %} {% block body %}

{% block title %}{% endblock %}

diff --git a/crates/app/src/public/html/communities/base.html b/crates/app/src/public/html/communities/base.html index f189f26..74000d4 100644 --- a/crates/app/src/public/html/communities/base.html +++ b/crates/app/src/public/html/communities/base.html @@ -16,13 +16,26 @@ community=community, size="72px") }}
-

+

{% if community.context.display_name %} {{ community.context.display_name }} {% else %} {{ community.title }} {% endif %} + + {% if community.context.is_nsfw %} + + {{ icon "square-asterisk" }} + + {% endif %}

{% if user %} {% if user.id != community.owner diff --git a/crates/app/src/public/html/communities/post.html b/crates/app/src/public/html/communities/post.html index b9b8314..b573e1d 100644 --- a/crates/app/src/public/html/communities/post.html +++ b/crates/app/src/public/html/communities/post.html @@ -116,6 +116,11 @@ "{{ post.context.comments_enabled }}", "checkbox", ], + [ + ["is_nsfw", "Mark as NSFW"], + "{{ community.context.is_nsfw }}", + "checkbox", + ], ]; if (can_manage_pins) { diff --git a/crates/app/src/public/html/communities/settings.html b/crates/app/src/public/html/communities/settings.html index 36d8c27..dbba102 100644 --- a/crates/app/src/public/html/communities/settings.html +++ b/crates/app/src/public/html/communities/settings.html @@ -548,6 +548,11 @@ "{{ community.context.description }}", "textarea", ], + [ + ["is_nsfw", "Mark as NSFW"], + "{{ community.context.is_nsfw }}", + "checkbox", + ], ], settings, ); diff --git a/crates/app/src/public/html/components.html b/crates/app/src/public/html/components.html index 4356ccd..b532f78 100644 --- a/crates/app/src/public/html/components.html +++ b/crates/app/src/public/html/components.html @@ -157,6 +157,14 @@ show_community and post.community != config.town_square %} {{ components::community_avatar(id=post.community) }} {% endif %} + {% endif %} {% if post.context.is_nsfw %} + + {{ icon "square-asterisk" }} + {% endif %}
@@ -389,7 +397,7 @@ config.town_square and user %}
@@ -409,7 +417,7 @@ config.town_square and user %}