feat: discoverability (NodeInfo, hashtags) and moderation (domain/actor blocking)
- NodeInfo at /.well-known/nodeinfo + /nodeinfo/2.0
- Hashtags #MoviesDiary + #MovieTitle on review posts; /tags/{tag} redirect
- Domain blocking: blocked_domains table, admin API + HTML, inbox enforcement
- Per-actor blocking: blocked_actors table, user API + HTML, BlockActivity send/receive
- Delivery filter excludes blocked actors and blocked-domain inboxes
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
use application::ports::{
|
||||
ActivityFeedPageData, FollowersPageData, FollowingPageData, HtmlPageContext, HtmlRenderer,
|
||||
ActivityFeedPageData, BlockedActorEntry, BlockedActorsPageData, BlockedDomainEntry,
|
||||
BlockedDomainsPageData, FollowersPageData, FollowingPageData, HtmlPageContext, HtmlRenderer,
|
||||
ImportMappingPageData, ImportPreviewPageData, ImportPreviewRow, ImportProfileView,
|
||||
ImportRowStatus, ImportUploadPageData, LoginPageData, MovieDetailPageData, NewReviewPageData,
|
||||
ProfilePageData, ProfileSettingsPageData, RegisterPageData, UsersPageData,
|
||||
@@ -224,6 +225,20 @@ struct FollowersTemplate {
|
||||
error: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "blocked_domains.html")]
|
||||
struct BlockedDomainsTemplate<'a> {
|
||||
ctx: &'a HtmlPageContext,
|
||||
domains: &'a [BlockedDomainEntry],
|
||||
}
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "blocked_actors.html")]
|
||||
struct BlockedActorsTemplate<'a> {
|
||||
ctx: &'a HtmlPageContext,
|
||||
actors: &'a [BlockedActorEntry],
|
||||
}
|
||||
|
||||
struct HeatmapCell {
|
||||
month_label: String,
|
||||
count: i64,
|
||||
@@ -672,4 +687,22 @@ impl HtmlRenderer for AskamaHtmlRenderer {
|
||||
.render()
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
fn render_blocked_domains_page(&self, data: BlockedDomainsPageData) -> Result<String, String> {
|
||||
BlockedDomainsTemplate {
|
||||
ctx: &data.ctx,
|
||||
domains: &data.domains,
|
||||
}
|
||||
.render()
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
fn render_blocked_actors_page(&self, data: BlockedActorsPageData) -> Result<String, String> {
|
||||
BlockedActorsTemplate {
|
||||
ctx: &data.ctx,
|
||||
actors: &data.actors,
|
||||
}
|
||||
.render()
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
{% extends "base.html" %}
|
||||
{% block content %}
|
||||
<h2>Blocked Users</h2>
|
||||
|
||||
{% if actors.is_empty() %}
|
||||
<p>No users blocked.</p>
|
||||
{% else %}
|
||||
<ul class="following-list">
|
||||
{% for a in actors %}
|
||||
<li class="following-item">
|
||||
{% if let Some(avatar) = a.avatar_url %}
|
||||
<img src="{{ avatar }}" alt="avatar" style="width:32px;height:32px;border-radius:50%" />
|
||||
{% endif %}
|
||||
<strong>{{ a.handle }}</strong>{% if let Some(name) = a.display_name %} ({{ name }}){% endif %}
|
||||
<form method="POST" action="/social/unblock" style="display:inline">
|
||||
<input type="hidden" name="_csrf" value="{{ ctx.csrf_token }}" />
|
||||
<input type="hidden" name="actor_url" value="{{ a.url }}" />
|
||||
<button type="submit">Unblock</button>
|
||||
</form>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,35 @@
|
||||
{% extends "base.html" %}
|
||||
{% block content %}
|
||||
<h2>Blocked Domains</h2>
|
||||
|
||||
<form method="POST" action="/admin/blocked-domains">
|
||||
<input type="hidden" name="_csrf" value="{{ ctx.csrf_token }}" />
|
||||
<div>
|
||||
<label for="domain">Domain</label>
|
||||
<input id="domain" type="text" name="domain" placeholder="spam.example.com" required />
|
||||
</div>
|
||||
<div>
|
||||
<label for="reason">Reason (optional)</label>
|
||||
<input id="reason" type="text" name="reason" />
|
||||
</div>
|
||||
<button type="submit">Block Domain</button>
|
||||
</form>
|
||||
|
||||
{% if domains.is_empty() %}
|
||||
<p>No domains blocked.</p>
|
||||
{% else %}
|
||||
<ul>
|
||||
{% for d in domains %}
|
||||
<li>
|
||||
<strong>{{ d.domain }}</strong>{% if let Some(r) = d.reason %} — {{ r }}{% endif %}
|
||||
({{ d.blocked_at }})
|
||||
<form method="POST" action="/admin/blocked-domains/remove" style="display:inline">
|
||||
<input type="hidden" name="_csrf" value="{{ ctx.csrf_token }}" />
|
||||
<input type="hidden" name="domain" value="{{ d.domain }}" />
|
||||
<button type="submit">Unblock</button>
|
||||
</form>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
@@ -20,6 +20,11 @@
|
||||
<input type="hidden" name="_csrf" value="{{ ctx.csrf_token }}">
|
||||
<button type="submit">Remove</button>
|
||||
</form>
|
||||
<form method="POST" action="/social/block" style="display:inline">
|
||||
<input type="hidden" name="actor_url" value="{{ actor.url }}">
|
||||
<input type="hidden" name="_csrf" value="{{ ctx.csrf_token }}">
|
||||
<button type="submit">Block</button>
|
||||
</form>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
@@ -20,6 +20,11 @@
|
||||
<input type="hidden" name="_csrf" value="{{ ctx.csrf_token }}">
|
||||
<button type="submit">Unfollow</button>
|
||||
</form>
|
||||
<form method="POST" action="/social/block" style="display:inline">
|
||||
<input type="hidden" name="actor_url" value="{{ actor.url }}">
|
||||
<input type="hidden" name="_csrf" value="{{ ctx.csrf_token }}">
|
||||
<button type="submit">Block</button>
|
||||
</form>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
Reference in New Issue
Block a user