diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-05-19 17:06:44 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-05-19 17:06:44 +0300 |
| commit | 1d90f9b96999f8bad3fa3e3ec58bf50c8666be4f (patch) | |
| tree | ee65841476114b17ad900650479b0824081100aa /lib/pleroma/web/common_api/common_api.ex | |
| parent | 5ece901af3e887664653c79c5e61618cc5cf0ecf (diff) | |
| download | pleroma-1d90f9b96999f8bad3fa3e3ec58bf50c8666be4f.tar.gz | |
Remove tags/mentions/rich text from poll options because Mastodon and
add custom emoji
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index bc8f80389..374967a1b 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -154,7 +154,7 @@ defmodule Pleroma.Web.CommonAPI do data, visibility ), - {poll, mentions, tags} <- make_poll_data(data, mentions, tags), + {poll, poll_emoji} <- make_poll_data(data), {to, cc} <- to_for_user_and_mentions(user, mentions, in_reply_to, visibility), context <- make_context(in_reply_to), cw <- data["spoiler_text"] || "", @@ -179,7 +179,7 @@ defmodule Pleroma.Web.CommonAPI do Map.put( object, "emoji", - Formatter.get_emoji_map(full_payload) + Map.merge(Formatter.get_emoji_map(full_payload), poll_emoji) ) do res = ActivityPub.create( |