MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-11-02 20:59:12 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #377 from matrix-org/paul/tiny-fixes

Browse source 
Don't complain if /make_join response lacks 'prev_state' list (SYN-517)
This commit is contained in:
Paul Evans 2015-11-13 17:43:30 +00:00
commit 1654d3b329
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
synapse/federation/federation_client.py
View file

@ -401,6 +401,12 @@ class FederationClient(FederationBase):
pdu_dict["content"].update(content) pdu_dict["content"].update(content)
# The protoevent received over the JSON wire may not have all
# the required fields. Lets just gloss over that because
# there's some we never care about
if "prev_state" not in pdu_dict:
pdu_dict["prev_state"] = []
defer.returnValue( defer.returnValue(
(destination, self.event_from_pdu_json(pdu_dict)) (destination, self.event_from_pdu_json(pdu_dict))
) )