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

Use absolute urls

This commit is contained in:
Eliot Berriot 2018-03-31 15:57:29 +02:00
parent 0c8faf83c5
commit 703d70d544
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
api/funkwhale_api/federation/actors.py
View File

@ -6,6 +6,7 @@ from django.conf import settings
from dynamic_preferences.registries import global_preferences_registry
from . import models
from . import utils
def get_actor_data(actor_url):
@ -29,18 +30,22 @@ def get_base_system_actor_arguments(name):
'type': 'Person',
'name': '{}\'s library'.format(settings.FEDERATION_HOSTNAME),
'manually_approves_followers': True,
'url': reverse(
'federation:instance-actors-detail',
kwargs={'actor': name}),
'shared_inbox_url': reverse(
'federation:instance-actors-inbox',
kwargs={'actor': name}),
'inbox_url': reverse(
'federation:instance-actors-inbox',
kwargs={'actor': name}),
'outbox_url': reverse(
'federation:instance-actors-outbox',
kwargs={'actor': name}),
'url': utils.full_url(
reverse(
'federation:instance-actors-detail',
kwargs={'actor': name})),
'shared_inbox_url': utils.full_url(
reverse(
'federation:instance-actors-inbox',
kwargs={'actor': name})),
'inbox_url': utils.full_url(
reverse(
'federation:instance-actors-inbox',
kwargs={'actor': name})),
'outbox_url': utils.full_url(
reverse(
'federation:instance-actors-outbox',
kwargs={'actor': name})),
'public_key': preferences['federation__public_key'],
'summary': 'Bot account to federate with {}\'s library'.format(
settings.FEDERATION_HOSTNAME

22
api/tests/federation/test_actors.py
View File

@ -1,6 +1,7 @@
from django.urls import reverse
from funkwhale_api.federation import actors
from funkwhale_api.federation import utils
def test_actor_fetching(r_mock):
@ -24,15 +25,18 @@ def test_get_library(settings, preferences):
'type': 'Person',
'name': '{}\'s library'.format(settings.FEDERATION_HOSTNAME),
'manually_approves_followers': True,
'url': reverse(
'federation:instance-actors-detail',
kwargs={'actor': 'library'}),
'shared_inbox_url': reverse(
'federation:instance-actors-inbox',
kwargs={'actor': 'library'}),
'inbox_url': reverse(
'federation:instance-actors-inbox',
kwargs={'actor': 'library'}),
'url': utils.full_url(
reverse(
'federation:instance-actors-detail',
kwargs={'actor': 'library'})),
'shared_inbox_url': utils.full_url(
reverse(
'federation:instance-actors-inbox',
kwargs={'actor': 'library'})),
'inbox_url': utils.full_url(
reverse(
'federation:instance-actors-inbox',
kwargs={'actor': 'library'})),
'public_key': 'public_key',
'summary': 'Bot account to federate with {}\'s library'.format(
settings.FEDERATION_HOSTNAME),