diff options
author | Erik Johnston <erik@matrix.org> | 2016-10-27 11:02:30 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-10-27 11:02:30 +0100 |
commit | 45bdacd9a75c7e32b0b8708ae58fb9e661376bfd (patch) | |
tree | 0118fd2870598a004d7439f67e21c8651f425643 /synapse/handlers/typing.py | |
parent | Fixup change log (diff) | |
parent | Merge pull request #1098 from matrix-org/markjh/bearer_token (diff) | |
download | synapse-45bdacd9a75c7e32b0b8708ae58fb9e661376bfd.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2
Diffstat (limited to 'synapse/handlers/typing.py')
-rw-r--r-- | synapse/handlers/typing.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py index 08313417b2..27ee715ff0 100644 --- a/synapse/handlers/typing.py +++ b/synapse/handlers/typing.py @@ -88,7 +88,7 @@ class TypingHandler(object): continue until = self._member_typing_until.get(member, None) - if not until or until < now: + if not until or until <= now: logger.info("Timing out typing for: %s", member.user_id) preserve_fn(self._stopped_typing)(member) continue @@ -97,12 +97,20 @@ class TypingHandler(object): # user. if self.hs.is_mine_id(member.user_id): last_fed_poke = self._member_last_federation_poke.get(member, None) - if not last_fed_poke or last_fed_poke + FEDERATION_PING_INTERVAL < now: + if not last_fed_poke or last_fed_poke + FEDERATION_PING_INTERVAL <= now: preserve_fn(self._push_remote)( member=member, typing=True ) + # Add a paranoia timer to ensure that we always have a timer for + # each person typing. + self.wheel_timer.insert( + now=now, + obj=member, + then=now + 60 * 1000, + ) + def is_typing(self, member): return member.user_id in self._room_typing.get(member.room_id, []) |