From 34940a65dfaeeade71a830f0a2d13cec526133d6 Mon Sep 17 00:00:00 2001 From: localhost_frssoft Date: Sat, 11 Nov 2023 02:59:32 +0300 Subject: [PATCH] MRF policies fix --- mastodon/instance.go | 12 ++++++++++-- templates/aboutinstance.tmpl | 14 ++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/mastodon/instance.go b/mastodon/instance.go index 761a021..09ad61e 100644 --- a/mastodon/instance.go +++ b/mastodon/instance.go @@ -64,8 +64,16 @@ type MetaData struct { } type FederationInfo struct { - Enabled bool `json:enabled"` - MrfPolicies []string `json:mrf_policies"` + Enabled bool `json:"enabled"` + MrfPolicies []string `json:"mrf_policies"` + MrfSimple MRFSimple `json:"mrf_simple"` +} + +type MRFSimple struct { + Reject []string `json:"reject"` + MediaNsfw []string `json:"media_nsfw"` + FederatedTimelineRemoval []string `json:"federated_timeline_removal"` + RejectDeletes []string `json:"reject_deletes"` } diff --git a/templates/aboutinstance.tmpl b/templates/aboutinstance.tmpl index 93ba23f..1e2c300 100644 --- a/templates/aboutinstance.tmpl +++ b/templates/aboutinstance.tmpl @@ -73,10 +73,16 @@
{{if .Instance.Pleroma}}
Federation enabled: {{.Instance.Pleroma.MetaData.Federation.Enabled}}
-
MRF Policies
- {{range .Instance.Pleroma.MetaData.Federation.MrfPolicies}} - {{.}}
- {{end}} +
MRF Policies
+ {{range .Instance.Pleroma.MetaData.Federation.MrfPolicies}}{{.}}
{{end}} +
Rejected instances
+ {{range .Instance.Pleroma.MetaData.Federation.MrfSimple.Reject}}{{.}}
{{end}} +
Force NSFW instances
+ {{range .Instance.Pleroma.MetaData.Federation.MrfSimple.MediaNsfw}}{{.}}
{{end}} +
Hiden from federated timeline instances
+ {{range .Instance.Pleroma.MetaData.Federation.MrfSimple.FederatedTimelineRemoval}}{{.}}
{{end}} +
Rejected deletion activities
+ {{range .Instance.Pleroma.MetaData.Federation.MrfSimple.RejectDeletes}}{{.}}
{{end}} {{end}}
Current peers ({{.Instance.Stats.DomainCount}})