aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/common_api/common_api.ex
diff options
context:
space:
mode:
authorSadposter <hannah+pleroma@coffee-and-dreams.uk>2019-04-10 10:44:54 +0100
committerSadposter <hannah+pleroma@coffee-and-dreams.uk>2019-04-10 10:44:54 +0100
commitbe8350baa2f8c9cf9be3f53ee4a0041dada1386f (patch)
tree8414fc2108941ccadd9b9fd4dd37c9d3cf731399 /lib/pleroma/web/common_api/common_api.ex
parent589629cf3e1bee9a4f6e92b8456d8614eff73c89 (diff)
parentc8440b5e0c97c5d5c03e4b99e30a61df6ab95319 (diff)
downloadpleroma-be8350baa2f8c9cf9be3f53ee4a0041dada1386f.tar.gz
Merge branch 'develop' into feature/user-status-subscriptions
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
-rw-r--r--lib/pleroma/web/common_api/common_api.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index 745d1839b..74babdf14 100644
--- 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"]))
- |> Enum.reduce(%{}, fn {name, file}, acc ->
+ |> Enum.reduce(%{}, fn {name, file, _}, acc ->
Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}")
end)
) do