OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1789 from matrix-org/dbkr/presence_only_on_user_activity 

Don't reset the presence timer on every dispatch
pull/21833/head
Matthew Hodgson 2018-03-06 20:18:00 +00:00 committed by GitHub
parent d167dbcf86 a97e7375d5
commit 7a77da7a4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Presence.js
View File

@ -1,5 +1,6 @@
/* /*
Copyright 2015, 2016 OpenMarket Ltd Copyright 2015, 2016 OpenMarket Ltd
Copyright 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -31,7 +32,7 @@ class Presence {
this.running = true; this.running = true;
if (undefined === this.state) { if (undefined === this.state) {
this._resetTimer(); this._resetTimer();
this.dispatcherRef = dis.register(this._onUserActivity.bind(this)); this.dispatcherRef = dis.register(this._onAction.bind(this));
} }
} }
@ -125,9 +126,10 @@ class Presence {
this.setState("unavailable"); this.setState("unavailable");
} }
_onUserActivity(payload) { _onAction(payload) {
if (payload.action === "sync_state" || payload.action === "self_presence_updated") return; if (payload.action === "user_activity") {
this._resetTimer(); this._resetTimer();
}
} }
/** /**