projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CommonAPI: Newlines -> br for chat messages.
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
common_api.ex
diff --git
a/lib/pleroma/web/common_api/common_api.ex
b/lib/pleroma/web/common_api/common_api.ex
index 764fa4f4fbfd4c0d21260c4a8c4a8752ed2384cd..e0987b1a7d36a2340f839980ad6d12aa43d59648 100644
(file)
--- a/
lib/pleroma/web/common_api/common_api.ex
+++ b/
lib/pleroma/web/common_api/common_api.ex
@@
-50,7
+50,15
@@
defmodule Pleroma.Web.CommonAPI do
defp format_chat_content(nil), do: nil
defp format_chat_content(content) do
defp format_chat_content(nil), do: nil
defp format_chat_content(content) do
- content |> Formatter.html_escape("text/plain")
+ {text, _, _} =
+ content
+ |> Formatter.html_escape("text/plain")
+ |> Formatter.linkify()
+ |> (fn {text, mentions, tags} ->
+ {String.replace(text, ~r/\r?\n/, "<br>"), mentions, tags}
+ end).()
+
+ text
end
defp validate_chat_content_length(_, true), do: :ok
end
defp validate_chat_content_length(_, true), do: :ok