From 77cb291273bd1ce0030b7d02c99bc0df4a226e29 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Mon, 18 Jul 2022 10:30:10 +0200 Subject: [PATCH] Avoid naming conflicts --- api/funkwhale_api/manage/serializers.py | 4 ++-- api/funkwhale_api/moderation/serializers.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/funkwhale_api/manage/serializers.py b/api/funkwhale_api/manage/serializers.py index 4e2216922..428c98128 100644 --- a/api/funkwhale_api/manage/serializers.py +++ b/api/funkwhale_api/manage/serializers.py @@ -250,7 +250,7 @@ class ManageActorActionSerializer(common_serializers.ActionSerializer): common_utils.on_commit(federation_tasks.purge_actors.delay, ids=list(ids)) -class TargetSerializer(serializers.Serializer): +class ManageTargetSerializer(serializers.Serializer): type = serializers.ChoiceField(choices=["domain", "actor"]) id = serializers.CharField() @@ -272,7 +272,7 @@ class TargetSerializer(serializers.Serializer): class ManageInstancePolicySerializer(serializers.ModelSerializer): - target = TargetSerializer() + target = ManageTargetSerializer() actor = federation_fields.ActorRelatedField(read_only=True) class Meta: diff --git a/api/funkwhale_api/moderation/serializers.py b/api/funkwhale_api/moderation/serializers.py index b062744f4..55daca3a4 100644 --- a/api/funkwhale_api/moderation/serializers.py +++ b/api/funkwhale_api/moderation/serializers.py @@ -24,7 +24,7 @@ class FilteredArtistSerializer(serializers.ModelSerializer): fields = ["id", "name"] -class TargetSerializer(serializers.Serializer): +class ModerationTargetSerializer(serializers.Serializer): type = serializers.ChoiceField(choices=["artist"]) id = serializers.CharField() @@ -44,7 +44,7 @@ class TargetSerializer(serializers.Serializer): class UserFilterSerializer(serializers.ModelSerializer): - target = TargetSerializer() + target = ModerationTargetSerializer() class Meta: model = models.UserFilter