aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/common_api/common_api.ex
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-04-08 09:50:00 +0000
committerlambda <lain@soykaf.club>2019-04-08 09:50:00 +0000
commit23067908de957bb1e7ad2c87e64ae91e4328cb87 (patch)
tree2c75327c2b35d5759eb971d5486a7f30bef8d386 /lib/pleroma/web/common_api/common_api.ex
parentb177e1e7f330ff1531be190949db7f75e378a449 (diff)
parent7410aee886fbb38615bb595b8b7be0722761a0a4 (diff)
downloadpleroma-23067908de957bb1e7ad2c87e64ae91e4328cb87.tar.gz
Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags See merge request pleroma/pleroma!998
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