diff options
author | Mark Felder <feld@feld.me> | 2024-09-30 12:41:06 -0400 |
---|---|---|
committer | Mark Felder <feld@feld.me> | 2024-09-30 12:41:09 -0400 |
commit | 382426e0338d7918cd2db7c72ede446a2a8f7f4f (patch) | |
tree | 4030b24941e738dd513443d57708de41f9af1bc1 /lib | |
parent | d2eb4992e254c1cdc27033742de1958f02757df1 (diff) | |
download | pleroma-382426e0338d7918cd2db7c72ede446a2a8f7f4f.tar.gz pleroma-382426e0338d7918cd2db7c72ede446a2a8f7f4f.zip |
Remove Object.get_by_id_and_maybe_refetch/2
This was only used for poll refreshing and is not a good approach to the problem.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/object.ex | 21 | ||||
-rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/poll_controller.ex | 2 |
2 files changed, 1 insertions, 22 deletions
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index 748f18e6c..77dfda851 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -99,27 +99,6 @@ defmodule Pleroma.Object do def get_by_id(nil), do: nil def get_by_id(id), do: Repo.get(Object, id) - @spec get_by_id_and_maybe_refetch(integer(), list()) :: Object.t() | nil - def get_by_id_and_maybe_refetch(id, opts \\ []) do - with %Object{updated_at: updated_at} = object <- get_by_id(id) do - if opts[:interval] && - NaiveDateTime.diff(NaiveDateTime.utc_now(), updated_at) > opts[:interval] do - case Fetcher.refetch_object(object) do - {:ok, %Object{} = object} -> - object - - e -> - Logger.error("Couldn't refresh #{object.data["id"]}:\n#{inspect(e)}") - object - end - else - object - end - else - nil -> nil - end - end - def get_by_ap_id(nil), do: nil def get_by_ap_id(ap_id) do diff --git a/lib/pleroma/web/mastodon_api/controllers/poll_controller.ex b/lib/pleroma/web/mastodon_api/controllers/poll_controller.ex index a2af8148c..303b995f6 100644 --- a/lib/pleroma/web/mastodon_api/controllers/poll_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/poll_controller.ex @@ -30,7 +30,7 @@ defmodule Pleroma.Web.MastodonAPI.PollController do @doc "GET /api/v1/polls/:id" def show(%{assigns: %{user: user}, private: %{open_api_spex: %{params: %{id: id}}}} = conn, _) do - with %Object{} = object <- Object.get_by_id_and_maybe_refetch(id, interval: 60), + with %Object{} = object <- Object.get_by_id(id), %Activity{} = activity <- Activity.get_create_by_object_ap_id(object.data["id"]), true <- Visibility.visible_for_user?(activity, user) do try_render(conn, "show.json", %{object: object, for: user}) |