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

See #890: store domain name and local status of reported objects

This commit is contained in:
Eliot Berriot 2019-08-28 17:12:54 +02:00
parent ef3c37584a
commit f48f74dcb3
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/funkwhale_api/moderation/serializers.py
View File

@ -1,5 +1,7 @@
import persisting_theory import urllib.parse
from django.conf import settings
import persisting_theory
from rest_framework import serializers from rest_framework import serializers
from funkwhale_api.common import fields as common_fields from funkwhale_api.common import fields as common_fields
@ -117,7 +119,7 @@ class TrackStateSerializer(serializers.ModelSerializer):
class LibraryStateSerializer(serializers.ModelSerializer): class LibraryStateSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = music_models.Library model = music_models.Library
fields = ["id", "fid", "name", "description", "creation_date", "privacy_level"] fields = ["id", "uuid", "fid", "name", "description", "creation_date", "privacy_level"]
@state_serializers.register(name="playlists.Playlist") @state_serializers.register(name="playlists.Playlist")
@ -135,6 +137,7 @@ class ActorStateSerializer(serializers.ModelSerializer):
"fid", "fid",
"name", "name",
"preferred_username", "preferred_username",
"full_username",
"summary", "summary",
"domain", "domain",
"type", "type",
@ -228,5 +231,14 @@ class ReportSerializer(serializers.ModelSerializer):
validated_data["target_state"] = target_state_serializer( validated_data["target_state"] = target_state_serializer(
validated_data["target"] validated_data["target"]
).data ).data
if "fid" in validated_data["target_state"]:
validated_data["target_state"]["domain"] = urllib.parse.urlparse(
validated_data["target_state"]["fid"]
).hostname
validated_data["target_state"]["is_local"] = (
validated_data["target_state"].get("domain", settings.FEDERATION_HOSTNAME)
== settings.FEDERATION_HOSTNAME
)
validated_data["target_owner"] = get_target_owner(validated_data["target"]) validated_data["target_owner"] = get_target_owner(validated_data["target"])
return super().create(validated_data) return super().create(validated_data)