alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix rendering conversations when there's a malformed status

This commit is contained in:
rinpatch 2019-11-19 19:14:35 +03:00
parent 36f4382b33
commit b74f4260ae
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -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/). 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 ## [1.1.5] - 2019-11-09
### Fixed ### Fixed
- Polls having different numbers in timelines/notifications/poll api endpoints due to cache desyncronization - Polls having different numbers in timelines/notifications/poll api endpoints due to cache desyncronization

7
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
View File

@ -1671,9 +1671,10 @@ def conversations(%{assigns: %{user: user}} = conn, params) do
participations = Participation.for_user_with_last_activity_id(user, params) participations = Participation.for_user_with_last_activity_id(user, params)
conversations = conversations =
Enum.map(participations, fn participation -> ConversationView.safe_render_many(participations, ConversationView, "participation.json", %{
ConversationView.render("participation.json", %{participation: participation, for: user}) as: :participation,
end) for: user
})
conn conn
|> add_link_headers(:conversations, participations) |> add_link_headers(:conversations, participations)