aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoreal <eal@waifu.club>2018-08-08 09:24:50 +0300
committereal <eal@waifu.club>2018-08-08 09:24:50 +0300
commited9738e031e02a9338bedd3a8f3ff73329c101e7 (patch)
tree2802bbd9e874ab448daea61dbe2470d14c806012 /lib
parentcee63ad3f725a90fdd1a438520c33377cee8ad81 (diff)
downloadpleroma-ed9738e031e02a9338bedd3a8f3ff73329c101e7.tar.gz
Add tests for emoji in user profiles
Also use the correct field in TwitterAPI...
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/twitter_api/views/user_view.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex
index 30cf266bd..30aaaf1ce 100644
--- a/lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/lib/pleroma/web/twitter_api/views/user_view.ex
@@ -50,6 +50,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
"friends_count" => user_info[:following_count],
"id" => user.id,
"name" => user.name,
+ "name_html" => Formatter.emojify(user.name, emoji),
"profile_image_url" => image,
"profile_image_url_https" => image,
"profile_image_url_profile_size" => image,
@@ -58,7 +59,6 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
"delete_others_notice" => !!user.info["is_moderator"]
},
"screen_name" => user.nickname,
- "screen_name_html" => Formatter.emojify(user.nickname, emoji),
"statuses_count" => user_info[:note_count],
"statusnet_profile_url" => user.ap_id,
"cover_photo" => User.banner_url(user) |> MediaProxy.url(),