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

Change the order of preloading when fetching activities for context

Browse Source
This commit is contained in:
rinpatch 2019-05-23 14:03:16 +03:00
parent e6b175ed6c
commit 8b2d39c1ec
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -492,7 +492,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
if opts["user"], do: [opts["user"].ap_id | opts["user"].following] ++ public, else: public if opts["user"], do: [opts["user"].ap_id | opts["user"].following] ++ public, else: public
from(activity in Activity) from(activity in Activity)
|> Activity.with_preloaded_object() |> maybe_preload_objects(opts)
|> exclude_poll_votes(opts) |> exclude_poll_votes(opts)
|> restrict_blocked(opts) |> restrict_blocked(opts)
|> restrict_recipients(recipients, opts["user"]) |> restrict_recipients(recipients, opts["user"])
@ -513,7 +513,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
def fetch_activities_for_context(context, opts \\ %{}) do def fetch_activities_for_context(context, opts \\ %{}) do
context context
|> fetch_activities_for_context_query(opts) |> fetch_activities_for_context_query(opts)
|> Activity.with_preloaded_object()
|> Repo.all() |> Repo.all()
end end
@ -521,7 +520,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
Pleroma.FlakeId.t() | nil Pleroma.FlakeId.t() | nil
def fetch_latest_activity_id_for_context(context, opts \\ %{}) do def fetch_latest_activity_id_for_context(context, opts \\ %{}) do
context context
|> fetch_activities_for_context_query(opts) |> fetch_activities_for_context_query(Map.merge(%{"skip_preload" => true}, opts))
|> limit(1) |> limit(1)
|> select([a], a.id) |> select([a], a.id)
|> Repo.one() |> Repo.one()