pleroma

commit: bee7e419597615ac6852942fe563166feba3fe73
parent 74e0a4555f583a6962ad116bf6e54f06e42fe465
Author: Alex Gleason <alex@alexgleason.me>
Date:   Thu, 27 Jan 2022 14:28:06 -0600

InlineQuotePolicy: don't add line breaks to markdown posts

Diffstat:
M
lib/pleroma/web/activity_pub/mrf/inline_quote_policy.ex
12
+++++++++---
M
test/pleroma/web/activity_pub/mrf/inline_quote_policy_test.exs
21
++++++++++++++++++++-

2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/lib/pleroma/web/activity_pub/mrf/inline_quote_policy.ex b/lib/pleroma/web/activity_pub/mrf/inline_quote_policy.ex
@@ -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 @@ defmodule Pleroma.Web.ActivityPub.MRF.InlineQuotePolicy 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
diff --git a/test/pleroma/web/activity_pub/mrf/inline_quote_policy_test.exs b/test/pleroma/web/activity_pub/mrf/inline_quote_policy_test.exs
@@ -14,6 +14,25 @@ defmodule Pleroma.Web.ActivityPub.MRF.InlineQuotePolicyTest do
       "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",
+      "object" => %{
+        "type" => "Note",
         "content" => "<p>Nice post</p>",
         "quoteUrl" => quote_url
       }
@@ -22,7 +41,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.InlineQuotePolicyTest 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