Merge branch 'backport/exclude-replies' into 'maint/1.1'
mastodon api: fix exclude_replies (closes #1287) See merge request pleroma/pleroma!1816
This commit is contained in:
commit
ac113f6724
|
@ -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.0.92] - 2019-10-??
|
||||
### Fixed
|
||||
- Mastodon API: `exclude_replies` is correctly handled again.
|
||||
|
||||
## [1.0.91] - 2019-10-06
|
||||
### Added
|
||||
- Reverse Proxy: Do not retry failed requests to limit pressure on the peer
|
||||
|
|
|
@ -748,8 +748,8 @@ defp restrict_media(query, _), do: query
|
|||
|
||||
defp restrict_replies(query, %{"exclude_replies" => val}) when val == "true" or val == "1" do
|
||||
from(
|
||||
activity in query,
|
||||
where: fragment("?->'object'->>'inReplyTo' is null", activity.data)
|
||||
[_activity, object] in query,
|
||||
where: fragment("?->>'inReplyTo' is null", object.data)
|
||||
)
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue