projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '923_oauth_consumer_refactoring_ci' 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 8e2937ac516a732f62f41d2036982968949f6170..74babdf147c84da900f6ac4bfdd041b9b69e1ed8 100644
(file)
--- a/
lib/pleroma/web/common_api/common_api.ex
+++ b/
lib/pleroma/web/common_api/common_api.ex
@@
-167,7
+167,7
@@
defmodule Pleroma.Web.CommonAPI do
object,
"emoji",
(Formatter.get_emoji(status) ++ Formatter.get_emoji(data["spoiler_text"]))
object,
"emoji",
(Formatter.get_emoji(status) ++ Formatter.get_emoji(data["spoiler_text"]))
- |> Enum.reduce(%{}, fn {name, file}, acc ->
+ |> Enum.reduce(%{}, fn {name, file
, _
}, acc ->
Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}")
end)
) do
Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}")
end)
) do
@@
-180,7
+180,7
@@
defmodule Pleroma.Web.CommonAPI do
object: object,
additional: %{"cc" => cc, "directMessage" => visibility == "direct"}
},
object: object,
additional: %{"cc" => cc, "directMessage" => visibility == "direct"}
},
-
data["fake"]
|| false
+
Pleroma.Web.ControllerHelper.truthy_param?(data["preview"])
|| false
)
res
)
res