aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-11-11 11:18:05 +0100
committerRoger Braun <roger@rogerbraun.net>2017-11-11 11:18:05 +0100
commita1923d20e850c6b4f187928dd739314df84047b6 (patch)
tree56615b676205671f943b4d068e1515bdef4b62db
parentfd12e585c98d4cd2cca45f8ff2c368e80d21e111 (diff)
downloadpleroma-a1923d20e850c6b4f187928dd739314df84047b6.tar.gz
MastoAPI: Fix reblog emojis.
-rw-r--r--lib/pleroma/web/mastodon_api/views/status_view.ex2
-rw-r--r--test/web/mastodon_api/status_view_test.exs1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index a0acdb0ac..d97b2acb4 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -46,7 +46,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
website: nil
},
language: nil,
- emoji: []
+ emojis: []
}
end
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs
index 69d86ea82..601e551a9 100644
--- a/test/web/mastodon_api/status_view_test.exs
+++ b/test/web/mastodon_api/status_view_test.exs
@@ -103,5 +103,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
assert represented[:id] == to_string(reblog.id)
assert represented[:reblog][:id] == to_string(activity.id)
+ assert represented[:emojis] == []
end
end