Browse Source

Merge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop'

Expose `skip_thread_containment` in nodeinfo

Closes #1030

See merge request pleroma/pleroma!1349
tags/v1.1.4
rinpatch 5 years ago
parent
commit
497788a3cc
2 changed files with 5 additions and 1 deletions
  1. +3
    -0
      CHANGELOG.md
  2. +2
    -1
      lib/pleroma/web/nodeinfo/nodeinfo_controller.ex

+ 3
- 0
CHANGELOG.md View File

@@ -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


+ 2
- 1
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex View File

@@ -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


Loading…
Cancel
Save