nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

turn inlineQuotePolicy on by default

Browse source
This commit is contained in:
FloatingGhost 2022-09-05 17:22:33 +01:00
parent f6304cfd78
commit 6c80977b06
3 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/activity_pub/mrf.ex
View file

@ -95,7 +95,11 @@ def pipeline_filter(%{} = message, meta) do
def get_policies do def get_policies do
Pleroma.Config.get([:mrf, :policies], []) Pleroma.Config.get([:mrf, :policies], [])
|> get_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 end
defp get_policies(policy) when is_atom(policy), do: [policy] defp get_policies(policy) when is_atom(policy), do: [policy]

34
test/pleroma/web/activity_pub/builder_test.exs
View file

@ -82,23 +82,27 @@ test "custom emoji" do
test "remote custom emoji" do test "remote custom emoji" do
user = insert(:user) user = insert(:user)
other_user = insert(:user, local: false) 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, assert {:ok,
%{ %{
"content" => ":wow:", "content" => ":wow:",
"type" => "EmojiReact", "type" => "EmojiReact",
"tag" => [ "tag" => [
%{ %{
"name" => ":wow:", "name" => ":wow:",
"id" => "https://remote/emoji/wow", "id" => "https://remote/emoji/wow",
"icon" => %{ "icon" => %{
"type" => "Image", "type" => "Image",
"url" => "https://remote/emoji/wow" "url" => "https://remote/emoji/wow"
} }
} }
] ]
}, []} = Builder.emoji_react(user, note, ":wow@remote:") }, []} = Builder.emoji_react(user, note, ":wow@remote:")
end end
end end
end end

4
test/pleroma/web/activity_pub/mrf_test.exs
View file

@ -77,7 +77,7 @@ test "it works as expected with noop policy" do
clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.NoOpPolicy]) clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.NoOpPolicy])
expected = %{ expected = %{
mrf_policies: ["NoOpPolicy", "HashtagPolicy"], mrf_policies: ["NoOpPolicy", "HashtagPolicy", "InlineQuotePolicy"],
mrf_hashtag: %{ mrf_hashtag: %{
federated_timeline_removal: [], federated_timeline_removal: [],
reject: [], reject: [],
@ -93,7 +93,7 @@ test "it works as expected with mock policy" do
clear_config([:mrf, :policies], [MRFModuleMock]) clear_config([:mrf, :policies], [MRFModuleMock])
expected = %{ expected = %{
mrf_policies: ["MRFModuleMock", "HashtagPolicy"], mrf_policies: ["MRFModuleMock", "HashtagPolicy", "InlineQuotePolicy"],
mrf_module_mock: "some config data", mrf_module_mock: "some config data",
mrf_hashtag: %{ mrf_hashtag: %{
federated_timeline_removal: [], federated_timeline_removal: [],