alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

activitypub: rework thread filtering for split object view

This commit is contained in:
William Pitcock 2018-11-29 03:34:57 +00:00
parent fe000f82f8
commit 6f90f2c3ac
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -799,18 +799,21 @@ def visible_for_user?(activity, user) do
# guard # guard
def entire_thread_visible_for_user?(nil, user), do: false def entire_thread_visible_for_user?(nil, user), do: false
# child # child / root
def entire_thread_visible_for_user?( def entire_thread_visible_for_user?(
%Activity{data: %{"object" => %{"inReplyTo" => parent_id}}} = tail, %Activity{data: %{"object" => object_id}} = tail,
user user
) ) do
when is_binary(parent_id) do
parent = Activity.get_in_reply_to_activity(tail) parent = Activity.get_in_reply_to_activity(tail)
visible_for_user?(tail, user) && entire_thread_visible_for_user?(parent, user)
end
# root cond do
def entire_thread_visible_for_user?(tail, user), do: visible_for_user?(tail, user) !is_nil(parent) ->
visible_for_user?(tail, user) && entire_thread_visible_for_user?(parent, user)
true ->
visible_for_user?(tail, user)
end
end
# filter out broken threads # filter out broken threads
def contain_broken_threads(%Activity{} = activity, %User{} = user) do def contain_broken_threads(%Activity{} = activity, %User{} = user) do