projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/self-follow' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
utils.ex
diff --git
a/lib/pleroma/web/common_api/utils.ex
b/lib/pleroma/web/common_api/utils.ex
index 06fcc9e8b637dc9f71f8a4aa289e4c3ec4502c1e..1a23b1ad2abb9855ecccadf4c9978827cd552ead 100644
(file)
--- 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
"<a href=\"#{href}\" class='attachment'>#{shortname(name)}</a>"
_ -> ""
end)
"<a href=\"#{href}\" class='attachment'>#{shortname(name)}</a>"
_ -> ""
end)
- Enum.join([text | attachment_text], "<br>
\n
")
+ Enum.join([text | attachment_text], "<br>")
end
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
|> Formatter.linkify
- |> String.replace("\n", "<br>
\n
")
+ |> String.replace("\n", "<br>")
|> add_user_links(mentions)
# |> add_tag_links(tags)
end
|> add_user_links(mentions)
# |> add_tag_links(tags)
end
@@
-94,11
+95,12
@@
defmodule Pleroma.Web.CommonAPI.Utils do
end)
end
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,
object = %{
"type" => "Note",
"to" => to,
"content" => content_html,
+ "summary" => cw,
"context" => context,
"attachment" => attachments,
"actor" => actor,
"context" => context,
"attachment" => attachments,
"actor" => actor,