fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-20 16:32:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use inner lateral join to not get dropped in :total

Browse source
This commit is contained in:
FloatingGhost 2022-10-10 16:45:02 +01:00
parent 574f010bc8
commit ca9e6ffc55
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/activity.ex
View file

@ -369,7 +369,7 @@ defmodule Pleroma.Activity do
def restrict_deactivated_users(query) do
query
|> join(:inner, [activity], user in User, as: :user, on: activity.actor == user.ap_id and user.is_active == true)
|> join(:inner_lateral, [activity], active in fragment("SELECT is_active from users WHERE ap_id = ? AND is_active = TRUE", activity.actor))
end
defdelegate search(user, query, options \\ []), to: Pleroma.Search.DatabaseSearch

1
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -507,7 +507,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
defp fetch_paginated_optimized(query, opts, pagination) do
# Note: tag-filtering funcs may apply "ORDER BY objects.id DESC",
# and extra sorting on "activities.id DESC NULLS LAST" would worse the query plan
IO.inspect(Repo.to_sql(:all, query))
opts = Map.put(opts, :skip_extra_order, true)
Pagination.fetch_paginated(query, opts, pagination)