diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-04-26 12:38:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-26 12:38:14 +0100 |
| commit | 63b75cf7d70db28924f29bce55b55f567d8053f2 (patch) | |
| tree | 1c52064312301e9f6262089e3110f948694e49db /synapse/handlers | |
| parent | Merge remote-tracking branch 'origin/master' into develop (diff) | |
| parent | Fix infinite loop in presence handler (diff) | |
| download | synapse-63b75cf7d70db28924f29bce55b55f567d8053f2.tar.xz | |
Merge pull request #5103 from matrix-org/rav/fix_notif_loop
Fix infinite loop in presence handler
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/presence.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index bd1285b15c..59d53f1050 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -828,6 +828,11 @@ class PresenceHandler(object): if typ != EventTypes.Member: continue + if event_id is None: + # state has been deleted, so this is not a join. We only care about + # joins. + continue + event = yield self.store.get_event(event_id) if event.content.get("membership") != Membership.JOIN: # We only care about joins |