squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix backport

Browse Source
This commit is contained in:
Ariadne Conill 2019-07-14 20:02:39 +00:00
parent c51b2abead
commit f1147a3d7f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/object/fetcher.ex
View File

@ -56,9 +56,9 @@ defmodule Pleroma.Object.Fetcher do
{:normalize, object = %Object{}} -> {:normalize, object = %Object{}} ->
{:ok, object} {:ok, object}
e -> _e ->
# Only fallback when receiving a fetch/normalization error with ActivityPub # Only fallback when receiving a fetch/normalization error with ActivityPub
Logger.warn("Couldn't get object via AP, trying out OStatus fetching... #{inspect(e)}") Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
# FIXME: OStatus Object Containment? # FIXME: OStatus Object Containment?
case OStatus.fetch_activity_from_url(id) do case OStatus.fetch_activity_from_url(id) do

6
test/support/http_request_mock.ex
View File

@ -841,7 +841,7 @@ defmodule HttpRequestMock do
{:ok, {:ok,
%Tesla.Env{ %Tesla.Env{
status: 200, status: 200,
body: File.read!("test/fixtures/tesla_mock/https__info.pleroma.site_activity.json") body: File.read!("test/fixtures/httpoison_mock/https__info.pleroma.site_activity.json")
}} }}
end end
@ -853,7 +853,7 @@ defmodule HttpRequestMock do
{:ok, {:ok,
%Tesla.Env{ %Tesla.Env{
status: 200, status: 200,
body: File.read!("test/fixtures/tesla_mock/https__info.pleroma.site_activity2.json") body: File.read!("test/fixtures/httpoison_mock/https__info.pleroma.site_activity2.json")
}} }}
end end
@ -865,7 +865,7 @@ defmodule HttpRequestMock do
{:ok, {:ok,
%Tesla.Env{ %Tesla.Env{
status: 200, status: 200,
body: File.read!("test/fixtures/tesla_mock/https__info.pleroma.site_activity3.json") body: File.read!("test/fixtures/httpoison_mock/https__info.pleroma.site_activity3.json")
}} }}
end end