Merge branch 'admin_fe_dont_list_mrf_policies_any_more' into 'develop'

Selecting MRF policies didn't work as intended any more

Closes admin-fe#198

See merge request pleroma/pleroma!3509

diff --combined lib/pleroma/web/activity_pub/mrf.ex
index 23ea039c34b24af5903c5a14d4338930887ab39c,41592e71e45dec858bddc23b6204b52a9586f928..e4ee8fe827fae7fdf827a517cb247fa708c1e054
--- 1/lib/pleroma/web/activity_pub/mrf.ex
--- 2/lib/pleroma/web/activity_pub/mrf.ex
+++ b/lib/pleroma/web/activity_pub/mrf.ex
@@@ -21,7 -21,7 +21,7 @@@ defmodule Pleroma.Web.ActivityPub.MRF d
            type: [:module, {:list, :module}],
            description:
              "A list of MRF policies enabled. Module names are shortened (removed leading `Pleroma.Web.ActivityPub.MRF.` part), but on adding custom module you need to use full name.",
-           suggestions: {:list_behaviour_implementations, Pleroma.Web.ActivityPub.MRF}
+           suggestions: {:list_behaviour_implementations, Pleroma.Web.ActivityPub.MRF.Policy}
          },
          %{
            key: :transparency,
@@@ -33,11 -33,9 +33,11 @@@
          %{
            key: :transparency_exclusions,
            label: "MRF transparency exclusions",
 -          type: {:list, :string},
 +          type: {:list, :tuple},
 +          key_placeholder: "instance",
 +          value_placeholder: "reason",
            description:
 -            "Exclude specific instance names from MRF transparency. The use of the exclusions feature will be disclosed in nodeinfo as a boolean value.",
 +            "Exclude specific instance names from MRF transparency. The use of the exclusions feature will be disclosed in nodeinfo as a boolean value. You can also provide a reason for excluding these instance names. The instances and reasons won't be publicly disclosed.",
            suggestions: [
              "exclusion.com"
            ]
@@@ -102,11 -100,6 +102,11 @@@
      Enum.any?(domains, fn domain -> Regex.match?(domain, host) end)
    end
  
 +  @spec instance_list_from_tuples([{String.t(), String.t()}]) :: [String.t()]
 +  def instance_list_from_tuples(list) do
 +    Enum.map(list, fn {instance, _} -> instance end)
 +  end
 +
    def describe(policies) do
      {:ok, policy_configs} =
        policies