projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
activitypub: preload child objects when fetching timelines
[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 fcdfea8e1eb77f45c4f81d145190b5bdf01e479b..3e807a5b74922c6de21b22038f4002671c354cad 100644
(file)
--- a/
lib/pleroma/web/common_api/utils.ex
+++ b/
lib/pleroma/web/common_api/utils.ex
@@
-101,7
+101,8
@@
defmodule Pleroma.Web.CommonAPI.Utils do
def make_content_html(
status,
attachments,
def make_content_html(
status,
attachments,
- data
+ data,
+ visibility
) do
no_attachment_links =
data
) do
no_attachment_links =
data
@@
-110,8
+111,15
@@
defmodule Pleroma.Web.CommonAPI.Utils do
content_type = get_content_type(data["content_type"])
content_type = get_content_type(data["content_type"])
+ options =
+ if visibility == "direct" && Config.get([:instance, :safe_dm_mentions]) do
+ [safe_mention: true]
+ else
+ []
+ end
+
status
status
- |> format_input(content_type)
+ |> format_input(content_type
, options
)
|> maybe_add_attachments(attachments, no_attachment_links)
|> maybe_add_nsfw_tag(data)
end
|> maybe_add_attachments(attachments, no_attachment_links)
|> maybe_add_nsfw_tag(data)
end