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 feature/database-compaction
[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 a450a70c3bfa9b9d0fb71d79bb6c2e420dd18f3f..7781f16350ab105d5c8ec27e71226224b33f2859 100644
(file)
--- a/
lib/pleroma/web/common_api/utils.ex
+++ b/
lib/pleroma/web/common_api/utils.ex
@@
-195,11
+195,10
@@
defmodule Pleroma.Web.CommonAPI.Utils do
Formatting text to markdown.
"""
def format_input(text, "text/markdown", options) do
Formatting text to markdown.
"""
def format_input(text, "text/markdown", options) do
- options = Keyword.put(options, :mentions_escape, true)
-
text
text
+ |> Formatter.mentions_escape(options)
+ |> Earmark.as_html!()
|> Formatter.linkify(options)
|> Formatter.linkify(options)
- |> (fn {text, mentions, tags} -> {Earmark.as_html!(text), mentions, tags} end).()
|> Formatter.html_escape("text/html")
end
|> Formatter.html_escape("text/html")
end
@@
-227,9
+226,10
@@
defmodule Pleroma.Web.CommonAPI.Utils do
}
if inReplyTo do
}
if inReplyTo do
+ inReplyToObject = Object.normalize(inReplyTo.data["object"])
+
object
object
- |> Map.put("inReplyTo", inReplyTo.data["object"]["id"])
- |> Map.put("inReplyToStatusId", inReplyTo.id)
+ |> Map.put("inReplyTo", inReplyToObject.data["id"])
else
object
end
else
object
end
@@
-294,7
+294,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
def emoji_from_profile(%{info: _info} = user) do
(Formatter.get_emoji(user.bio) ++ Formatter.get_emoji(user.name))
def emoji_from_profile(%{info: _info} = user) do
(Formatter.get_emoji(user.bio) ++ Formatter.get_emoji(user.name))
- |> Enum.map(fn {shortcode, url} ->
+ |> Enum.map(fn {shortcode, url
, _
} ->
%{
"type" => "Emoji",
"icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}#{url}"},
%{
"type" => "Emoji",
"icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}#{url}"},
@@
-341,7
+341,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
%Activity{data: %{"actor" => actor, "type" => type}} = activity
)
when type == "Create" do
%Activity{data: %{"actor" => actor, "type" => type}} = activity
)
when type == "Create" do
- with %User{} = user <- User.get_by_ap_id(actor) do
+ with %User{} = user <- User.get_
cached_
by_ap_id(actor) do
subscriber_ids =
user
|> User.subscribers()
subscriber_ids =
user
|> User.subscribers()