pleroma

commit: b11746726e048c40fea758e665667757d455be5e
parent: cce9d008f984475a8f9180ac4fcbef1d7cb8f88a
Author: Haelwenn <git.pleroma.social@hacktivis.me>
Date:   Wed, 29 Aug 2018 14:43:45 +0000

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

Fix Mastodon API when actor's nickname is null

See merge request pleroma/pleroma!308
Diffstat:
M
lib/pleroma/web/mastodon_api/views/account_view.ex
10
++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -28,7 +28,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
 
     %{
       id: to_string(user.id),
-      username: hd(String.split(user.nickname, "@")),
+      username: username_from_nickname(user.nickname),
       acct: user.nickname,
       display_name: user.name || user.nickname,
       locked: user_info.locked,
@@ -56,7 +56,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
     %{
       id: to_string(user.id),
       acct: user.nickname,
-      username: hd(String.split(user.nickname, "@")),
+      username: username_from_nickname(user.nickname),
       url: user.ap_id
     }
   end
@@ -76,4 +76,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
   def render("relationships.json", %{user: user, targets: targets}) do
     render_many(targets, AccountView, "relationship.json", user: user, as: :target)
   end
+
+  defp username_from_nickname(string) when is_binary(string) do
+    hd(String.split(string, "@"))
+  end
+
+  defp username_from_nickname(_), do: nil
 end