Hide livechat users and rooms from the admin pages (#2820)

* New field 'type' for users

* Show only default room types on Admin > Rooms

* Rename migration 40 to 41

packages/rocketchat-lib/server/models/Users.coffee

@@ -8,6 +8,7 @@ RocketChat.models.Users = new class extends RocketChat.models._Base
 		@tryEnsureIndex { 'status': 1 }
 		@tryEnsureIndex { 'active': 1 }, { sparse: 1 }
 		@tryEnsureIndex { 'statusConnection': 1 }, { sparse: 1 }
+		@tryEnsureIndex { 'type': 1 }
 
 
 	# FIND ONE
@@ -111,6 +112,9 @@ RocketChat.models.Users = new class extends RocketChat.models._Base
 				{username: nameOrUsername}
 			]
 
+			type:
+				$in: ['user']
+
 		return @find query, options
 
 	findByUsernameNameOrEmailAddress: (usernameNameOrEmailAddress, options) ->
@@ -120,6 +124,8 @@ RocketChat.models.Users = new class extends RocketChat.models._Base
 				{username: usernameNameOrEmailAddress}
 				{'emails.address': usernameNameOrEmailAddress}
 			]
+			type:
+				$in: ['user', 'bot']
 
 		return @find query, options
 

packages/rocketchat-livechat/server/methods/registerGuest.js

@@ -38,7 +38,8 @@ Meteor.methods({
 		userData = {
 			username: user,
 			globalRoles: ['livechat-guest'],
-			department: department
+			department: department,
+			type: 'visitor'
 		};
 
 		userData.userAgent = this.connection.httpHeaders['user-agent'];

packages/rocketchat-ui-admin/admin/rooms/adminRooms.coffee

@@ -64,6 +64,10 @@ Template.adminRooms.onCreated ->
 	@autorun ->
 		filter = instance.filter.get()
 		types = instance.types.get()
+
+		if types.length is 0
+			types = ['c', 'd', 'p']
+
 		limit = instance.limit.get()
 		subscription = instance.subscribe 'adminRooms', filter, types, limit
 		instance.ready.set subscription.ready()

packages/rocketchat-ui-admin/admin/users/adminUsers.coffee

@@ -66,6 +66,9 @@ Template.adminUsers.onCreated ->
 		else
 			query = {}
 
+		query.type =
+			$in: ['user', 'bot']
+
 		return Meteor.users.find(query, { limit: instance.limit?.get(), sort: { username: 1, name: 1 } }).fetch()
 
 Template.adminUsers.onRendered ->

server/lib/accounts.coffee

@@ -79,6 +79,8 @@ Accounts.insertUserDoc = _.wrap Accounts.insertUserDoc, (insertUserDoc, options,
 
 	delete user.globalRoles
 
+	user.type ?= 'user'
+
 	_id = insertUserDoc.call(Accounts, options, user)
 
 	if roles.length is 0

server/publications/fullUserData.coffee

@@ -7,6 +7,7 @@ Meteor.publish 'fullUserData', (filter, limit) ->
 		username: 1
 		status: 1
 		utcOffset: 1
+		type: 1
 
 	if RocketChat.authz.hasPermission( @userId, 'view-full-other-user-info') is true
 		fields = _.extend fields,

server/startup/initialData.coffee

@@ -14,7 +14,7 @@ Meteor.startup ->
 				statusDefault: "online"
 				utcOffset: 0
 				active: true
-				bot: true
+				type: 'bot'
 
 			rs = RocketChatFile.bufferToStream new Buffer(Assets.getBinary('avatars/rocketcat.png'), 'utf8')
 			RocketChatFileAvatarInstance.deleteFile "rocket.cat.jpg"

server/startup/migrations/v41.js

@@ -0,0 +1,10 @@
+RocketChat.Migrations.add({
+	version: 41,
+	up: function() {
+		if (RocketChat && RocketChat.models && RocketChat.models.Users) {
+			RocketChat.models.Users.update({ bot: true }, { $set: { type: 'bot' } }, { multi: true });
+			RocketChat.models.Users.update({ 'profile.guest': true }, { $set: { type: 'visitor' } }, { multi: true });
+			RocketChat.models.Users.update({ type: { $exists: false } }, { $set: { type: 'user' } }, { multi: true });
+		}
+	}
+});