From: Ariadne Conill <ariadne@dereferenced.org>
Date: Mon, 7 Oct 2019 12:29:33 +0000 (+0000)
Subject: mastodon api: fix exclude_replies (closes #1287)
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3e1d2ace734d470df546e60140e6598be755e597;p=akkoma

mastodon api: fix exclude_replies (closes #1287)
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a86bf0d96..52d127b62 100644
--- 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
index 58b002d3c..984f85cc6 100644
--- 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