diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-08 19:58:02 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-08 19:58:02 +0300 |
| commit | d458f4fdcafe847a7db8b1c663cfd945019816b7 (patch) | |
| tree | 52f3be61056d6e2e10f296b33bb3aaba75923d55 /config | |
| parent | e84fee5b8624c8909ddd8a7e0d99c6beea4f54d0 (diff) | |
| download | pleroma-d458f4fdcafe847a7db8b1c663cfd945019816b7.tar.gz pleroma-d458f4fdcafe847a7db8b1c663cfd945019816b7.zip | |
[#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 | ||||
| -rw-r--r-- | config/description.exs | 20 |
2 files changed, 7 insertions, 18 deletions
diff --git a/config/config.exs b/config/config.exs index 370828c1c..62a10ca41 100644 --- a/config/config.exs +++ b/config/config.exs @@ -340,6 +340,7 @@ config :pleroma, :activitypub, unfollow_blocked: true, outgoing_blocks: true, follow_handshake_timeout: 500, + note_replies_output_limit: 5, sign_object_fetches: true config :pleroma, :streamer, @@ -624,10 +625,6 @@ config :pleroma, :modules, runtime_dir: "instance/modules" config :pleroma, configurable_from_database: false -config :pleroma, :mastodon_compatibility, - # https://git.pleroma.social/pleroma/pleroma/issues/1505 - federated_note_replies_limit: 5 - config :swarm, node_blacklist: [~r/myhtml_.*$/] # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. diff --git a/config/description.exs b/config/description.exs index 909ae00d9..9fd52f50e 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1791,6 +1791,12 @@ config :pleroma, :config_description, [ description: "Sign object fetches with HTTP signatures" }, %{ + key: :note_replies_output_limit, + type: :integer, + description: + "The number of Note replies' URIs to be included with outgoing federation (`5` to match Mastodon hardcoded value, `0` to disable the output)." + }, + %{ key: :follow_handshake_timeout, type: :integer, description: "Following handshake timeout", @@ -3099,20 +3105,6 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, - key: :mastodon_compatibility, - type: :group, - description: "Mastodon compatibility-related settings.", - children: [ - %{ - key: :federated_note_replies_limit, - type: :integer, - description: - "The number of Note self-reply URIs to be included with outgoing federation (`5` to mimic Mastodon hardcoded value, `0` to disable)." - } - ] - }, - %{ - group: :pleroma, type: :group, description: "Allow instance configuration from database.", children: [ |