turn inlineQuotePolicy on by default

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

View file

@ -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]

View file

@ -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

View file

@ -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: [],