limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

InlineQuotePolicy: improve the way Markdown quotes are displayed by other software

Browse source
This commit is contained in:
Alex Gleason 2022-01-28 16:07:17 -06:00 committed by tusooa
parent 817e308c0d
commit 4075eecca0
No known key found for this signature in database
GPG key ID: 42AEC43D48433C51
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

4
test/pleroma/web/activity_pub/mrf/inline_quote_policy_test.exs
View file

@ -22,7 +22,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.InlineQuotePolicyTest do
{:ok, %{"object" => %{"content" => filtered}}} = InlineQuotePolicy.filter(activity) {:ok, %{"object" => %{"content" => filtered}}} = InlineQuotePolicy.filter(activity)
assert filtered == 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>" "Nice post<span class=\"quote-inline\"><br/><br/>RT: <a href=\"https://gleasonator.com/objects/1234\">https://gleasonator.com/objects/1234</a></span>"
end end
test "doesn't add line breaks to markdown posts" do test "doesn't add line breaks to markdown posts" do
@ -41,7 +41,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.InlineQuotePolicyTest do
{:ok, %{"object" => %{"content" => filtered}}} = InlineQuotePolicy.filter(activity) {:ok, %{"object" => %{"content" => filtered}}} = InlineQuotePolicy.filter(activity)
assert filtered == assert filtered ==
"<p>Nice post</p><span class=\"quote-inline\">RT: <a href=\"https://gleasonator.com/objects/1234\">https://gleasonator.com/objects/1234</a></span>" "<p>Nice post<span class=\"quote-inline\"><br/><br/>RT: <a href=\"https://gleasonator.com/objects/1234\">https://gleasonator.com/objects/1234</a></span></p>"
end end
test "ignores Misskey quote posts" do test "ignores Misskey quote posts" do