From: FloatingGhost Date: Mon, 5 Sep 2022 16:22:33 +0000 (+0100) Subject: turn inlineQuotePolicy on by default X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6c80977b064dc1aea1fe50a8d636cdf40875a757;p=akkoma turn inlineQuotePolicy on by default --- diff --git a/lib/pleroma/web/activity_pub/mrf.ex b/lib/pleroma/web/activity_pub/mrf.ex index 5606dac83..20bce0d5f 100644 --- a/lib/pleroma/web/activity_pub/mrf.ex +++ b/lib/pleroma/web/activity_pub/mrf.ex @@ -95,7 +95,11 @@ defmodule Pleroma.Web.ActivityPub.MRF do def get_policies do Pleroma.Config.get([:mrf, :policies], []) |> get_policies() - |> Enum.concat([Pleroma.Web.ActivityPub.MRF.HashtagPolicy]) + |> Enum.concat([ + Pleroma.Web.ActivityPub.MRF.HashtagPolicy, + Pleroma.Web.ActivityPub.MRF.InlineQuotePolicy + ]) + |> Enum.uniq() end defp get_policies(policy) when is_atom(policy), do: [policy] diff --git a/test/pleroma/web/activity_pub/builder_test.exs b/test/pleroma/web/activity_pub/builder_test.exs index 98d20f022..9269733b7 100644 --- a/test/pleroma/web/activity_pub/builder_test.exs +++ b/test/pleroma/web/activity_pub/builder_test.exs @@ -82,23 +82,27 @@ defmodule Pleroma.Web.ActivityPub.BuilderTest do test "remote custom emoji" do user = insert(:user) other_user = insert(:user, local: false) - note = insert(:note, data: %{"reactions" => [["wow", [other_user.ap_id], "https://remote/emoji/wow"]]}) + + note = + insert(:note, + data: %{"reactions" => [["wow", [other_user.ap_id], "https://remote/emoji/wow"]]} + ) assert {:ok, - %{ - "content" => ":wow:", - "type" => "EmojiReact", - "tag" => [ - %{ - "name" => ":wow:", - "id" => "https://remote/emoji/wow", - "icon" => %{ - "type" => "Image", - "url" => "https://remote/emoji/wow" - } - } - ] - }, []} = Builder.emoji_react(user, note, ":wow@remote:") + %{ + "content" => ":wow:", + "type" => "EmojiReact", + "tag" => [ + %{ + "name" => ":wow:", + "id" => "https://remote/emoji/wow", + "icon" => %{ + "type" => "Image", + "url" => "https://remote/emoji/wow" + } + } + ] + }, []} = Builder.emoji_react(user, note, ":wow@remote:") end end end diff --git a/test/pleroma/web/activity_pub/mrf_test.exs b/test/pleroma/web/activity_pub/mrf_test.exs index 6ab27bc86..ed3233758 100644 --- a/test/pleroma/web/activity_pub/mrf_test.exs +++ b/test/pleroma/web/activity_pub/mrf_test.exs @@ -77,7 +77,7 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.NoOpPolicy]) expected = %{ - mrf_policies: ["NoOpPolicy", "HashtagPolicy"], + mrf_policies: ["NoOpPolicy", "HashtagPolicy", "InlineQuotePolicy"], mrf_hashtag: %{ federated_timeline_removal: [], reject: [], @@ -93,7 +93,7 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do clear_config([:mrf, :policies], [MRFModuleMock]) expected = %{ - mrf_policies: ["MRFModuleMock", "HashtagPolicy"], + mrf_policies: ["MRFModuleMock", "HashtagPolicy", "InlineQuotePolicy"], mrf_module_mock: "some config data", mrf_hashtag: %{ federated_timeline_removal: [],