MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1065-scanning-issue' into 'develop' 

Fix #1065: irrelevant redirection to HTML repr of a library

Closes #1065

See merge request funkwhale/funkwhale!1069
This commit is contained in:
Eliot Berriot 2020-03-30 10:03:30 +02:00
parent 5bb9112a09 0b06ef3b3b
commit 4459f3ebc1
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/funkwhale_api/federation/utils.py
View File

@ -215,6 +215,7 @@ def should_redirect_ap_to_html(accept_header, default=True):
"text/html", "text/html",
] ]
no_redirect_headers = [ no_redirect_headers = [
"*/*", # XXX backward compat with older Funkwhale instances that don't send the Accept header
"application/json", "application/json",
"application/activity+json", "application/activity+json",
"application/ld+json", "application/ld+json",

5
api/tests/federation/test_views.py
View File

@ -371,6 +371,11 @@ def test_music_upload_detail_private_approved_follow(
("text/html,application/xhtml+xml", True, True), ("text/html,application/xhtml+xml", True, True),
("text/html,application/json", True, True), ("text/html,application/json", True, True),
("", True, False), ("", True, False),
(
"*/*",
True,
False,
), # XXX: compat with older versions of Funkwhale that miss the Accept header
(None, True, False), (None, True, False),
("application/json", True, False), ("application/json", True, False),
("application/activity+json", True, False), ("application/activity+json", True, False),