diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-07-03 18:35:57 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-07-03 18:35:57 +0000 |
| commit | 497788a3cc8133e05b3b86a1731bf9d9cc583ce7 (patch) | |
| tree | 90ed70f1224a7830e6c6d06e298357ce38671d7c | |
| parent | 9b45feae9b5102acb7b9431faa7eaaffcd7e634f (diff) | |
| parent | 15eb1235ed54b65d79a6e955be7b4302993bd620 (diff) | |
| download | pleroma-497788a3cc8133e05b3b86a1731bf9d9cc583ce7.tar.gz | |
Merge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop'
Expose `skip_thread_containment` in nodeinfo
Closes #1030
See merge request pleroma/pleroma!1349
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index aefc09177..3dbbd8225 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed - Configuration: Filter.AnonymizeFilename added ability to retain file extension with custom text +### Changed +- NodeInfo: Return `skipThreadContainment` in `metadata` for the `skip_thread_containment` option + ## [1.0.0] - 2019-06-29 ### Security - Mastodon API: Fix display names not being sanitized diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 32be430b7..869dda5c5 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -162,7 +162,8 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do accountActivationRequired: Config.get([:instance, :account_activation_required], false), invitesEnabled: Config.get([:instance, :invites_enabled], false), features: features, - restrictedNicknames: Config.get([Pleroma.User, :restricted_nicknames]) + restrictedNicknames: Config.get([Pleroma.User, :restricted_nicknames]), + skipThreadContainment: Config.get([:instance, :skip_thread_containment], false) } } end |