aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscarlett <nia@netbsd.org>2018-11-12 15:38:39 +0000
committerscarlett <nia@netbsd.org>2018-11-12 15:52:13 +0000
commitcb6fd738614a016fc143221a5ae588aa82f3a251 (patch)
treefd9dd920ca6abbf12676935ef93062de931a2dfe
parente7d6f133ebaf7f7515456b44ee700e5ea7527b50 (diff)
downloadpleroma-cb6fd738614a016fc143221a5ae588aa82f3a251.tar.gz
Twitter API: Fall back to user.nickname if user has no name
-rw-r--r--lib/pleroma/web/twitter_api/views/user_view.ex8
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,