From: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Fri, 22 Feb 2019 21:35:47 +0000 (+0100)
Subject: Web.TwitterAPI.UserView: Also view local user emojis
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=85434669bb0d363528b738a6d32dd9ce18401065;p=akkoma

Web.TwitterAPI.UserView: Also view local user emojis
---

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 =