diff options
| author | Roger Braun <rbraun@Bobble.local> | 2017-11-20 17:53:21 +0100 |
|---|---|---|
| committer | Roger Braun <rbraun@Bobble.local> | 2017-11-20 17:53:21 +0100 |
| commit | 747a68a075d90f14ce764208c0a409c3a8ec3393 (patch) | |
| tree | a9d5f8716b20537ddc66dbdc77d0b7d57a309da9 /lib/pleroma/web/common_api/common_api.ex | |
| parent | cf0bbf320d78ee116739d65a52b5f0a8b5772a6e (diff) | |
| download | pleroma-747a68a075d90f14ce764208c0a409c3a8ec3393.tar.gz | |
Treat internal emoji like external.
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 9bc7f2ce6..dc94e5377 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -59,7 +59,8 @@ defmodule Pleroma.Web.CommonAPI do content_html <- make_content_html(status, mentions, attachments, tags), context <- make_context(inReplyTo), cw <- data["spoiler_text"], - object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags, cw) do + object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags, cw), + object <- Map.put(object, "emoji", Formatter.get_emoji(status) |> Enum.reduce(%{}, fn({name, file}, acc) -> Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url}#{file}") end)) do res = ActivityPub.create(to, user, context, object) User.increase_note_count(user) res |