pleroma

commit: 380c67e2c3ebbc1676814abb806f52cf7075f8bd
parent: 0a99f1e8c5551dcf170722e5087a0401b2d907af
Author: kaniini <ariadne@dereferenced.org>
Date:   Mon,  7 Oct 2019 12:43:21 +0000

Merge branch 'bugfix/exclude-replies' into 'develop'

mastodon api: fix exclude_replies (closes #1287)

Closes #1287

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

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -85,6 +85,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - ActivityPub: Fix `/users/:nickname/inbox` crashing without an authenticated user
 - MRF: fix ability to follow a relay when AntiFollowbotPolicy was enabled
 - Mastodon API: Blocks are now treated consistently between the Streaming API and the Timeline APIs
+- Mastodon API: `exclude_replies` is correctly handled again.
 
 ### Added
 - Expiring/ephemeral activites. All activities can have expires_at value set, which controls when they should be deleted automatically.
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -780,8 +780,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