moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

InlineQuotePolicy: don't add line breaks to markdown posts

This commit is contained in:
Alex Gleason 2022-01-27 14:28:06 -06:00 committed by tusooa
parent 74e0a4555f
commit bee7e41959
No known key found for this signature in database
GPG Key ID: 42AEC43D48433C51
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/pleroma/web/activity_pub/mrf/inline_quote_policy.ex
View File

@ -6,8 +6,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.InlineQuotePolicy do
@moduledoc "Force a quote line into the message content."
@behaviour Pleroma.Web.ActivityPub.MRF.Policy
defp build_inline_quote(prefix, url) do
"<span class=\"quote-inline\"><br><br>#{prefix}: <a href=\"#{url}\">#{url}</a></span>"
defp build_inline_quote(prefix, url, br) do
"<span class=\"quote-inline\">#{String.duplicate("<br>", br)}#{prefix}: <a href=\"#{url}\">#{url}</a></span>"
end
defp filter_object(%{"quoteUrl" => quote_url} = object) do
@ -17,7 +17,13 @@ defp filter_object(%{"quoteUrl" => quote_url} = object) do
object
else
prefix = Pleroma.Config.get([:mrf_inline_quote, :prefix])
content = content <> build_inline_quote(prefix, quote_url)
inline_quote =
if String.ends_with?(content, "</p>"),
do: build_inline_quote(prefix, quote_url, 0),
else: build_inline_quote(prefix, quote_url, 2)
content = content <> inline_quote
Map.put(object, "content", content)
end
end

21
test/pleroma/web/activity_pub/mrf/inline_quote_policy_test.exs
View File

@ -9,6 +9,25 @@ defmodule Pleroma.Web.ActivityPub.MRF.InlineQuotePolicyTest do
test "adds quote URL to post content" do
quote_url = "https://gleasonator.com/objects/1234"
activity = %{
"type" => "Create",
"actor" => "https://gleasonator.com/users/alex",
"object" => %{
"type" => "Note",
"content" => "Nice post",
"quoteUrl" => quote_url
}
}
{:ok, %{"object" => %{"content" => filtered}}} = InlineQuotePolicy.filter(activity)
assert filtered ==
"Nice post<span class=\"quote-inline\"><br><br>RT: <a href=\"https://gleasonator.com/objects/1234\">https://gleasonator.com/objects/1234</a></span>"
end
test "doesn't add line breaks to markdown posts" do
quote_url = "https://gleasonator.com/objects/1234"
activity = %{
"type" => "Create",
"actor" => "https://gleasonator.com/users/alex",
@ -22,7 +41,7 @@ test "adds quote URL to post content" do
{:ok, %{"object" => %{"content" => filtered}}} = InlineQuotePolicy.filter(activity)
assert filtered ==
"<p>Nice post</p><span class=\"quote-inline\"><br><br>RT: <a href=\"https://gleasonator.com/objects/1234\">https://gleasonator.com/objects/1234</a></span>"
"<p>Nice post</p><span class=\"quote-inline\">RT: <a href=\"https://gleasonator.com/objects/1234\">https://gleasonator.com/objects/1234</a></span>"
end
test "ignores Misskey quote posts" do