yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-03 21:29:16 +02:00
Code Issues Releases Wiki Activity

Actor description/summary

Browse source
This commit is contained in:
Eliot Berriot 2020-01-23 11:09:52 +01:00
parent 6785deb9d6
commit 87bc011e32
6 changed files with 118 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

22
api/funkwhale_api/users/serializers.py
View file

@ -11,6 +11,7 @@ from versatileimagefield.serializers import VersatileImageFieldSerializer
from funkwhale_api.activity import serializers as activity_serializers
from funkwhale_api.common import serializers as common_serializers
from funkwhale_api.common import utils as common_utils
from funkwhale_api.federation import models as federation_models
from . import adapters
from . import models
@ -27,6 +28,7 @@ class ASCIIUsernameValidator(validators.RegexValidator):
username_validators = [ASCIIUsernameValidator()]
NOOP = object()
class RegisterSerializer(RS):
@ -106,6 +108,7 @@ class UserBasicSerializer(serializers.ModelSerializer):
class UserWriteSerializer(serializers.ModelSerializer):
avatar = avatar_field
summary = common_serializers.ContentSerializer(required=False, allow_null=True)
class Meta:
model = models.User
@ -115,8 +118,20 @@ class UserWriteSerializer(serializers.ModelSerializer):
"avatar",
"instance_support_message_display_date",
"funkwhale_support_message_display_date",
"summary",
]
def update(self, obj, validated_data):
if not obj.actor:
obj.create_actor()
summary = validated_data.pop("summary", NOOP)
obj = super().update(obj, validated_data)
if summary != NOOP:
common_utils.attach_content(obj.actor, "summary_obj", summary)
return obj
class UserReadSerializer(serializers.ModelSerializer):
@ -150,17 +165,24 @@ class UserReadSerializer(serializers.ModelSerializer):
class MeSerializer(UserReadSerializer):
quota_status = serializers.SerializerMethodField()
summary = serializers.SerializerMethodField()
class Meta(UserReadSerializer.Meta):
fields = UserReadSerializer.Meta.fields + [
"quota_status",
"instance_support_message_display_date",
"funkwhale_support_message_display_date",
"summary",
]
def get_quota_status(self, o):
return o.get_quota_status() if o.actor else 0
def get_summary(self, o):
if not o.actor or not o.actor.summary_obj:
return
return common_serializers.ContentSerializer(o.actor.summary_obj).data
class PasswordResetSerializer(PRS):
def get_email_options(self):