summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-10-07 12:43:21 +0000
committerkaniini <ariadne@dereferenced.org>2019-10-07 12:43:21 +0000
commit380c67e2c3ebbc1676814abb806f52cf7075f8bd (patch)
tree31dcbacd376ab0e86217ad690f834d63525505e8 /lib
parent0a99f1e8c5551dcf170722e5087a0401b2d907af (diff)
parent9a2f71f4d507301c52f1cc8f2e27fefc0b4385e9 (diff)
downloadpleroma-380c67e2c3ebbc1676814abb806f52cf7075f8bd.tar.gz
pleroma-380c67e2c3ebbc1676814abb806f52cf7075f8bd.zip
Merge branch 'bugfix/exclude-replies' into 'develop'
mastodon api: fix exclude_replies (closes #1287) Closes #1287 See merge request pleroma/pleroma!1813
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 5052d1304..9f29087df 100644
--- 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