projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
in dev, allow dev FE
[akkoma]
/
lib
/
pleroma
/
object
/
fetcher.ex
diff --git
a/lib/pleroma/object/fetcher.ex
b/lib/pleroma/object/fetcher.ex
index 8309ef64a042de3ffbb1da16a36c6869fca50fc8..aeaf05986430d6404b9c21d7292a97ca0ec59a1e 100644
(file)
--- a/
lib/pleroma/object/fetcher.ex
+++ b/
lib/pleroma/object/fetcher.ex
@@
-262,7
+262,7
@@
defmodule Pleroma.Object.Fetcher do
def fetch_and_contain_remote_object_from_id(_id),
do: {:error, "id must be a string"}
def fetch_and_contain_remote_object_from_id(_id),
do: {:error, "id must be a string"}
- def
p
get_object(id) do
+ def get_object(id) do
date = Pleroma.Signature.signed_date()
headers =
date = Pleroma.Signature.signed_date()
headers =
@@
-282,6
+282,11
@@
defmodule Pleroma.Object.Fetcher do
%{"profile" => "https://www.w3.org/ns/activitystreams"}} ->
{:ok, body}
%{"profile" => "https://www.w3.org/ns/activitystreams"}} ->
{:ok, body}
+ # pixelfed sometimes (and only sometimes) responds with http instead of https
+ {:ok, "application", "ld+json",
+ %{"profile" => "http://www.w3.org/ns/activitystreams"}} ->
+ {:ok, body}
+
_ ->
{:error, {:content_type, content_type}}
end
_ ->
{:error, {:content_type, content_type}}
end