From d8c112f2b072155cabb53bbf5d6a54fbfc93ccb3 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Tue, 15 Nov 2022 12:49:44 -0500 Subject: Switch to inner joins which are expected to be faster --- lib/pleroma/activity.ex | 2 +- lib/pleroma/web/mastodon_api/views/notification_view.ex | 2 +- lib/pleroma/web/mastodon_api/views/status_view.ex | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index ebfd4ed45..ea663ee77 100644 --- a/lib/pleroma/activity.ex +++ b/lib/pleroma/activity.ex @@ -179,7 +179,7 @@ def change(struct, params \\ %{}) do def get_by_ap_id_with_object(ap_id) do ap_id |> Queries.by_ap_id() - |> with_preloaded_object(:left) + |> with_preloaded_object(:inner) |> Repo.one() end diff --git a/lib/pleroma/web/mastodon_api/views/notification_view.ex b/lib/pleroma/web/mastodon_api/views/notification_view.ex index b5b5b2376..f03269e4c 100644 --- a/lib/pleroma/web/mastodon_api/views/notification_view.ex +++ b/lib/pleroma/web/mastodon_api/views/notification_view.ex @@ -36,7 +36,7 @@ def render("index.json", %{notifications: notifications, for: reading_user} = op end) |> Enum.map(&object_id_for/1) |> Activity.create_by_object_ap_id() - |> Activity.with_preloaded_object(:left) + |> Activity.with_preloaded_object(:inner) |> Pleroma.Repo.all() relationships_opt = diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index b949d8f9a..9e58009d6 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -103,7 +103,7 @@ def render("index.json", opts) do |> Enum.filter(&(&1.data["type"] == "Announce" && &1.data["object"])) |> Enum.map(&Object.normalize(&1, fetch: false).data["id"]) |> Activity.create_by_object_ap_id() - |> Activity.with_preloaded_object(:left) + |> Activity.with_preloaded_object(:inner) |> Activity.with_preloaded_bookmark(reading_user) |> Activity.with_set_thread_muted_field(reading_user) |> Repo.all() -- cgit v1.2.3