mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-24 00:50:29 +00:00
Fix rendering conversations when there's a malformed status
This commit is contained in:
parent
36f4382b33
commit
b74f4260ae
2 changed files with 8 additions and 3 deletions
|
@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
|
|||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||
|
||||
## [1.1.6] - 2019-11-19
|
||||
## Fixed
|
||||
- Mastodon API: conversations API crashing when one status is malformed
|
||||
|
||||
## [1.1.5] - 2019-11-09
|
||||
### Fixed
|
||||
- Polls having different numbers in timelines/notifications/poll api endpoints due to cache desyncronization
|
||||
|
|
|
@ -1671,9 +1671,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
|||
participations = Participation.for_user_with_last_activity_id(user, params)
|
||||
|
||||
conversations =
|
||||
Enum.map(participations, fn participation ->
|
||||
ConversationView.render("participation.json", %{participation: participation, for: user})
|
||||
end)
|
||||
ConversationView.safe_render_many(participations, ConversationView, "participation.json", %{
|
||||
as: :participation,
|
||||
for: user
|
||||
})
|
||||
|
||||
conn
|
||||
|> add_link_headers(:conversations, participations)
|
||||
|
|
Loading…
Reference in a new issue