Merge branch 'develop' of github.com:evennia/evennia into develop

This commit is contained in:
Griatch 2022-10-02 11:20:03 +02:00
commit 0e0a904b12
2 changed files with 7 additions and 8 deletions

View file

@ -85,6 +85,10 @@ WEBSOCKET_CLIENT_PORT = 4002
WEBSERVER_PORTS = [(4001, 4005)] WEBSERVER_PORTS = [(4001, 4005)]
AMP_PORT = 4006 AMP_PORT = 4006
# This needs to be set to your website address for django or you'll receive a
# CSRF error when trying to log on to the web portal
CSRF_TRUSTED_ORIGINS = ['https://mymudgame.com']
# Optional - security measures limiting interface access # Optional - security measures limiting interface access
# (don't set these before you know things work without them) # (don't set these before you know things work without them)
TELNET_INTERFACES = ['203.0.113.0'] TELNET_INTERFACES = ['203.0.113.0']

View file

@ -112,10 +112,7 @@ class CharacterViewSet(ObjectDBViewSet):
""" """
queryset = DefaultCharacter.objects.typeclass_search( queryset = DefaultCharacter.objects.all_family()
DefaultCharacter.path, include_children=True
)
list_serializer_class = serializers.ObjectListSerializer
class RoomViewSet(ObjectDBViewSet): class RoomViewSet(ObjectDBViewSet):
@ -124,8 +121,7 @@ class RoomViewSet(ObjectDBViewSet):
""" """
queryset = DefaultRoom.objects.typeclass_search(DefaultRoom.path, include_children=True) queryset = DefaultRoom.objects.all_family()
list_serializer_class = serializers.ObjectListSerializer
class ExitViewSet(ObjectDBViewSet): class ExitViewSet(ObjectDBViewSet):
@ -135,8 +131,7 @@ class ExitViewSet(ObjectDBViewSet):
""" """
queryset = DefaultExit.objects.typeclass_search(DefaultExit.path, include_children=True) queryset = DefaultExit.objects.all_family()
list_serializer_class = serializers.ObjectListSerializer
class AccountDBViewSet(TypeclassViewSetMixin, ModelViewSet): class AccountDBViewSet(TypeclassViewSetMixin, ModelViewSet):