X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=1a23b1ad2abb9855ecccadf4c9978827cd552ead;hb=1625021a9cd01127171709324f165899a52acfe5;hp=06fcc9e8b637dc9f71f8a4aa289e4c3ec4502c1e;hpb=2b980dea2fe41e81ece6915bd05f3958007b424e;p=akkoma
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 06fcc9e8b..1a23b1ad2 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -54,13 +54,14 @@ defmodule Pleroma.Web.CommonAPI.Utils do
"#{shortname(name)}"
_ -> ""
end)
- Enum.join([text | attachment_text], "
\n")
+ Enum.join([text | attachment_text], "
")
end
- def format_input(text, mentions, tags) do
- HtmlSanitizeEx.strip_tags(text)
+ def format_input(text, mentions, _tags) do
+ Phoenix.HTML.html_escape(text)
+ |> elem(1)
|> Formatter.linkify
- |> String.replace("\n", "
\n")
+ |> String.replace("\n", "
")
|> add_user_links(mentions)
# |> add_tag_links(tags)
end
@@ -94,11 +95,12 @@ defmodule Pleroma.Web.CommonAPI.Utils do
end)
end
- def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags) do
+ def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags, cw \\ nil) do
object = %{
"type" => "Note",
"to" => to,
"content" => content_html,
+ "summary" => cw,
"context" => context,
"attachment" => attachments,
"actor" => actor,