projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' 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 2687d6663b09ee15f872c2fd9d678202e2e68465..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} | _]}) ->
@@
-58,8
+62,8
@@
defmodule Pleroma.Web.CommonAPI.Utils do
end
def format_input(text, mentions, _tags) do
end
def format_input(text, mentions, _tags) do
- Phoenix.HTML.html_escape(text)
- |>
elem(1)
+ text
+ |>
Formatter.html_escape
|> Formatter.linkify
|> String.replace("\n", "<br>")
|> add_user_links(mentions)
|> Formatter.linkify
|> String.replace("\n", "<br>")
|> add_user_links(mentions)