Merge branch 'mrf-silence-2' into 'develop'

MRF silencing alternative solution

See merge request pleroma/pleroma!2820

diff --combined config/description.exs
index 11fbe0d788b4181957fc38332b6827f0ab6427c5,99cbc04dba3a238f814ccb78998330166ff48d67..d623a9f75f3d3a110f755e61600daaea820ce75e
--- 1/config/description.exs
--- 2/config/description.exs
+++ b/config/description.exs
@@@ -955,11 -955,6 +955,11 @@@ config :pleroma, :config_description, 
          description:
            "The instance thumbnail can be any image that represents your instance and is used by some apps or services when they display information about your instance.",
          suggestions: ["/instance/thumbnail.jpeg"]
 +      },
 +      %{
 +        key: :show_reactions,
 +        type: :boolean,
 +        description: "Let favourites and emoji reactions be viewed through the API."
        }
      ]
    },
@@@ -1542,6 -1537,12 +1542,12 @@@
          description: "List of instances to only accept activities from (except deletes)",
          suggestions: ["example.com", "*.example.com"]
        },
+       %{
+         key: :followers_only,
+         type: {:list, :string},
+         description: "Force posts from the given instances to be visible by followers only",
+         suggestions: ["example.com", "*.example.com"]
+       },
        %{
          key: :report_removal,
          type: {:list, :string},

diff --combined docs/configuration/cheatsheet.md
index 9c768abef356cfbe2ed633a4b5254c14090d00a6,65cccda3098952aeb4ff2f66abaebf73efe98fc1..7de82a41d4a1b375b4fd15f8a295fe7c852eedde
--- 1/docs/configuration/cheatsheet.md
--- 2/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@@ -62,7 -62,6 +62,7 @@@ To add configuration to your config fil
  * `registration_reason_length`: Maximum registration reason length (default: `500`).
  * `external_user_synchronization`: Enabling following/followers counters synchronization for external users.
  * `cleanup_attachments`: Remove attachments along with statuses. Does not affect duplicate files and attachments without status. Enabling this will increase load to database when deleting statuses on larger instances.
 +* `show_reactions`: Let favourites and emoji reactions be viewed through the API (default: `true`).
  
  ## Welcome
  * `direct_message`: - welcome message sent as a direct message.
@@@ -125,6 -124,7 +125,7 @@@
  * `federated_timeline_removal`: List of instances to remove from Federated (aka The Whole Known Network) Timeline.
  * `reject`: List of instances to reject any activities from.
  * `accept`: List of instances to accept any activities from.
+ * `followers_only`: List of instances to decrease post visibility to only the followers, including for DM mentions.
  * `report_removal`: List of instances to reject reports from.
  * `avatar_removal`: List of instances to strip avatars from.
  * `banner_removal`: List of instances to strip banners from.