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

Reviewed-on: #709
Don't strip newlines in the Atom feed
2024-04-24 17:00:34 +00:00 · 2024-03-11 12:50:14 +01:00
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: ""
Author	SHA1	Message	Date
floatingghost	80e1c094c7	Merge pull request 'Don't strip newlines in pre' (#709 ) from snan/akkoma:pre into develop ci/woodpecker/push/build-amd64 Pipeline is pending Details ci/woodpecker/push/build-arm64 Pipeline is pending Details ci/woodpecker/push/docs Pipeline is pending Details ci/woodpecker/push/lint Pipeline is pending Details ci/woodpecker/push/test Pipeline is pending Details Reviewed-on: #709	2024-04-24 17:00:34 +00:00
Sandra Snan	6116f81546	Don't strip newlines in the Atom feed ci/woodpecker/pr/build-amd64 Pipeline is pending Details ci/woodpecker/pr/build-arm64 Pipeline is pending Details ci/woodpecker/pr/docs Pipeline is pending Details ci/woodpecker/pr/lint Pipeline is pending Details ci/woodpecker/pr/test Pipeline is pending Details	2024-03-11 12:50:14 +01:00