diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-10 14:49:52 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-10 14:49:52 +0000 |
| commit | cabead6194c2946c2d05d6662c7ffe237d60291d (patch) | |
| tree | d5cb38ed367389980a548645e360d862ad36ba7d | |
| parent | Fix bug when uploading state with empty state_key (diff) | |
| download | synapse-cabead6194c2946c2d05d6662c7ffe237d60291d.tar.xz | |
Actually fix bug when uploading state with empty state_key
| -rw-r--r-- | synapse/events/__init__.py | 1 | ||||
| -rw-r--r-- | synapse/rest/room.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index bd3ffb59cc..7103b937af 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -94,6 +94,7 @@ class EventBase(object): event_id = _event_dict_property("event_id") hashes = _event_dict_property("hashes") origin = _event_dict_property("origin") + origin_server_ts = _event_dict_property("origin_server_ts") prev_events = _event_dict_property("prev_events") prev_state = _event_dict_property("prev_state") room_id = _event_dict_property("room_id") diff --git a/synapse/rest/room.py b/synapse/rest/room.py index 22e1244e57..c526e9bc72 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -117,10 +117,10 @@ class RoomStateEventRestServlet(RestServlet): self.on_PUT_no_state_key) def on_GET_no_state_key(self, request, room_id, event_type): - return self.on_GET(request, room_id, event_type, None) + return self.on_GET(request, room_id, event_type, "") def on_PUT_no_state_key(self, request, room_id, event_type): - return self.on_PUT(request, room_id, event_type, None) + return self.on_PUT(request, room_id, event_type, "") @defer.inlineCallbacks def on_GET(self, request, room_id, event_type, state_key): |