diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-24 10:59:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 10:59:55 +0100 |
| commit | 3e86dcf1c036fee732c5dc6bb05352ed9166c606 (patch) | |
| tree | 50909a17ae7cc6b26f3b70d2286aa43d9418bbf9 | |
| parent | Merge pull request #1039 from matrix-org/kegan/join-with-custom-content (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/pagination (diff) | |
| download | synapse-3e86dcf1c036fee732c5dc6bb05352ed9166c606.tar.xz | |
Merge pull request #1040 from matrix-org/erikj/pagination
Add None checks to backfill
| -rw-r--r-- | synapse/handlers/federation.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 328f8f4842..fdc6cbfa00 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -373,9 +373,9 @@ class FederationHandler(BaseHandler): ], consumeErrors=True ).addErrback(unwrapFirstError) - auth_events.update({a.event_id: a for a in results}) + auth_events.update({a.event_id: a for a in results if a}) required_auth.update( - a_id for event in results for a_id, _ in event.auth_events + a_id for event in results for a_id, _ in event.auth_events if event ) missing_auth = required_auth - set(auth_events) |