projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and...
[akkoma]
/
lib
/
pleroma
/
object
/
fetcher.ex
diff --git
a/lib/pleroma/object/fetcher.ex
b/lib/pleroma/object/fetcher.ex
index 9a9a4655005d5ab8dcb21511e11ebda5ca7d73a7..a1bde90f1d77a9c12868427fecde1b524c708732 100644
(file)
--- 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
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}
{:ok, data} <- fetch_and_contain_remote_object_from_id(id),
{:ok, object} <- reinject_object(object, data) do
{:ok, object}
@@
-154,7
+154,7
@@
defmodule Pleroma.Object.Fetcher do
end
def fetch_and_contain_remote_object_from_id(id) when is_binary(id) do
end
def fetch_and_contain_remote_object_from_id(id) when is_binary(id) do
- Logger.
info
("Fetching object #{id} via AP")
+ Logger.
debug
("Fetching object #{id} via AP")
date = Pleroma.Signature.signed_date()
date = Pleroma.Signature.signed_date()