forked from MirrorHub/synapse
Actually fix bug when uploading state with empty state_key
This commit is contained in:
parent
02db7eb209
commit
cabead6194
2 changed files with 3 additions and 2 deletions
|
@ -94,6 +94,7 @@ class EventBase(object):
|
||||||
event_id = _event_dict_property("event_id")
|
event_id = _event_dict_property("event_id")
|
||||||
hashes = _event_dict_property("hashes")
|
hashes = _event_dict_property("hashes")
|
||||||
origin = _event_dict_property("origin")
|
origin = _event_dict_property("origin")
|
||||||
|
origin_server_ts = _event_dict_property("origin_server_ts")
|
||||||
prev_events = _event_dict_property("prev_events")
|
prev_events = _event_dict_property("prev_events")
|
||||||
prev_state = _event_dict_property("prev_state")
|
prev_state = _event_dict_property("prev_state")
|
||||||
room_id = _event_dict_property("room_id")
|
room_id = _event_dict_property("room_id")
|
||||||
|
|
|
@ -117,10 +117,10 @@ class RoomStateEventRestServlet(RestServlet):
|
||||||
self.on_PUT_no_state_key)
|
self.on_PUT_no_state_key)
|
||||||
|
|
||||||
def on_GET_no_state_key(self, request, room_id, event_type):
|
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):
|
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
|
@defer.inlineCallbacks
|
||||||
def on_GET(self, request, room_id, event_type, state_key):
|
def on_GET(self, request, room_id, event_type, state_key):
|
||||||
|
|
Loading…
Reference in a new issue