Skip to content

fix: left join for check blocked #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kphrx wants to merge 5 commits into
base: pl.kpherox.dev
Choose a base branch
from
Draft

fix: left join for check blocked #263

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3aa1d2
fix: left join for check blocked
kphrx Sep 4, 2024
3b00d96
fix: nil reading_user skip restrict_blocked
kphrx Sep 4, 2024
c52a356
fixup! fix: left join for check blocked
kphrx Sep 4, 2024
2818f94
fixup! fix: nil reading_user skip restrict_blocked
kphrx Sep 4, 2024
3f3df47
fix: through object is null
kphrx Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions lib/pleroma/web/activity_pub/activity_pub.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
following_ap_ids = User.get_friends_ap_ids(user)

query =
if has_named_binding?(query, :object), do: query, else: Activity.with_joined_object(query)
if has_named_binding?(query, :object), do: query, else: Activity.with_joined_object(query, :left)

from(
[activity, object: o] in query,
Expand Down Expand Up @@ -1125,11 +1125,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
# Same as above, but checks the Object
where:
fragment(
"(not (split_part(?->>'actor', '/', 3) = ANY(?))) or (?->>'actor') = ANY(?)",
"(not (split_part(?->>'actor', '/', 3) = ANY(?))) or (?->>'actor') = ANY(?) or ? is null",
o.data,
^domain_blocks,
o.data,
^following_ap_ids
^following_ap_ids,
o
)
)
end
Expand Down Expand Up @@ -1319,7 +1320,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do

defp maybe_preload_objects(query, _) do
query
|> Activity.with_preloaded_object()
|> Activity.with_preloaded_object(:left)
end

defp maybe_preload_bookmarks(query, %{skip_preload: true}), do: query
Expand Down