Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename

10 years ago · 52b64617f9
parent 47c3a089c5 fea7b60cf3
commit 52b64617f9
1 changed files with 1 additions and 1 deletions
--- a/synapse/api/events/init.py
+++ b/synapse/api/events/init.py
@ -41,11 +41,11 @@ class SynapseEvent(JsonEncodedObject):
        "room_id",
        "user_id",  # sender/initiator
        "content",  # HTTP body, JSON
+        "state_key",
    ]

    internal_keys = [
        "is_state",
-        "state_key",
        "prev_events",
        "prev_state",
        "depth",