projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'changelog/adminfe' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
common_api.ex
diff --git
a/lib/pleroma/web/common_api/common_api.ex
b/lib/pleroma/web/common_api/common_api.ex
index ecd1831107d26efeba18d9eb483dbe18964b3160..b53869c7582899eebfbad8bc188a4f2bcb47a730 100644
(file)
--- a/
lib/pleroma/web/common_api/common_api.ex
+++ b/
lib/pleroma/web/common_api/common_api.ex
@@
-151,8
+151,8
@@
defmodule Pleroma.Web.CommonAPI do
),
{to, cc} <- to_for_user_and_mentions(user, mentions, in_reply_to, visibility),
context <- make_context(in_reply_to),
),
{to, cc} <- to_for_user_and_mentions(user, mentions, in_reply_to, visibility),
context <- make_context(in_reply_to),
- cw <- data["spoiler_text"],
- full_payload <- String.trim(status <>
(data["spoiler_text"] || "")
),
+ cw <- data["spoiler_text"]
|| ""
,
+ full_payload <- String.trim(status <>
cw
),
length when length in 1..limit <- String.length(full_payload),
object <-
make_note_data(
length when length in 1..limit <- String.length(full_payload),
object <-
make_note_data(
@@
-170,10
+170,7
@@
defmodule Pleroma.Web.CommonAPI do
Map.put(
object,
"emoji",
Map.put(
object,
"emoji",
- (Formatter.get_emoji(status) ++ Formatter.get_emoji(data["spoiler_text"]))
- |> Enum.reduce(%{}, fn {name, file, _}, acc ->
- Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}")
- end)
+ Formatter.get_emoji_map(full_payload)
) do
res =
ActivityPub.create(
) do
res =
ActivityPub.create(