diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-07-24 13:16:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-24 13:16:18 +0100 |
| commit | f30a71a67b6605cb0f09975af3befc61090326bd (patch) | |
| tree | 7ba88e6fbd4da96a38c16cd92e09547b6e36d3eb /synapse/handlers/message.py | |
| parent | Add a prometheus metric for active cache lookups. (#5750) (diff) | |
| download | synapse-f30a71a67b6605cb0f09975af3befc61090326bd.tar.xz | |
Stop trying to fetch events with event_id=None. (#5753)
`None` is not a valid event id, so queuing up a database fetch for it seems like a silly thing to do. I considered making `get_event` return `None` if `event_id is None`, but then its interaction with `allow_none` seemed uninituitive, and strong typing ftw.
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 8b27e23378..e951c39fa7 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -378,7 +378,11 @@ class EventCreationHandler(object): # tolerate them in event_auth.check(). prev_state_ids = yield context.get_prev_state_ids(self.store) prev_event_id = prev_state_ids.get((EventTypes.Member, event.sender)) - prev_event = yield self.store.get_event(prev_event_id, allow_none=True) + prev_event = ( + yield self.store.get_event(prev_event_id, allow_none=True) + if prev_event_id + else None + ) if not prev_event or prev_event.membership != Membership.JOIN: logger.warning( ( @@ -521,6 +525,8 @@ class EventCreationHandler(object): """ prev_state_ids = yield context.get_prev_state_ids(self.store) prev_event_id = prev_state_ids.get((event.type, event.state_key)) + if not prev_event_id: + return prev_event = yield self.store.get_event(prev_event_id, allow_none=True) if not prev_event: return |