logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: a1923d20e850c6b4f187928dd739314df84047b6
parent: fd12e585c98d4cd2cca45f8ff2c368e80d21e111
Author: Roger Braun <roger@rogerbraun.net>
Date:   Sat, 11 Nov 2017 11:18:05 +0100

MastoAPI: Fix reblog emojis.

Diffstat:

Mlib/pleroma/web/mastodon_api/views/status_view.ex2+-
Mtest/web/mastodon_api/status_view_test.exs1+
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 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 @@ -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