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

backport MR 1779 to maint/1.1

See merge request pleroma/pleroma!1791
This commit is contained in:
kaniini 2019-10-04 22:37:45 +00:00
commit 4168ead672
3 changed files with 39 additions and 28 deletions

View file

@ -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: 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 - Mastodon API: Blocks are now treated consistently between the Streaming API and the Timeline APIs
- ActivityPub: Correct addressing of Undo. - ActivityPub: Correct addressing of Undo.
- Mastodon API: Ensure the `account` field is not empty when rendering Notification entities.
### Removed ### Removed
- ActivityPub: The `/objects/:uuid/likes` endpoint. - ActivityPub: The `/objects/:uuid/likes` endpoint.

View file

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

View file

@ -100,5 +100,11 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
NotificationView.render("index.json", %{notifications: [notification], for: followed}) NotificationView.render("index.json", %{notifications: [notification], for: followed})
assert [expected] == result 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
end end