diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-03-31 15:44:37 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-03-31 15:44:37 +0100 |
| commit | 431aa8ada99bc50c14419d449691b13c920efa6c (patch) | |
| tree | cac7bbbc7f4771a50aba666131c78c6dae3e55f0 /synapse/state.py | |
| parent | Merge pull request #680 from matrix-org/markjh/remove_is_new_state (diff) | |
| parent | Remove outlier parameter from compute_event_context (diff) | |
| download | synapse-431aa8ada99bc50c14419d449691b13c920efa6c.tar.xz | |
Merge pull request #681 from matrix-org/markjh/remove_outlier
Remove outlier parameter from compute_event_context
Diffstat (limited to 'synapse/state.py')
| -rw-r--r-- | synapse/state.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/state.py b/synapse/state.py index 41d32e664a..4672ada1b3 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -100,7 +100,7 @@ class StateHandler(object): defer.returnValue(state) @defer.inlineCallbacks - def compute_event_context(self, event, old_state=None, outlier=False): + def compute_event_context(self, event, old_state=None): """ Fills out the context with the `current state` of the graph. The `current state` here is defined to be the state of the event graph just before the event - i.e. it never includes `event` @@ -115,7 +115,7 @@ class StateHandler(object): """ context = EventContext() - if outlier: + if event.internal_metadata.is_outlier(): # If this is an outlier, then we know it shouldn't have any current # state. Certainly store.get_current_state won't return any, and # persisting the event won't store the state group. |