alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix-mastodon-notifications-without-nickname' into 'develop' 

Fix Mastodon API when actor's nickname is null

See merge request pleroma/pleroma!308
This commit is contained in:
Haelwenn 2018-08-29 14:43:45 +00:00
parent cce9d008f9 ddc6f32b75
commit b11746726e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/pleroma/web/mastodon_api/views/account_view.ex
View File

@ -28,7 +28,7 @@ def render("account.json", %{user: user}) do
%{ %{
id: to_string(user.id), id: to_string(user.id),
username: hd(String.split(user.nickname, "@")), username: username_from_nickname(user.nickname),
acct: user.nickname, acct: user.nickname,
display_name: user.name || user.nickname, display_name: user.name || user.nickname,
locked: user_info.locked, locked: user_info.locked,
@ -56,7 +56,7 @@ def render("mention.json", %{user: user}) do
%{ %{
id: to_string(user.id), id: to_string(user.id),
acct: user.nickname, acct: user.nickname,
username: hd(String.split(user.nickname, "@")), username: username_from_nickname(user.nickname),
url: user.ap_id url: user.ap_id
} }
end end
@ -76,4 +76,10 @@ def render("relationship.json", %{user: user, target: target}) do
def render("relationships.json", %{user: user, targets: targets}) do def render("relationships.json", %{user: user, targets: targets}) do
render_many(targets, AccountView, "relationship.json", user: user, as: :target) render_many(targets, AccountView, "relationship.json", user: user, as: :target)
end end
defp username_from_nickname(string) when is_binary(string) do
hd(String.split(string, "@"))
end
defp username_from_nickname(_), do: nil
end end