projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/tootdon-mentions' 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 b370a8fb7ebb992ef886c40ae133bb62ea7736f7..2b359dd7256a27e5a80c7bb32331d6054aa9facf 100644
(file)
--- a/
lib/pleroma/web/common_api/utils.ex
+++ b/
lib/pleroma/web/common_api/utils.ex
@@
-38,15
+38,19
@@
defmodule Pleroma.Web.CommonAPI.Utils do
end
end
end
end
- def make_content_html(status, mentions, attachments, tags) do
+ def make_content_html(status, mentions, attachments, tags
, no_attachment_links \\ false
) do
status
|> format_input(mentions, tags)
status
|> format_input(mentions, tags)
- |>
add_attachments(attachment
s)
+ |>
maybe_add_attachments(attachments, no_attachment_link
s)
end
def make_context(%Activity{data: %{"context" => context}}), do: context
def make_context(_), do: Utils.generate_context_id
end
def make_context(%Activity{data: %{"context" => context}}), do: context
def make_context(_), do: Utils.generate_context_id
+ def maybe_add_attachments(text, attachments, _no_links = true), do: text
+ def maybe_add_attachments(text, attachments, _no_links) do
+ add_attachments(text, attachments)
+ end
def add_attachments(text, attachments) do
attachment_text = Enum.map(attachments, fn
(%{"url" => [%{"href" => href} | _]}) ->
def add_attachments(text, attachments) do
attachment_text = Enum.map(attachments, fn
(%{"url" => [%{"href" => href} | _]}) ->
@@
-54,15
+58,16
@@
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
+ text
+ |> Formatter.html_escape
|> Formatter.linkify
|> Formatter.linkify
- |> String.replace("\n", "<br>
\n
")
+ |> String.replace("\n", "<br>")
|> add_user_links(mentions)
|> add_user_links(mentions)
- |> add_tag_links(tags)
+
#
|> add_tag_links(tags)
end
def add_tag_links(text, tags) do
end
def add_tag_links(text, tags) do
@@
-90,15
+95,16
@@
defmodule Pleroma.Web.CommonAPI.Utils do
Enum.reduce(mentions, step_one, fn ({match, %User{ap_id: ap_id}, uuid}, text) ->
short_match = String.split(match, "@") |> tl() |> hd()
Enum.reduce(mentions, step_one, fn ({match, %User{ap_id: ap_id}, uuid}, text) ->
short_match = String.split(match, "@") |> tl() |> hd()
- String.replace(text, uuid, "<
a href='#{ap_id}'>@#{short_match}</a
>")
+ String.replace(text, uuid, "<
span><a href='#{ap_id}'>@<span>#{short_match}</span></a></span
>")
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,