Merge pull request 'Don't strip newlines in pre' (#709) from snan/akkoma:pre into develop

Reviewed-on: #709
2024-04-24 17:00:34 +00:00 · 2024-04-24 17:00:34 +00:00 · 80e1c094c7
parent 4a0e90e8a8 6116f81546
commit 80e1c094c7
1 changed files with 1 additions and 3 deletions
--- a/lib/pleroma/web/feed/feed_view.ex
+++ b/lib/pleroma/web/feed/feed_view.ex
@ -78,9 +78,7 @@ defmodule Pleroma.Web.Feed.FeedView do
  end

  def activity_content(%{"content" => content}) do
-    content
-    |> String.replace(~r/[\n\r]/, "")
-    |> escape()
+    escape(content)
  end

  def activity_content(_), do: ""