Merge branch 'backport/bugfix-notification-nil-actor' into 'maint/1.1'

backport MR 1779 to maint/1.1

See merge request pleroma/pleroma!1791

CHANGELOG.md

@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname`
 - Mastodon API: Blocks are now treated consistently between the Streaming API and the Timeline APIs
 - ActivityPub: Correct addressing of Undo.
+- Mastodon API: Ensure the `account` field is not empty when rendering Notification entities.
 
 ### Removed
 - ActivityPub: The `/objects/:uuid/likes` endpoint.

lib/pleroma/web/mastodon_api/views/notification_view.ex

@@ -25,11 +25,12 @@ def render("show.json", %{
     parent_activity = Activity.get_create_by_object_ap_id(activity.data["object"])
     mastodon_type = Activity.mastodon_notification_type(activity)
 
+    with %{id: _} = account <- AccountView.render("account.json", %{user: actor, for: user}) do
       response = %{
         id: to_string(notification.id),
         type: mastodon_type,
         created_at: CommonAPI.Utils.to_masto_date(notification.inserted_at),
-      account: AccountView.render("account.json", %{user: actor, for: user}),
+        account: account,
         pleroma: %{
           is_seen: notification.seen
         }
@@ -60,5 +61,8 @@ def render("show.json", %{
         _ ->
           nil
       end
+    else
+      _ -> nil
+    end
   end
 end

test/web/mastodon_api/views/notification_view_test.exs

@@ -100,5 +100,11 @@ test "Follow notification" do
       NotificationView.render("index.json", %{notifications: [notification], for: followed})
 
     assert [expected] == result
+
+    User.perform(:delete, follower)
+    notification = Notification |> Repo.one() |> Repo.preload(:activity)
+
+    assert [] ==
+             NotificationView.render("index.json", %{notifications: [notification], for: followed})
   end
 end