hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'bugfix/peertube-videos' into 'develop'

Browse source 
Fix getting videos from peertube

See merge request pleroma/pleroma!2728
This commit is contained in:
lain 2020-07-07 09:14:50 +00:00
commit 9ad305209a
5 changed files with 76 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/support/http_request_mock.ex
View file

@ -308,6 +308,22 @@ defmodule HttpRequestMock do
}}
end
def get("https://framatube.org/accounts/framasoft", _, _, _) do
{:ok,
%Tesla.Env{
status: 200,
body: File.read!("test/fixtures/tesla_mock/https___framatube.org_accounts_framasoft.json")
}}
end
def get("https://framatube.org/videos/watch/6050732a-8a7a-43d4-a6cd-809525a1d206", _, _, _) do
{:ok,
%Tesla.Env{
status: 200,
body: File.read!("test/fixtures/tesla_mock/framatube.org-video.json")
}}
end
def get("https://peertube.social/accounts/craigmaloney", _, _, _) do
{:ok,
%Tesla.Env{