aboutsummaryrefslogtreecommitdiffstats
path: root/api/serializers.py
diff options
context:
space:
mode:
authorGravatar Johannes Christ <[email protected]>2018-11-25 11:16:57 +0100
committerGravatar Johannes Christ <[email protected]>2018-11-25 11:16:57 +0100
commit87a48cad5197234a6ccff616fec17a027b2adcb8 (patch)
tree0ea7bebddf9ce216e94602ddeca300184729fb00 /api/serializers.py
parentUse proper attribute name. (diff)
parentSet up image pushing and building on Azure. (#152) (diff)
Merge branch 'django' into django+add-logs-api.
Diffstat (limited to 'api/serializers.py')
-rw-r--r--api/serializers.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/api/serializers.py b/api/serializers.py
index e39cd4a3..8091ac63 100644
--- a/api/serializers.py
+++ b/api/serializers.py
@@ -3,11 +3,11 @@ from rest_framework_bulk import BulkSerializerMixin
from .models import (
DeletedMessage, DocumentationLink,
- Member, MessageDeletionContext,
- OffTopicChannelName, Role,
- SnakeFact, SnakeIdiom,
- SnakeName, SpecialSnake,
- Tag
+ MessageDeletionContext, OffTopicChannelName,
+ Role, SnakeFact,
+ SnakeIdiom, SnakeName,
+ SpecialSnake, Tag,
+ User
)
@@ -74,10 +74,10 @@ class TagSerializer(ModelSerializer):
fields = ('title', 'embed')
-class MemberSerializer(BulkSerializerMixin, ModelSerializer):
- roles = PrimaryKeyRelatedField(many=True, queryset=Role.objects.all())
+class UserSerializer(BulkSerializerMixin, ModelSerializer):
+ roles = PrimaryKeyRelatedField(many=True, queryset=Role.objects.all(), required=False)
class Meta:
- model = Member
- fields = ('id', 'avatar_hash', 'name', 'discriminator', 'roles')
+ model = User
+ fields = ('id', 'avatar_hash', 'name', 'discriminator', 'roles', 'in_guild')
depth = 1