diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-05-12 13:11:54 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-05-12 13:11:54 +0100 |
| commit | 78672a9fd5cc24ef45b45d8418e2e39956882ca1 (patch) | |
| tree | d4c52bee7817c03c07ed9661d4d699d04c4929e0 /synapse/notifier.py | |
| parent | Add a NotifierUserStream to hold all the notification listeners for a user (diff) | |
| parent | Update the end_token correctly, otherwise the token doesn't advance and the c... (diff) | |
| download | synapse-78672a9fd5cc24ef45b45d8418e2e39956882ca1.tar.xz | |
Merge branch 'notifier_unify' into notifier_performance
Diffstat (limited to 'synapse/notifier.py')
| -rw-r--r-- | synapse/notifier.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py index 0b50898f3f..7b9bae1056 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -316,7 +316,7 @@ class Notifier(object): user, getattr(from_token, keyname), limit, ) events.extend(stuff) - end_token = from_token.copy_and_replace(keyname, new_key) + end_token = end_token.copy_and_replace(keyname, new_key) if events: defer.returnValue((events, (from_token, end_token))) |