moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix/notification-nil-actor' into 'develop' 

notification_view.ex: Make sure `account` isn’t empty

See merge request pleroma/pleroma!1779
This commit is contained in:
lain 2019-10-04 11:28:20 +00:00
parent bc095a27f1 5dc14c89ce
commit 01da6344b9
2 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/pleroma/web/mastodon_api/views/notification_view.ex
View File

@ -25,40 +25,44 @@ def render("show.json", %{
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)
response = %{ with %{id: _} = account <- AccountView.render("show.json", %{user: actor, for: user}) do
id: to_string(notification.id), response = %{
type: mastodon_type, id: to_string(notification.id),
created_at: CommonAPI.Utils.to_masto_date(notification.inserted_at), type: mastodon_type,
account: AccountView.render("show.json", %{user: actor, for: user}), created_at: CommonAPI.Utils.to_masto_date(notification.inserted_at),
pleroma: %{ account: account,
is_seen: notification.seen pleroma: %{
is_seen: notification.seen
}
} }
}
case mastodon_type do case mastodon_type do
"mention" -> "mention" ->
response response
|> Map.merge(%{ |> Map.merge(%{
status: StatusView.render("show.json", %{activity: activity, for: user}) status: StatusView.render("show.json", %{activity: activity, for: user})
}) })
"favourite" -> "favourite" ->
response response
|> Map.merge(%{ |> Map.merge(%{
status: StatusView.render("show.json", %{activity: parent_activity, for: user}) status: StatusView.render("show.json", %{activity: parent_activity, for: user})
}) })
"reblog" -> "reblog" ->
response response
|> Map.merge(%{ |> Map.merge(%{
status: StatusView.render("show.json", %{activity: parent_activity, for: user}) status: StatusView.render("show.json", %{activity: parent_activity, for: user})
}) })
"follow" -> "follow" ->
response response
_ -> _ ->
nil nil
end
else
_ -> nil
end end
end end
end end

6
test/web/mastodon_api/views/notification_view_test.exs
View File

@ -100,5 +100,11 @@ test "Follow notification" 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