Browse Source

Fix rendering conversations when there's a malformed status

tags/v1.1.6^2
rinpatch 4 years ago
parent
commit
b74f4260ae
2 changed files with 8 additions and 3 deletions
  1. +4
    -0
      CHANGELOG.md
  2. +4
    -3
      lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex

+ 4
- 0
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/).

## [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


+ 4
- 3
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex View File

@@ -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…
Cancel
Save