Merge remote-tracking branch 'origin/develop' into shigusegubu

* origin/develop: (33 commits)
  maybe_notify_subscribers: Don't create notifications from ingested messages
  TwitterAPI: Make change_email require body params instead of query
  TwitterAPI: Make change_password require body params instead of query
  Make the OPT recomendation clearer
  ObjectAgePolicy: Fix pattern matching on published
  fix: stream out Create Activity
  Improve readability
  Quarantine placeholders
  improve changelog entry
  Make transparency_exclusions use tuples in admin-fe
  Add key- and valuePlaceholders for quarantined_instances and mrf_simple
  Add transparency_exclusions also to the breaking changes
  Change docs
  quarantine instances info
  Change what nodeinfo returns without breaking backwards compatibility
  Return maps in node_info
  Add database migrations
  Fixed deprecation warning checks
  config/description.exs: Update quarantine settings to tuples
  make linter happy
  ...
This commit is contained in:
Henry Jameson 2021-08-11 21:56:37 +03:00
commit 9916734b76
52 changed files with 1372 additions and 322 deletions

View file

@ -574,6 +574,7 @@ config :pleroma, Oban,
mailer: 10,
transmogrifier: 20,
scheduled_activities: 10,
poll_notifications: 10,
background: 5,
remote_fetcher: 2,
attachments_cleanup: 1,

View file

@ -687,12 +687,14 @@ config :pleroma, :config_description, [
},
%{
key: :quarantined_instances,
type: {:list, :string},
type: {:list, :tuple},
key_placeholder: "instance",
value_placeholder: "reason",
description:
"List of ActivityPub instances where private (DMs, followers-only) activities will not be sent",
"List of ActivityPub instances where private (DMs, followers-only) activities will not be sent and the reason for doing so",
suggestions: [
"quarantined.com",
"*.quarantined.com"
{"quarantined.com", "Reason"},
{"*.quarantined.com", "Reason"}
]
},
%{