diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-05-08 17:01:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-08 17:01:30 +0100 |
| commit | 1473058b5eb14b5128c0b6ee6e88e89602ad96c5 (patch) | |
| tree | ebfe72dca7d2beeb32ce9b5ba16ad200df023388 /synapse/events/snapshot.py | |
| parent | Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_invite (diff) | |
| download | synapse-1473058b5eb14b5128c0b6ee6e88e89602ad96c5.tar.xz | |
Do checks on aliases for incoming m.room.aliases events (#5128)
Follow-up to #5124 Also added a bunch of checks to make sure everything (both the stuff added on #5124 and this PR) works as intended.
Diffstat (limited to 'synapse/events/snapshot.py')
| -rw-r--r-- | synapse/events/snapshot.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py index 368b5f6ae4..fa09c132a0 100644 --- a/synapse/events/snapshot.py +++ b/synapse/events/snapshot.py @@ -187,7 +187,9 @@ class EventContext(object): Returns: Deferred[dict[(str, str), str]|None]: Returns None if state_group - is None, which happens when the associated event is an outlier. + is None, which happens when the associated event is an outlier. + Maps a (type, state_key) to the event ID of the state event matching + this tuple. """ if not self._fetching_state_deferred: @@ -205,7 +207,9 @@ class EventContext(object): Returns: Deferred[dict[(str, str), str]|None]: Returns None if state_group - is None, which happens when the associated event is an outlier. + is None, which happens when the associated event is an outlier. + Maps a (type, state_key) to the event ID of the state event matching + this tuple. """ if not self._fetching_state_deferred: |