diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-05 05:47:06 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-05 05:47:06 +0000 |
| commit | 3e30f6e19824dc90717fc0929feddb24220a89ab (patch) | |
| tree | ec483d3c4f7e60fddc9b56e8a57d596c7842f210 | |
| parent | 3b8d64ee24053638aa22f67ced1367c8666b9fa0 (diff) | |
| parent | 558969a0fd7f64387e59a54b5733d63d3a46a031 (diff) | |
| download | pleroma-3e30f6e19824dc90717fc0929feddb24220a89ab.tar.gz | |
Merge branch 'fix/safe-render-notifications' into 'develop'
Do not crash if one notification failed to render
See merge request pleroma/pleroma!1630
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/notification_view.ex | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a414ba5e0..3f4e7a132 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Federation/MediaProxy not working with instances that have wrong certificate order - Mastodon API: Handling of search timeouts (`/api/v1/search` and `/api/v2/search`) - Mastodon API: Embedded relationships not being properly rendered in the Account entity of Status entity +- Mastodon API: Notifications endpoint crashing if one notification failed to render - Mastodon API: follower/following counters not being nullified, when `hide_follows`/`hide_followers` is set - Mastodon API: `muted` in the Status entity, using author's account to determine if the tread was muted - Mastodon API: Add `account_id`, `type`, `offset`, and `limit` to search API (`/api/v1/search` and `/api/v2/search`) diff --git a/lib/pleroma/web/mastodon_api/views/notification_view.ex b/lib/pleroma/web/mastodon_api/views/notification_view.ex index 27e9cab06..ec8eadcaa 100644 --- a/lib/pleroma/web/mastodon_api/views/notification_view.ex +++ b/lib/pleroma/web/mastodon_api/views/notification_view.ex @@ -14,7 +14,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do alias Pleroma.Web.MastodonAPI.StatusView def render("index.json", %{notifications: notifications, for: user}) do - render_many(notifications, NotificationView, "show.json", %{for: user}) + safe_render_many(notifications, NotificationView, "show.json", %{for: user}) end def render("show.json", %{ |