summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-11-23 22:55:41 +0300
committerrinpatch <rinpatch@sdf.org>2019-11-23 22:55:41 +0300
commit9f2993044098ced1585c8886c16da19dd046b5fd (patch)
tree3e1708c4ba41af193bb91a264c3f915e324db281
parent34cdbcbb644e14dde562c150fa8ae2881e6a899b (diff)
fetcher: move local object checking into a reusable function
-rw-r--r--lib/pleroma/object.ex4
-rw-r--r--lib/pleroma/object/fetcher.ex2
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index cde0eddd9..b4ed3a9b2 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -255,4 +255,8 @@ defmodule Pleroma.Object do
|> Object.change(%{data: Map.merge(data || %{}, attrs)})
|> Repo.update()
end
+
+ def local?(%Object{data: %{"id" => id}}) do
+ String.starts_with?(id, Pleroma.Web.base_url() <> "/")
+ end
end
diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index 9a9a46550..4d71c91a8 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -49,7 +49,7 @@ defmodule Pleroma.Object.Fetcher do
end
def refetch_object(%Object{data: %{"id" => id}} = object) do
- with {:local, false} <- {:local, String.starts_with?(id, Pleroma.Web.base_url() <> "/")},
+ with {:local, false} <- {:local, Object.local?(object)},
{:ok, data} <- fetch_and_contain_remote_object_from_id(id),
{:ok, object} <- reinject_object(object, data) do
{:ok, object}