pleroma

commit: ac113f672479320e77592239d2af5e0c4fcb1342
parent 72bd763d9fbad965e82727bba2fb64fadf430529
Author: kaniini <ariadne@dereferenced.org>
Date:   Mon,  7 Oct 2019 13:12:46 +0000

Merge branch 'backport/exclude-replies' into 'maint/1.1'

mastodon api: fix exclude_replies (closes #1287)

See merge request pleroma/pleroma!1816
Diffstat:
M
CHANGELOG.md
4
++++
M
lib/pleroma/web/activity_pub/activity_pub.ex
4
++--

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -748,8 +748,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   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