Add more events to User

There was no way of observing changes to fields like currentlyActive, so add this and add one for lastPresenceTs that will be fired whenever we get a presence event.

lib/models/user.js

@@ -87,8 +87,15 @@ User.prototype.setPresenceEvent = function(event) {
     {
         eventsToFire.push("User.displayName");
     }
+    if (event.getContent().currently_active &&
+        event.getContent().currently_active !== this.currentlyActive)
+    {
+        eventsToFire.push("User.currentlyActive");
+    }
 
     this.presence = event.getContent().presence;
+    eventsToFire.push("User.lastPresenceTs");
+
     if (event.getContent().displayname) {
         this.displayName = event.getContent().displayname;
     }
@@ -99,9 +106,7 @@ User.prototype.setPresenceEvent = function(event) {
     this.lastPresenceTs = Date.now();
     this.currentlyActive = event.getContent().currently_active;
 
-    if (eventsToFire.length > 0) {
+    this._updateModifiedTime();
-        this._updateModifiedTime();
-    }
 
     for (var i = 0; i < eventsToFire.length; i++) {
         this.emit(eventsToFire[i], event, this);
@@ -165,6 +170,18 @@ User.prototype.getLastActiveTs = function() {
  */
 module.exports = User;
 
+/**
+ * Fires whenever any user's lastPresenceTs changes,
+ * ie. whenever any presence event is received for a user.
+ * @event module:client~MatrixClient#"User.lastPresenceTs"
+ * @param {MatrixEvent} event The matrix event which caused this event to fire.
+ * @param {User} user The user whose User.lastPresenceTs changed.
+ * @example
+ * matrixClient.on("User.lastPresenceTs", function(event, user){
+ *   var newlastPresenceTs = user.lastPresenceTs;
+ * });
+ */
+
 /**
  * Fires whenever any user's presence changes.
  * @event module:client~MatrixClient#"User.presence"
@@ -176,6 +193,17 @@ module.exports = User;
  * });
  */
 
+/**
+ * Fires whenever any user's currentlyActive changes.
+ * @event module:client~MatrixClient#"User.currentlyActive"
+ * @param {MatrixEvent} event The matrix event which caused this event to fire.
+ * @param {User} user The user whose User.currentlyActive changed.
+ * @example
+ * matrixClient.on("User.currentlyActive", function(event, user){
+ *   var newCurrentlyActive = user.currentlyActive;
+ * });
+ */
+
 /**
  * Fires whenever any user's display name changes.
  * @event module:client~MatrixClient#"User.displayName"

lib/sync.js

@@ -1040,7 +1040,10 @@ SyncApi.prototype._onOnline = function() {
 
 function createNewUser(client, userId) {
     var user = new User(userId);
-    reEmit(client, user, ["User.avatarUrl", "User.displayName", "User.presence"]);
+    reEmit(client, user, [
+        "User.avatarUrl", "User.displayName", "User.presence",
+        "User.currentlyActive", "User.lastPresenceTs"
+    ]);
     return user;
 }