Set combinations is | and not +

This commit is contained in:
Erik Johnston 2015-02-03 13:35:17 +00:00
parent fed29251d7
commit 77a076bd25

View file

@ -114,9 +114,9 @@ class FederationHandler(BaseHandler):
event_ids = set() event_ids = set()
if state: if state:
event_ids += {e.event_id for e in state} event_ids |= {e.event_id for e in state}
if auth_chain: if auth_chain:
event_ids += {e.event_id for e in auth_chain} event_ids |= {e.event_id for e in auth_chain}
seen_ids = (yield self.store.have_events(event_ids)).keys() seen_ids = (yield self.store.have_events(event_ids)).keys()