moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
kaniini 2019-10-07 13:12:46 +00:00
parent 72bd763d9f 3e1d2ace73
commit ac113f6724
2 changed files with 6 additions and 2 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.0.92] - 2019-10-??
### Fixed
- Mastodon API: `exclude_replies` is correctly handled again.
## [1.0.91] - 2019-10-06 ## [1.0.91] - 2019-10-06
### Added ### Added
- Reverse Proxy: Do not retry failed requests to limit pressure on the peer - Reverse Proxy: Do not retry failed requests to limit pressure on the peer

4
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -748,8 +748,8 @@ defp restrict_media(query, _), do: query
defp restrict_replies(query, %{"exclude_replies" => val}) when val == "true" or val == "1" do defp restrict_replies(query, %{"exclude_replies" => val}) when val == "true" or val == "1" do
from( from(
activity in query, [_activity, object] in query,
where: fragment("?->'object'->>'inReplyTo' is null", activity.data) where: fragment("?->>'inReplyTo' is null", object.data)
) )
end end