aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-02-22 22:35:47 +0100
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-05-03 16:27:51 +0200
commit85434669bb0d363528b738a6d32dd9ce18401065 (patch)
tree8b73bac3f6f736d03e5bb507248545c62894a6d0 /lib
parent2f76a40d028c45e99425b061298a1b05e4b59923 (diff)
downloadpleroma-85434669bb0d363528b738a6d32dd9ce18401065.tar.gz
Web.TwitterAPI.UserView: Also view local user emojis
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/twitter_api/views/user_view.ex2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex
index ea015b8f0..6857055c9 100644
--- a/lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/lib/pleroma/web/twitter_api/views/user_view.ex
@@ -67,6 +67,8 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
{String.trim(name, ":"), url}
end)
+ emoji = Enum.dedup(emoji ++ user.info.emoji)
+
# ``fields`` is an array of mastodon profile field, containing ``{"name": "…", "value": "…"}``.
# For example: [{"name": "Pronoun", "value": "she/her"}, …]
fields =