novaburst/funquail
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

音楽で楽しみましょう！-Let's have fun with music!-

Browse source 
Signed-off-by: Shin'ya Minazuki <shinyoukai@laidback.moe>
This commit is contained in:
Shin'ya Minazuki 2026-01-24 16:16:49 -03:00
commit 54c6d22102
517 changed files with 637 additions and 639 deletions
Download patch file Download diff file Expand all files Collapse all files

12
api/tests/audio/test_spa_views.py
View file

@ -24,7 +24,7 @@ def test_channel_detail(attribute, spa_html, no_api_auth, client, factories, set
{
"tag": "meta",
"property": "og:url",
"content": utils.join_url(settings.FUNKWHALE_URL, detail_url),
"content": utils.join_url(settings.FUNQUAIL_URL, detail_url),
},
{"tag": "meta", "property": "og:title", "content": channel.artist.name},
{"tag": "meta", "property": "og:type", "content": "profile"},
@ -51,10 +51,10 @@ def test_channel_detail(attribute, spa_html, no_api_auth, client, factories, set
"rel": "alternate",
"type": "application/json+oembed",
"href": (
utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
+ "?format=json&url={}".format(
urllib.parse.quote_plus(
utils.join_url(settings.FUNKWHALE_URL, detail_url)
utils.join_url(settings.FUNQUAIL_URL, detail_url)
)
)
),
@ -76,8 +76,8 @@ def test_channel_detail(attribute, spa_html, no_api_auth, client, factories, set
def test_oembed_channel(factories, no_api_auth, api_client, settings):
settings.FUNKWHALE_URL = "http://test"
settings.FUNKWHALE_EMBED_URL = "http://embed"
settings.FUNQUAIL_URL = "http://test"
settings.FUNQUAIL_EMBED_URL = "http://embed"
channel = factories["audio.Channel"](artist__with_cover=True)
artist = channel.artist
url = reverse("api:v1:oembed")
@ -87,7 +87,7 @@ def test_oembed_channel(factories, no_api_auth, api_client, settings):
"version": "1.0",
"type": "rich",
"provider_name": settings.APP_NAME,
"provider_url": settings.FUNKWHALE_URL,
"provider_url": settings.FUNQUAIL_URL,
"height": 400,
"width": 600,
"title": artist.name,

2
api/tests/audio/test_views.py
View file

@ -93,7 +93,7 @@ def test_channel_list_opml(factories, logged_in_api_client, now):
channel1 = factories["audio.Channel"]()
channel2 = factories["audio.Channel"]()
expected_xml = serializers.get_opml(
channels=[channel2, channel1], title="Funkwhale channels OPML export", date=now
channels=[channel2, channel1], title="FunQuail channels OPML export", date=now
)
expected_content = renderers.render_xml(
renderers.dict_to_xml_tree("opml", expected_xml)

28
api/tests/common/test_middleware.py
View file

@ -53,12 +53,12 @@ def test_should_fallback(path, expected, mocker):
def test_serve_spa_from_cache(mocker, settings, preferences, no_api_auth):
preferences["instance__name"] = 'Best Funkwhale "pod"'
preferences["instance__name"] = 'Best FunQuail "pod"'
request = mocker.Mock(path="/", META={})
get_spa_html = mocker.patch.object(
middleware,
"get_spa_html",
return_value="<html><head><title>Funkwhale</title></head></html>",
return_value="<html><head><title>FunQuail</title></head></html>",
)
mocker.patch.object(
middleware,
@ -91,26 +91,26 @@ def test_serve_spa_from_cache(mocker, settings, preferences, no_api_auth):
'<meta content="default site name" property="og:site_name" />',
"</head></html>",
]
get_spa_html.assert_called_once_with(settings.FUNKWHALE_SPA_HTML_ROOT)
get_spa_html.assert_called_once_with(settings.FUNQUAIL_SPA_HTML_ROOT)
get_request_head_tags.assert_called_once_with(request)
assert response.content == "\n".join(expected).encode()
def test_get_default_head_tags(preferences, settings):
settings.APP_NAME = "Funkwhale"
settings.APP_NAME = "FunQuail"
preferences["instance__name"] = "Hello"
preferences["instance__short_description"] = "World"
expected = [
{"tag": "meta", "property": "og:type", "content": "website"},
{"tag": "meta", "property": "og:site_name", "content": "Hello - Funkwhale"},
{"tag": "meta", "property": "og:site_name", "content": "Hello - FunQuail"},
{"tag": "meta", "property": "og:description", "content": "World"},
{
"tag": "meta",
"property": "og:image",
"content": settings.FUNKWHALE_URL + "/android-chrome-512x512.png",
"content": settings.FUNQUAIL_URL + "/android-chrome-512x512.png",
},
{"tag": "meta", "property": "og:url", "content": settings.FUNKWHALE_URL + "/"},
{"tag": "meta", "property": "og:url", "content": settings.FUNQUAIL_URL + "/"},
]
assert middleware.get_default_head_tags("/") == expected
@ -131,7 +131,7 @@ def test_get_spa_html_from_http(local_cache, r_mock, mocker, settings):
cache_set.assert_called_once_with(
f"spa-file:{url}:index.html",
"hello world",
settings.FUNKWHALE_SPA_HTML_CACHE_DURATION,
settings.FUNQUAIL_SPA_HTML_CACHE_DURATION,
)
@ -291,8 +291,8 @@ def test_throttle_status_middleware_returns_proper_response(mocker):
],
)
def test_rewrite_manifest_json_url(link, new_url, expected, mocker, settings):
settings.FUNKWHALE_SPA_REWRITE_MANIFEST = True
settings.FUNKWHALE_SPA_REWRITE_MANIFEST_URL = new_url
settings.FUNQUAIL_SPA_REWRITE_MANIFEST = True
settings.FUNQUAIL_SPA_REWRITE_MANIFEST_URL = new_url
spa_html = "<html><head><link rel=before>{}<link rel=after></head></html>".format(
link
)
@ -315,8 +315,8 @@ def test_rewrite_manifest_json_url(link, new_url, expected, mocker, settings):
def test_rewrite_manifest_json_url_rewrite_disabled(mocker, settings):
settings.FUNKWHALE_SPA_REWRITE_MANIFEST = False
settings.FUNKWHALE_SPA_REWRITE_MANIFEST_URL = "custom_url"
settings.FUNQUAIL_SPA_REWRITE_MANIFEST = False
settings.FUNQUAIL_SPA_REWRITE_MANIFEST_URL = "custom_url"
spa_html = "<html><head><link href=/manifest.json rel=manifest></head></html>"
request = mocker.Mock(path="/", META={})
mocker.patch.object(middleware, "get_spa_html", return_value=spa_html)
@ -335,8 +335,8 @@ def test_rewrite_manifest_json_url_rewrite_disabled(mocker, settings):
def test_rewrite_manifest_json_url_rewrite_default_url(mocker, settings):
settings.FUNKWHALE_SPA_REWRITE_MANIFEST = True
settings.FUNKWHALE_SPA_REWRITE_MANIFEST_URL = None
settings.FUNQUAIL_SPA_REWRITE_MANIFEST = True
settings.FUNQUAIL_SPA_REWRITE_MANIFEST_URL = None
spa_html = "<html><head><link href=/manifest.json rel=manifest></head></html>"
expected_url = federation_utils.full_url(reverse("api:v1:instance:spa-manifest"))
request = mocker.Mock(path="/", META={})

2
api/tests/common/test_pagination.py
View file

@ -17,7 +17,7 @@ from funkwhale_api.common import pagination
def test_funkwhale_pagination_uses_view_page_size(
view_max_page_size, view_default_page_size, request_page_size, expected, mocker
):
p = pagination.FunkwhalePagination()
p = pagination.FunQuailPagination()
p.view = mocker.Mock(
max_page_size=view_max_page_size, default_page_size=view_default_page_size

4
api/tests/common/test_scripts.py
View file

@ -145,7 +145,7 @@ def test_migrate_to_user_libraries_generate_fids(
if i == 0:
assert o.fid == existing_fid
else:
assert o.fid == template.format(settings.FUNKWHALE_URL, path, o.uuid)
assert o.fid == template.format(settings.FUNQUAIL_URL, path, o.uuid)
# we also ensure the path we insert match the one that is generated
# by the app on objects creation, as a safe guard for typos
assert base_path == o.fid.replace(str(o.uuid), "")
@ -175,7 +175,7 @@ def test_migrate_to_user_libraries_generate_actor_urls(
assert getattr(local, field) is None
expected = "{}/federation/actors/{}/{}".format(
settings.FUNKWHALE_URL, local.preferred_username, part
settings.FUNQUAIL_URL, local.preferred_username, part
)
ok_url = getattr(ok, field)

4
api/tests/common/test_session.py
View file

@ -3,10 +3,10 @@ from funkwhale_api.common import session
def test_get_user_agent(settings):
settings.FUNKWHALE_URL = "https://test.com"
settings.FUNQUAIL_URL = "https://test.com"
"http.rb/3.0.0 (Mastodon/2.2.0; +https://mastodon.eliotberriot.com/)"
expected = "python-requests (funkwhale/{}; +{})".format(
funkwhale_api.__version__, settings.FUNKWHALE_URL
funkwhale_api.__version__, settings.FUNQUAIL_URL
)
assert session.get_user_agent() == expected

12
api/tests/common/test_throttling.py
View file

@ -142,7 +142,7 @@ def test_throttle_anonymous(
view = mocker.Mock(**view_args)
cache_key = throttling.get_cache_key("test", ident)
throttle = throttling.FunkwhaleThrottle()
throttle = throttling.FunQuailThrottle()
history = [time.time() for _ in range(previous_requests)]
throttle.cache.set(cache_key, history)
@ -205,7 +205,7 @@ def test_throttle_authenticated(
view = mocker.Mock(**view_args)
cache_key = throttling.get_cache_key("test", ident)
throttle = throttling.FunkwhaleThrottle()
throttle = throttling.FunQuailThrottle()
history = [time.time() for _ in range(previous_requests)]
throttle.cache.set(cache_key, history)
@ -223,7 +223,7 @@ def throttle_successive(settings, mocker, api_request):
action="retrieve", throttling_scopes={"retrieve": {"anonymous": "test"}}
)
throttle = throttling.FunkwhaleThrottle()
throttle = throttling.FunQuailThrottle()
assert throttle.allow_request(request, view) is True
assert throttle.allow_request(request, view) is True
@ -232,7 +232,7 @@ def throttle_successive(settings, mocker, api_request):
def test_throttle_attach_info(mocker):
throttle = throttling.FunkwhaleThrottle()
throttle = throttling.FunQuailThrottle()
request = mocker.Mock()
setattr(throttle, "num_requests", 300)
setattr(throttle, "duration", 3600)
@ -254,7 +254,7 @@ def test_throttle_attach_info(mocker):
@pytest.mark.parametrize("method", ["throttle_success", "throttle_failure"])
def test_throttle_calls_attach_info(method, mocker):
throttle = throttling.FunkwhaleThrottle()
throttle = throttling.FunQuailThrottle()
setattr(throttle, "key", "noop")
setattr(throttle, "now", "noop")
setattr(throttle, "duration", "noop")
@ -272,7 +272,7 @@ def test_allow_request(api_request, settings, mocker):
settings.THROTTLING_RATES = {"test": {"rate": "2/s"}}
ip = "92.92.92.92"
request = api_request.get("/", HTTP_X_FORWARDED_FOR=ip)
allow_request = mocker.spy(throttling.FunkwhaleThrottle, "allow_request")
allow_request = mocker.spy(throttling.FunQuailThrottle, "allow_request")
action = "test"
throttling_scopes = {"test": {"anonymous": "test", "authenticated": "test"}}
throttling.check_request(request, action)

4
api/tests/common/test_utils.py
View file

@ -261,8 +261,8 @@ def test_monkey_patch_request_build_absolute_uri(
):
settings.IGNORE_FORWARDED_HOST_AND_PROTO = ignore
settings.ALLOWED_HOSTS = "*"
settings.FUNKWHALE_HOSTNAME = hostname
settings.FUNKWHALE_PROTOCOL = protocol
settings.FUNQUAIL_HOSTNAME = hostname
settings.FUNQUAIL_PROTOCOL = protocol
request = fake_request.get("/", **meta)
assert request.build_absolute_uri(path) == expected

4
api/tests/conftest.py
View file

@ -371,9 +371,9 @@ def stdout():
@pytest.fixture
def spa_html(r_mock, settings):
settings.FUNKWHALE_SPA_HTML_ROOT = "http://noop/"
settings.FUNQUAIL_SPA_HTML_ROOT = "http://noop/"
yield r_mock.get(
settings.FUNKWHALE_SPA_HTML_ROOT + "index.html", text="<head></head>"
settings.FUNQUAIL_SPA_HTML_ROOT + "index.html", text="<head></head>"
)

2
api/tests/federation/test_serializers.py
View file

@ -1393,7 +1393,7 @@ def test_local_actor_serializer_to_ap(factories, settings):
{
"type": "Link",
"href": "https://{}/@{}".format(
settings.FUNKWHALE_HOSTNAME, ac.preferred_username
settings.FUNQUAIL_HOSTNAME, ac.preferred_username
),
"mediaType": "text/html",
}

2
api/tests/federation/test_spa_views.py
View file

@ -13,7 +13,7 @@ def test_channel_detail(spa_html, no_api_auth, client, factories, settings):
{
"tag": "meta",
"property": "og:url",
"content": utils.join_url(settings.FUNKWHALE_URL, url),
"content": utils.join_url(settings.FUNQUAIL_URL, url),
},
{"tag": "meta", "property": "og:title", "content": actor.display_name},
{"tag": "meta", "property": "og:type", "content": "profile"},

2
api/tests/federation/test_tasks.py
View file

@ -698,6 +698,6 @@ def test_check_remote_instance_unreachable(factories, r_mock):
def test_check_all_remote_instance_skips_local(settings, factories, r_mock):
domain = factories["federation.Domain"]()
settings.FUNKWHALE_HOSTNAME = domain.name
settings.FUNQUAIL_HOSTNAME = domain.name
tasks.check_all_remote_instance_availability()
assert not r_mock.called

2
api/tests/federation/test_utils.py
View file

@ -15,7 +15,7 @@ from funkwhale_api.federation import exceptions, utils
],
)
def test_full_url(settings, url, path, expected):
settings.FUNKWHALE_URL = url
settings.FUNQUAIL_URL = url
assert utils.full_url(path) == expected

16
api/tests/federation/test_views.py
View file

@ -53,7 +53,7 @@ def test_wellknown_nodeinfo(db, preferences, api_client, settings):
{
"rel": "http://nodeinfo.diaspora.software/ns/schema/2.0",
"href": "{}{}".format(
settings.FUNKWHALE_URL, reverse("api:v1:instance:nodeinfo-2.0")
settings.FUNQUAIL_URL, reverse("api:v1:instance:nodeinfo-2.0")
),
}
]
@ -413,7 +413,7 @@ def test_music_library_retrieve_redirects_to_html_if_header_set(
url = reverse("federation:music:libraries-detail", kwargs={"uuid": library.uuid})
response = api_client.get(url, HTTP_ACCEPT="text/html")
expected_url = utils.join_url(
settings.FUNKWHALE_URL,
settings.FUNQUAIL_URL,
utils.spa_reverse("library_library", kwargs={"uuid": library.uuid}),
)
assert response.status_code == 302
@ -431,7 +431,7 @@ def test_actor_retrieve_redirects_to_html_if_header_set(
)
response = api_client.get(url, HTTP_ACCEPT="text/html")
expected_url = utils.join_url(
settings.FUNKWHALE_URL,
settings.FUNQUAIL_URL,
utils.spa_reverse(
"actor_detail", kwargs={"username": actor.preferred_username}
),
@ -451,7 +451,7 @@ def test_channel_actor_retrieve_redirects_to_html_if_header_set(
)
response = api_client.get(url, HTTP_ACCEPT="text/html")
expected_url = utils.join_url(
settings.FUNKWHALE_URL,
settings.FUNQUAIL_URL,
utils.spa_reverse(
"channel_detail", kwargs={"username": channel.actor.preferred_username}
),
@ -471,7 +471,7 @@ def test_upload_retrieve_redirects_to_html_if_header_set(
)
response = api_client.get(url, HTTP_ACCEPT="text/html")
expected_url = utils.join_url(
settings.FUNKWHALE_URL,
settings.FUNQUAIL_URL,
utils.spa_reverse("library_track", kwargs={"pk": upload.track.pk}),
)
assert response.status_code == 302
@ -489,7 +489,7 @@ def test_track_retrieve_redirects_to_html_if_header_set(
)
response = api_client.get(url, HTTP_ACCEPT="text/html")
expected_url = utils.join_url(
settings.FUNKWHALE_URL,
settings.FUNQUAIL_URL,
utils.spa_reverse("library_track", kwargs={"pk": track.pk}),
)
assert response.status_code == 302
@ -507,7 +507,7 @@ def test_album_retrieve_redirects_to_html_if_header_set(
)
response = api_client.get(url, HTTP_ACCEPT="text/html")
expected_url = utils.join_url(
settings.FUNKWHALE_URL,
settings.FUNQUAIL_URL,
utils.spa_reverse("library_album", kwargs={"pk": album.pk}),
)
assert response.status_code == 302
@ -525,7 +525,7 @@ def test_artist_retrieve_redirects_to_html_if_header_set(
)
response = api_client.get(url, HTTP_ACCEPT="text/html")
expected_url = utils.join_url(
settings.FUNKWHALE_URL,
settings.FUNQUAIL_URL,
utils.spa_reverse("library_artist", kwargs={"pk": artist.pk}),
)
assert response.status_code == 302

2
api/tests/instance/test_nodeinfo.py
View file

@ -102,7 +102,7 @@ def test_nodeinfo_21(api_client):
("name", "funkwhale"),
("version", api_version),
("repository", "https://dev.funkwhale.audio/funkwhale/funkwhale"),
("homepage", "https://funkwhale.audio"),
("homepage", "https://funquail.laidback.moe"),
]
),
"protocols": ["activitypub"],

8
api/tests/moderation/test_tasks.py
View file

@ -31,7 +31,7 @@ def test_report_created_signal_sends_email_to_mods(factories, mailoutbox, settin
for i, mod in enumerate([mod1, mod2]):
m = mailoutbox[i]
assert m.subject == "[{} moderation - {}] New report from {}".format(
settings.FUNKWHALE_HOSTNAME,
settings.FUNQUAIL_HOSTNAME,
report.get_type_display(),
report.submitter.full_username,
)
@ -63,7 +63,7 @@ def test_signup_request_pending_sends_email_to_mods(factories, mailoutbox, setti
for i, mod in enumerate([mod1, mod2]):
m = mailoutbox[i]
assert m.subject == "[{} moderation] New sign-up request from {}".format(
settings.FUNKWHALE_HOSTNAME,
settings.FUNQUAIL_HOSTNAME,
signup_request.submitter.preferred_username,
)
assert detail_url in m.body
@ -89,7 +89,7 @@ def test_approved_request_sends_email_to_submitter_and_set_active(
m = mailoutbox[-1]
login_url = federation_utils.full_url("/login")
assert m.subject == "Welcome to {}, {}!".format(
settings.FUNKWHALE_HOSTNAME,
settings.FUNQUAIL_HOSTNAME,
signup_request.submitter.preferred_username,
)
assert login_url in m.body
@ -115,7 +115,7 @@ def test_refused_request_sends_email_to_submitter(
assert len(mailoutbox) == 1
m = mailoutbox[-1]
assert m.subject == "Your account request at {} was refused".format(
settings.FUNKWHALE_HOSTNAME,
settings.FUNQUAIL_HOSTNAME,
)
assert "test@pod.example" in m.body
assert list(m.to) == [user.email]

2
api/tests/music/test_activity.py
View file

@ -9,7 +9,7 @@ def test_get_track_activity_url_mbid(factories):
def test_get_track_activity_url_no_mbid(settings, factories):
track = factories["music.Track"](mbid=None)
expected = settings.FUNKWHALE_URL + f"/tracks/{track.pk}"
expected = settings.FUNQUAIL_URL + f"/tracks/{track.pk}"
assert track.get_activity_url() == expected

36
api/tests/music/test_spa_views.py
View file

@ -22,7 +22,7 @@ def test_library_track(spa_html, no_api_auth, client, factories, settings):
{
"tag": "meta",
"property": "og:url",
"content": utils.join_url(settings.FUNKWHALE_URL, url),
"content": utils.join_url(settings.FUNQUAIL_URL, url),
},
{"tag": "meta", "property": "og:title", "content": track.title},
{"tag": "meta", "property": "og:type", "content": "music.song"},
@ -40,7 +40,7 @@ def test_library_track(spa_html, no_api_auth, client, factories, settings):
"tag": "meta",
"property": "music:musician",
"content": utils.join_url(
settings.FUNKWHALE_URL,
settings.FUNQUAIL_URL,
utils.spa_reverse("library_artist", kwargs={"pk": track.artist.pk}),
),
},
@ -48,7 +48,7 @@ def test_library_track(spa_html, no_api_auth, client, factories, settings):
"tag": "meta",
"property": "music:album",
"content": utils.join_url(
settings.FUNKWHALE_URL,
settings.FUNQUAIL_URL,
utils.spa_reverse("library_album", kwargs={"pk": track.album.pk}),
),
},
@ -60,7 +60,7 @@ def test_library_track(spa_html, no_api_auth, client, factories, settings):
{
"tag": "meta",
"property": "og:audio",
"content": utils.join_url(settings.FUNKWHALE_URL, track.listen_url),
"content": utils.join_url(settings.FUNQUAIL_URL, track.listen_url),
},
{
"tag": "link",
@ -73,9 +73,9 @@ def test_library_track(spa_html, no_api_auth, client, factories, settings):
"rel": "alternate",
"type": "application/json+oembed",
"href": (
utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
+ "?format=json&url={}".format(
urllib.parse.quote_plus(utils.join_url(settings.FUNKWHALE_URL, url))
urllib.parse.quote_plus(utils.join_url(settings.FUNQUAIL_URL, url))
)
),
},
@ -108,7 +108,7 @@ def test_library_album(spa_html, no_api_auth, client, factories, settings):
{
"tag": "meta",
"property": "og:url",
"content": utils.join_url(settings.FUNKWHALE_URL, url),
"content": utils.join_url(settings.FUNQUAIL_URL, url),
},
{"tag": "meta", "property": "og:title", "content": album.title},
{"tag": "meta", "property": "og:type", "content": "music.album"},
@ -116,7 +116,7 @@ def test_library_album(spa_html, no_api_auth, client, factories, settings):
"tag": "meta",
"property": "music:musician",
"content": utils.join_url(
settings.FUNKWHALE_URL,
settings.FUNQUAIL_URL,
utils.spa_reverse("library_artist", kwargs={"pk": album.artist.pk}),
),
},
@ -141,9 +141,9 @@ def test_library_album(spa_html, no_api_auth, client, factories, settings):
"rel": "alternate",
"type": "application/json+oembed",
"href": (
utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
+ "?format=json&url={}".format(
urllib.parse.quote_plus(utils.join_url(settings.FUNKWHALE_URL, url))
urllib.parse.quote_plus(utils.join_url(settings.FUNQUAIL_URL, url))
)
),
},
@ -175,7 +175,7 @@ def test_library_artist(spa_html, no_api_auth, client, factories, settings):
{
"tag": "meta",
"property": "og:url",
"content": utils.join_url(settings.FUNKWHALE_URL, url),
"content": utils.join_url(settings.FUNQUAIL_URL, url),
},
{"tag": "meta", "property": "og:title", "content": artist.name},
{"tag": "meta", "property": "og:type", "content": "profile"},
@ -195,9 +195,9 @@ def test_library_artist(spa_html, no_api_auth, client, factories, settings):
"rel": "alternate",
"type": "application/json+oembed",
"href": (
utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
+ "?format=json&url={}".format(
urllib.parse.quote_plus(utils.join_url(settings.FUNKWHALE_URL, url))
urllib.parse.quote_plus(utils.join_url(settings.FUNQUAIL_URL, url))
)
),
},
@ -232,7 +232,7 @@ def test_library_playlist(spa_html, no_api_auth, client, factories, settings):
{
"tag": "meta",
"property": "og:url",
"content": utils.join_url(settings.FUNKWHALE_URL, url),
"content": utils.join_url(settings.FUNQUAIL_URL, url),
},
{"tag": "meta", "property": "og:title", "content": playlist.name},
{"tag": "meta", "property": "og:type", "content": "music.playlist"},
@ -246,9 +246,9 @@ def test_library_playlist(spa_html, no_api_auth, client, factories, settings):
"rel": "alternate",
"type": "application/json+oembed",
"href": (
utils.join_url(settings.FUNKWHALE_URL, reverse("api:v1:oembed"))
utils.join_url(settings.FUNQUAIL_URL, reverse("api:v1:oembed"))
+ "?format=json&url={}".format(
urllib.parse.quote_plus(utils.join_url(settings.FUNKWHALE_URL, url))
urllib.parse.quote_plus(utils.join_url(settings.FUNQUAIL_URL, url))
)
),
},
@ -279,7 +279,7 @@ def test_library_playlist_empty(spa_html, no_api_auth, client, factories, settin
{
"tag": "meta",
"property": "og:url",
"content": utils.join_url(settings.FUNKWHALE_URL, url),
"content": utils.join_url(settings.FUNQUAIL_URL, url),
},
{"tag": "meta", "property": "og:title", "content": playlist.name},
{"tag": "meta", "property": "og:type", "content": "music.playlist"},
@ -301,7 +301,7 @@ def test_library_library(spa_html, no_api_auth, client, factories, settings):
{
"tag": "meta",
"property": "og:url",
"content": utils.join_url(settings.FUNKWHALE_URL, url),
"content": utils.join_url(settings.FUNQUAIL_URL, url),
},
{"tag": "meta", "property": "og:type", "content": "website"},
{"tag": "meta", "property": "og:title", "content": library.name},

24
api/tests/music/test_views.py
View file

@ -1022,8 +1022,8 @@ def test_detail_license(api_client, preferences):
def test_oembed_track(factories, no_api_auth, api_client, settings):
settings.FUNKWHALE_URL = "http://test"
settings.FUNKWHALE_EMBED_URL = "http://embed"
settings.FUNQUAIL_URL = "http://test"
settings.FUNQUAIL_EMBED_URL = "http://embed"
track = factories["music.Track"](album__with_cover=True)
url = reverse("api:v1:oembed")
track_url = f"https://test.com/library/tracks/{track.pk}"
@ -1032,7 +1032,7 @@ def test_oembed_track(factories, no_api_auth, api_client, settings):
"version": "1.0",
"type": "rich",
"provider_name": settings.APP_NAME,
"provider_url": settings.FUNKWHALE_URL,
"provider_url": settings.FUNQUAIL_URL,
"height": 150,
"width": 600,
"title": f"{track.title} by {track.artist.name}",
@ -1057,8 +1057,8 @@ def test_oembed_track(factories, no_api_auth, api_client, settings):
def test_oembed_album(factories, no_api_auth, api_client, settings):
settings.FUNKWHALE_URL = "http://test"
settings.FUNKWHALE_EMBED_URL = "http://embed"
settings.FUNQUAIL_URL = "http://test"
settings.FUNQUAIL_EMBED_URL = "http://embed"
track = factories["music.Track"](album__with_cover=True)
album = track.album
url = reverse("api:v1:oembed")
@ -1068,7 +1068,7 @@ def test_oembed_album(factories, no_api_auth, api_client, settings):
"version": "1.0",
"type": "rich",
"provider_name": settings.APP_NAME,
"provider_url": settings.FUNKWHALE_URL,
"provider_url": settings.FUNQUAIL_URL,
"height": 400,
"width": 600,
"title": f"{album.title} by {album.artist.name}",
@ -1093,8 +1093,8 @@ def test_oembed_album(factories, no_api_auth, api_client, settings):
def test_oembed_artist(factories, no_api_auth, api_client, settings):
settings.FUNKWHALE_URL = "http://test"
settings.FUNKWHALE_EMBED_URL = "http://embed"
settings.FUNQUAIL_URL = "http://test"
settings.FUNQUAIL_EMBED_URL = "http://embed"
track = factories["music.Track"](album__with_cover=True)
album = track.album
artist = track.artist
@ -1105,7 +1105,7 @@ def test_oembed_artist(factories, no_api_auth, api_client, settings):
"version": "1.0",
"type": "rich",
"provider_name": settings.APP_NAME,
"provider_url": settings.FUNKWHALE_URL,
"provider_url": settings.FUNQUAIL_URL,
"height": 400,
"width": 600,
"title": artist.name,
@ -1130,8 +1130,8 @@ def test_oembed_artist(factories, no_api_auth, api_client, settings):
def test_oembed_playlist(factories, no_api_auth, api_client, settings):
settings.FUNKWHALE_URL = "http://test"
settings.FUNKWHALE_EMBED_URL = "http://embed"
settings.FUNQUAIL_URL = "http://test"
settings.FUNQUAIL_EMBED_URL = "http://embed"
playlist = factories["playlists.Playlist"](privacy_level="everyone")
track = factories["music.Upload"](
playable=True, track__album__with_cover=True
@ -1144,7 +1144,7 @@ def test_oembed_playlist(factories, no_api_auth, api_client, settings):
"version": "1.0",
"type": "rich",
"provider_name": settings.APP_NAME,
"provider_url": settings.FUNKWHALE_URL,
"provider_url": settings.FUNQUAIL_URL,
"height": 400,
"width": 600,
"title": playlist.name,

2
api/tests/users/test_activity.py
View file

@ -4,7 +4,7 @@ from funkwhale_api.users import serializers
def test_get_user_activity_url(settings, factories):
user = factories["users.User"]()
assert user.get_activity_url() == "{}/@{}".format(
settings.FUNKWHALE_URL, user.username
settings.FUNQUAIL_URL, user.username
)

2
api/tests/users/test_models.py
View file

@ -234,7 +234,7 @@ def test_user_get_quota_status(factories, preferences, mocker):
"setting_name, field",
[
("INSTANCE_SUPPORT_MESSAGE_DELAY", "instance_support_message_display_date"),
("FUNKWHALE_SUPPORT_MESSAGE_DELAY", "funkwhale_support_message_display_date"),
("FUNQUAIL_SUPPORT_MESSAGE_DELAY", "funkwhale_support_message_display_date"),
],
)
def test_creating_user_set_support_display_date(

6
api/tests/users/test_views.py
View file

@ -166,7 +166,7 @@ def test_can_request_password_reset(
confirmation_message = mailoutbox[-1]
assert "Hello world" in confirmation_message.body
assert settings.FUNKWHALE_HOSTNAME in confirmation_message.body
assert settings.FUNQUAIL_HOSTNAME in confirmation_message.body
def test_user_can_patch_his_own_settings(logged_in_api_client):
@ -327,7 +327,7 @@ def test_creating_user_sends_confirmation_email(
confirmation_message = mailoutbox[-1]
assert "Hello world" in confirmation_message.body
assert settings.FUNKWHALE_HOSTNAME in confirmation_message.body
assert settings.FUNQUAIL_HOSTNAME in confirmation_message.body
def test_user_account_deletion_requires_valid_password(logged_in_api_client):
@ -425,7 +425,7 @@ def test_signup_with_approval_enabled(
confirmation_message = mailoutbox[-1]
assert "confirm" in confirmation_message.body
assert settings.FUNKWHALE_HOSTNAME in confirmation_message.body
assert settings.FUNQUAIL_HOSTNAME in confirmation_message.body
def test_signup_with_approval_enabled_validation_error(