logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 39103a91be48abf0e9430c72c9799542ad7e4354
parent: 6aeeb322ae7ddf69014be3c28cdaa3954dcb8432
Author: kaniini <nenolod@gmail.com>
Date:   Sun, 28 Oct 2018 05:52:51 +0000

Merge branch 'bugfix/broken-thread-filtering-false-positive' into 'develop'

activitypub: fix possible false positives with broken thread filtering

See merge request pleroma/pleroma!398

Diffstat:

Mlib/pleroma/web/activity_pub/activity_pub.ex5+++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -793,9 +793,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do # child def entire_thread_visible_for_user?( - %Activity{data: %{"object" => %{"inReplyTo" => _parent_id}}} = tail, + %Activity{data: %{"object" => %{"inReplyTo" => parent_id}}} = tail, user - ) do + ) + when is_binary(parent_id) do parent = Activity.get_in_reply_to_activity(tail) visible_for_user?(tail, user) && entire_thread_visible_for_user?(parent, user) end