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

fix(instance): Set default name to Funkwhale in SpaManifest

This commit is contained in:
Georg Krause 2022-10-13 19:49:12 +02:00 committed by Georg Krause
parent 7ef652091c
commit 4e7a0d5734
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/funkwhale_api/instance/serializers.py
View File

@ -199,6 +199,7 @@ class NodeInfo20Serializer(serializers.Serializer):
def get_metadata(self, obj): def get_metadata(self, obj):
return MetadataSerializer(obj).data return MetadataSerializer(obj).data
class SpaManifestSerializer(serializers.Serializer): class SpaManifestSerializer(serializers.Serializer):
name = serializers.CharField() name = serializers.CharField()
short_name = serializers.CharField() short_name = serializers.CharField()

3
api/funkwhale_api/instance/views.py
View File

@ -126,12 +126,13 @@ class SpaManifest(generics.GenericAPIView):
serializer_class = serializers.SpaManifestSerializer serializer_class = serializers.SpaManifestSerializer
@extend_schema(operation_id="get_spa_manifest") @extend_schema(operation_id="get_spa_manifest")
def get(self, request, *args, **kwargs): def get(self, request):
existing_manifest = middleware.get_spa_file( existing_manifest = middleware.get_spa_file(
settings.FUNKWHALE_SPA_HTML_ROOT, "manifest.json" settings.FUNKWHALE_SPA_HTML_ROOT, "manifest.json"
) )
parsed_manifest = json.loads(existing_manifest) parsed_manifest = json.loads(existing_manifest)
parsed_manifest["short_name"] = settings.APP_NAME parsed_manifest["short_name"] = settings.APP_NAME
parsed_manifest["name"] = settings.APP_NAME
parsed_manifest["start_url"] = federation_utils.full_url("/") parsed_manifest["start_url"] = federation_utils.full_url("/")
instance_name = preferences.get("instance__name") instance_name = preferences.get("instance__name")
if instance_name: if instance_name: