RocketChat · sampaiodiego · Nov 6, 2018 · Nov 6, 2018 · Nov 7, 2018 · Nov 7, 2018
diff --git a/client/notifications/UsersNameChanged.js b/client/notifications/UsersNameChanged.js
@@ -6,6 +6,7 @@ Meteor.startup(function() {
 			'u._id': _id,
 		}, {
 			$set: {
+				'u.username': username,
 				'u.name': name,
 			},
 		}, {
@@ -18,6 +19,7 @@ Meteor.startup(function() {
 			},
 		}, {
 			$set: {
+				'mentions.$.username': username,
 				'mentions.$.name': name,
 			},
 		}, {

diff --git a/client/routes/router.js b/client/routes/router.js
@@ -18,7 +18,6 @@ FlowRouter.subscriptions = function() {
 	Tracker.autorun(() => {
 		if (Meteor.userId()) {
 			this.register('userData', Meteor.subscribe('userData'));
-			this.register('activeUsers', Meteor.subscribe('activeUsers'));
 		}
 	});
 };

diff --git a/client/startup/startup.js b/client/startup/startup.js
@@ -29,7 +29,6 @@ Meteor.startup(function() {
 			return;
 		}
 		Meteor.subscribe('userData');
-		Meteor.subscribe('activeUsers');
 		computation.stop();
 	});
 

diff --git a/imports/startup/client/index.js b/imports/startup/client/index.js
@@ -1,2 +1,3 @@
 import '../../message-read-receipt/client';
 import '../../personal-access-tokens/client';
+import './listenActiveUsers';
diff --git a/imports/startup/client/listenActiveUsers.js b/imports/startup/client/listenActiveUsers.js
@@ -0,0 +1,62 @@
+import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
+import _ from 'underscore';
+
+const saveUser = (user, force = false) => {
+	// do not update my own user, my user's status will come from a subscription
+	if (user._id === Meteor.userId()) {
+		return;
+	}
+	if (force) {
+		return Meteor.users._collection.upsert({ _id: user._id }, {
+			$set: {
+				username: user.username,
+				name: user.name,
+				utcOffset: user.utcOffset,
+				status: user.status,
+			},
+		});
+	}
+
+	const found = Meteor.users.findOne(user._id, { fields: { _id: 1 } });
+	if (found) {
+		return;
+	}
+
+	Meteor.users._collection.insert(user);
+};
+
+let retry = 0;
+const getActiveUsers = _.debounce(() => {
+	RocketChat.API.v1.get('users.active')
+		.then((result) => {
+			result.users.forEach((user) => {
+				saveUser(user);
+			});
+		})
+		.catch(() => setTimeout(getActiveUsers, retry++ * 2000));
+}, 1000);
+
+Tracker.autorun(() => {
+	if (!Meteor.userId() || !Meteor.status().connected) {
+		return;
+	}
+	getActiveUsers();
+});
+
+Meteor.startup(function() {
+	RocketChat.Notifications.onLogged('user-status', (user) => {
+		saveUser(user, true);
+	});
+
+	RocketChat.Notifications.onLogged('Users:NameChanged', ({ _id, username }) => {
+		if (!username) {
+			return;
+		}
+		Meteor.users._collection.upsert({ _id }, {
+			$set: {
+				username,
+			},
+		});
+	});
+});
diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js
@@ -1,2 +1,3 @@
 import '../../message-read-receipt/server';
 import '../../personal-access-tokens/server';
+import '../../users-presence/server';
diff --git a/imports/users-presence/server/activeUsers.js b/imports/users-presence/server/activeUsers.js
@@ -0,0 +1,20 @@
+import { UserPresenceEvents } from 'meteor/konecty:user-presence';
+
+UserPresenceEvents.on('setUserStatus', (user, status/* , statusConnection*/) => {
+	const {
+		_id,
+		username,
+		name,
+		utcOffset,
+	} = user;
+
+	// since this callback can be called by only one instance in the cluster
+	// we need to brodcast the change to all instances
+	RocketChat.Notifications.notifyLogged('user-status', {
+		_id,
+		username,
+		name,
+		status,
+		utcOffset,
+	});
+});
diff --git a/imports/users-presence/server/index.js b/imports/users-presence/server/index.js
@@ -0,0 +1 @@
+import './activeUsers';
diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js
@@ -529,3 +529,18 @@ RocketChat.API.v1.addRoute('users.removePersonalAccessToken', { authRequired: tr
 		return RocketChat.API.v1.success();
 	},
 });
+
+RocketChat.API.v1.addRoute('users.active', { authRequired: true }, {
+	get() {
+		return RocketChat.API.v1.success({
+			users: RocketChat.models.Users.findUsersNotOffline({
+				fields: {
+					username: 1,
+					name: 1,
+					status: 1,
+					utcOffset: 1,
+				},
+			}).fetch(),
+		});
+	},
+});
diff --git a/packages/rocketchat-lib/client/models/FullUser.js b/packages/rocketchat-lib/client/models/FullUser.js
@@ -0,0 +1,7 @@
+
+RocketChat.models.FullUser = new class extends RocketChat.models._Base {
+	constructor() {
+		super();
+		this._initModel('full_user');
+	}
+};
diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js
@@ -239,6 +239,7 @@ Package.onUse(function(api) {
 	// CLIENT MODELS
 	api.addFiles('client/models/_Base.js', 'client');
 	api.addFiles('client/models/Avatars.js', 'client');
+	api.addFiles('client/models/FullUser.js', 'client');
 	api.addFiles('client/models/Uploads.js', 'client');
 
 	// CLIENT VIEWS

diff --git a/packages/rocketchat-lib/server/functions/setUsername.js b/packages/rocketchat-lib/server/functions/setUsername.js
@@ -77,6 +77,13 @@ RocketChat._setUsername = function(userId, u) {
 			fileStore.model.updateFileNameById(file._id, username);
 		}
 	}
+
+	RocketChat.Notifications.notifyLogged('Users:NameChanged', {
+		_id: user._id,
+		name: user.name,
+		username: user.username,
+	});
+
 	return user;
 };
 

diff --git a/packages/rocketchat-lib/server/models/Users.js b/packages/rocketchat-lib/server/models/Users.js
@@ -614,6 +614,17 @@ class ModelUsers extends RocketChat.models._Base {
 		return this.update({ _id }, update);
 	}
 
+	updateDefaultStatus(_id, statusDefault) {
+		return this.update({
+			_id,
+			statusDefault: { $ne: statusDefault },
+		}, {
+			$set: {
+				statusDefault,
+			},
+		});
+	}
+
 	// INSERT
 	create(data) {
 		const user = {

diff --git a/packages/rocketchat-ui-admin/client/users/adminUsers.js b/packages/rocketchat-ui-admin/client/users/adminUsers.js
@@ -1,4 +1,3 @@
-import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
@@ -99,7 +98,7 @@ Template.adminUsers.onCreated(function() {
 		};
 
 		const limit = instance.limit && instance.limit.get();
-		return Meteor.users.find(query, { limit, sort: { username: 1, name: 1 } }).fetch();
+		return RocketChat.models.FullUser.find(query, { limit, sort: { username: 1, name: 1 } }).fetch();
 	};
 });
 
@@ -124,7 +123,7 @@ Template.adminUsers.events({
 	},
 	'click .user-info'(e, instance) {
 		e.preventDefault();
-		instance.tabBarData.set(Meteor.users.findOne(this._id));
+		instance.tabBarData.set(RocketChat.models.FullUser.findOne(this._id));
 		instance.tabBar.open('admin-user-info');
 	},
 	'click .info-tabs button'(e) {

diff --git a/packages/rocketchat-ui-flextab/client/tabs/userInfo.js b/packages/rocketchat-ui-flextab/client/tabs/userInfo.js
@@ -283,7 +283,7 @@ Template.userInfo.onCreated(function() {
 		} else if (data && data._id != null) {
 			filter = { _id: data._id };
 		}
-		const user = Meteor.users.findOne(filter);
+		const user = RocketChat.models.FullUser.findOne(filter);
 
 		return this.user.set(user);
 	});

diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js
@@ -153,7 +153,7 @@ Template.main.helpers({
 		return iframeEnabled && RocketChat.iframeLogin.reactiveIframeUrl.get();
 	},
 	subsReady() {
-		const routerReady = FlowRouter.subsReady('userData', 'activeUsers');
+		const routerReady = FlowRouter.subsReady('userData');
 		const subscriptionsReady = CachedChatSubscription.ready.get();
 		const settingsReady = RocketChat.settings.cachedCollection.ready.get();
 		const ready = (Meteor.userId() == null) || (routerReady && subscriptionsReady && settingsReady);

diff --git a/server/publications/fullUserData.js b/server/publications/fullUserData.js
@@ -5,15 +5,24 @@ Meteor.publish('fullUserData', function(filter, limit) {
 		return this.ready();
 	}
 
-	const result = RocketChat.getFullUserData({
+	const handle = RocketChat.getFullUserData({
 		userId: this.userId,
 		filter,
 		limit,
-	});
+	}).observeChanges({
+		added: (id, fields) => {
+			this.added('rocketchat_full_user', id, fields);
+		},
 
-	if (!result) {
-		return this.ready();
-	}
+		changed: (id, fields) => {
+			this.changed('rocketchat_full_user', id, fields);
+		},
+
+		removed: (id) => {
+			this.removed('rocketchat_full_user', id);
+		},
+	});
 
-	return result;
+	this.ready();
+	this.onStop(() => handle.stop());
 });
diff --git a/server/stream/messages.js b/server/stream/messages.js
@@ -104,7 +104,10 @@ Meteor.startup(function() {
 		}
 	}
 
-	return RocketChat.models.Messages.on('change', function({ clientAction, id, data/* , oplog*/ }) {
+	return RocketChat.models.Messages.on('change', function({ clientAction, id, data, diff/* , oplog*/ }) {
+		if (diff && (diff['u.username'] || diff['editedBy.username'] || Object.keys(diff).some(function(k) { return ~k.indexOf('mentions.'); }))) {
+			return;
+		}
 		switch (clientAction) {
 			case 'inserted':
 			case 'updated':

diff --git a/server/stream/streamBroadcast.js b/server/stream/streamBroadcast.js
@@ -1,4 +1,4 @@
-/* global InstanceStatus, DDP, LoggerManager */
+/* global InstanceStatus, DDP, LoggerManager, UserPresence */
 
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
@@ -8,6 +8,9 @@ import { DDPCommon } from 'meteor/ddp-common';
 process.env.PORT = String(process.env.PORT).trim();
 process.env.INSTANCE_IP = String(process.env.INSTANCE_IP).trim();
 
+const startMonitor = typeof process.env.DISABLE_PRESENCE_MONITOR === 'undefined' ||
+	!['true', 'yes'].includes(String(process.env.DISABLE_PRESENCE_MONITOR).toLowerCase());
+
 const connections = {};
 this.connections = connections;
 
@@ -46,7 +49,12 @@ function authorizeConnection(instance) {
 	return _authorizeConnection(instance);
 }
 
+const originalSetDefaultStatus = UserPresence.setDefaultStatus;
 function startMatrixBroadcast() {
+	if (!startMonitor) {
+		UserPresence.setDefaultStatus = originalSetDefaultStatus;
+	}
+
 	const query = {
 		'extraInformation.port': {
 			$exists: true,
@@ -162,6 +170,12 @@ function startStreamCastBroadcast(value) {
 
 	logger.connection.info('connecting in', instance, value);
 
+	if (!startMonitor) {
+		UserPresence.setDefaultStatus = (id, status) => {
+			RocketChat.models.Users.updateDefaultStatus(id, status);
+		};
+	}
+
 	const connection = DDP.connect(value, {
 		_dontPrintErrors: LoggerManager.logLevel < 2,
 	});
@@ -188,11 +202,17 @@ function startStreamCastBroadcast(value) {
 			return 'not-authorized';
 		}
 
-		if (!Meteor.StreamerCentral.instances[streamName]) {
+		const instance = Meteor.StreamerCentral.instances[streamName];
+		if (!instance) {
 			return 'stream-not-exists';
 		}
 
-		return Meteor.StreamerCentral.instances[streamName]._emit(eventName, args);
+		if (instance.serverOnly) {
+			const scope = {};
+			return instance.emitWithScope(eventName, scope, args);
+		} else {
+			return instance.emitWithoutBroadcast(eventName, args);
+		}
 	});
 
 	return connection.subscribe('stream');

diff --git a/tests/end-to-end/api/01-users.js b/tests/end-to-end/api/01-users.js
@@ -286,6 +286,39 @@ describe('[Users]', function() {
 		});
 	});
 
+	describe('[/users.active]', () => {
+		describe('Not logged in:', () => {
+			it('should return 401 unauthorized', (done) => {
+				request.get(api('users.active'))
+					.expect('Content-Type', 'application/json')
+					.expect(401)
+					.expect((res) => {
+						expect(res.body).to.have.property('message');
+					})
+					.end(done);
+			});
+		});
+		describe('Logged in:', () => {
+			it('should return online users list', (done) => {
+				request.get(api('users.active'))
+					.set(credentials)
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.property('users').to.have.property('0').to.deep.have.all.keys(
+							'_id',
+							'username',
+							'name',
+							'status',
+							'utcOffset',
+						);
+					})
+					.end(done);
+			});
+		});
+	});
+
 	describe('[/users.list]', () => {
 		it('should query all users in the system', (done) => {
 			request.get(api('users.list'))
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,6 @@ Meteor.startup(function() { @@
     			return;
     		}
     		Meteor.subscribe('userData');
-    		Meteor.subscribe('activeUsers');
     		computation.stop();
     	});
@@ Expand Down @@