diff options
| author | scarlett <nia@netbsd.org> | 2018-11-12 17:08:54 +0000 |
|---|---|---|
| committer | scarlett <nia@netbsd.org> | 2018-11-12 17:08:54 +0000 |
| commit | 0ce5623134de4356e74160f8d3e717aae414b1e7 (patch) | |
| tree | 1a36a01d9a9366e28e453e00215e701441ea9a9d /lib | |
| parent | 54923c2e55e2d241b53a62a4abbd2501abdcae32 (diff) | |
| parent | db78c72868358eed6c07ee43a5f1427d545c45ed (diff) | |
| download | pleroma-0ce5623134de4356e74160f8d3e717aae414b1e7.tar.gz | |
Merge branch 'twitter-api-null-display-name' into 'develop'
Twitter API: Fall back to user.nickname if user has no name
Closes #375
See merge request pleroma/pleroma!444
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/user_view.ex | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex index a662f83b6..a100a1127 100644 --- a/lib/pleroma/web/twitter_api/views/user_view.ex +++ b/lib/pleroma/web/twitter_api/views/user_view.ex @@ -55,8 +55,12 @@ defmodule Pleroma.Web.TwitterAPI.UserView do "statusnet_blocking" => statusnet_blocking, "friends_count" => user_info[:following_count], "id" => user.id, - "name" => user.name, - "name_html" => HTML.strip_tags(user.name) |> Formatter.emojify(emoji), + "name" => user.name || user.nickname, + "name_html" => + if(user.name, + do: HTML.strip_tags(user.name) |> Formatter.emojify(emoji), + else: user.nickname + ), "profile_image_url" => image, "profile_image_url_https" => image, "profile_image_url_profile_size" => image, |