X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=2b359dd7256a27e5a80c7bb32331d6054aa9facf;hb=af854f7e01efa24d57b68283a9884d3fc80d6438;hp=7cce77b10d2fd0ca0caadf776b110e6851a4a377;hpb=ed3403ad8be255480d7e41f899d74fe9e5ef3f84;p=akkoma
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 7cce77b10..2b359dd72 100644
--- 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
- 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)
- |> add_attachments(attachments)
+ |> maybe_add_attachments(attachments, no_attachment_links)
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} | _]}) ->
@@ -57,9 +61,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do
Enum.join([text | attachment_text], "
")
end
- def format_input(text, mentions, tags) do
- Phoenix.HTML.html_escape(text)
- |> elem(1)
+ def format_input(text, mentions, _tags) do
+ text
+ |> Formatter.html_escape
|> Formatter.linkify
|> String.replace("\n", "
")
|> add_user_links(mentions)
@@ -91,7 +95,7 @@ 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()
- String.replace(text, uuid, "@#{short_match}")
+ String.replace(text, uuid, "@#{short_match}")
end)
end