Merge pull request #4389 from RocketChat/livechat-fixes-0-40

Livechat fixes for 0.40
RocketChat · Sep 21, 2016 · ed587f8 · ed587f8
2 parents 73ad7c7 + c12b58d
commit ed587f8
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 17 deletions.
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js
@@ -1,3 +1,5 @@
+import UAParser from 'ua-parser-js';
+
 Template.visitorInfo.helpers({
 	user() {
 		const user = Template.instance().user.get();

diff --git a/packages/rocketchat-livechat/lib/ua-parser.js b/packages/rocketchat-livechat/lib/ua-parser.js
diff --git a/packages/rocketchat-livechat/package.js b/packages/rocketchat-livechat/package.js
@@ -15,6 +15,10 @@ Package.registerBuildPlugin({
 	}
 });
 
+Npm.depends({
+	'ua-parser-js': '0.7.10'
+});
+
 Package.onUse(function(api) {
 	api.use(['webapp', 'autoupdate'], 'server');
 	api.use('ecmascript');
@@ -43,9 +47,6 @@ Package.onUse(function(api) {
 	api.addFiles('client/ui.js', 'client');
 	api.addFiles('client/route.js', 'client');
 
-	// generic libs
-	api.addFiles('lib/ua-parser.js');
-
 	// add stylesheets to theme compiler
 	api.addAssets('client/stylesheets/livechat.less', 'server');
 	api.addFiles('client/stylesheets/load.js', 'server');

diff --git a/packages/rocketchat-livechat/server/lib/Livechat.js b/packages/rocketchat-livechat/server/lib/Livechat.js
@@ -1,4 +1,6 @@
 /* globals HTTP */
+import UAParser from 'ua-parser-js';
+
 RocketChat.Livechat = {
 	historyMonitorType: 'url',
 

diff --git a/packages/rocketchat-livechat/server/models/LivechatDepartmentAgents.js b/packages/rocketchat-livechat/server/models/LivechatDepartmentAgents.js
@@ -63,8 +63,8 @@ class LivechatDepartmentAgents extends RocketChat.models._Base {
 		var agent = findAndModify(query, sort, update);
 		if (agent) {
 			return {
-				agentId: agent.agentId,
-				username: agent.username
+				agentId: agent.value.agentId,
+				username: agent.value.username
 			};
 		} else {
 			return null;

diff --git a/packages/rocketchat-livechat/server/models/Rooms.js b/packages/rocketchat-livechat/server/models/Rooms.js
@@ -74,7 +74,7 @@ RocketChat.models.Rooms.getNextLivechatRoomCode = function() {
 
 	const livechatCount = findAndModify(query, null, update);
 
-	return livechatCount.value;
+	return livechatCount.value.value;
 };
 
 RocketChat.models.Rooms.findOpenByVisitorToken = function(visitorToken, options) {

diff --git a/packages/rocketchat-livechat/server/models/Users.js b/packages/rocketchat-livechat/server/models/Users.js
@@ -85,8 +85,8 @@ RocketChat.models.Users.getNextAgent = function() {
 	var user = findAndModify(query, sort, update);
 	if (user) {
 		return {
-			agentId: user._id,
-			username: user.username
+			agentId: user.value._id,
+			username: user.value.username
 		};
 	} else {
 		return null;
@@ -203,5 +203,5 @@ RocketChat.models.Users.getNextVisitorUsername = function() {
 
 	const livechatCount = findAndModify(query, null, update);
 
-	return 'guest-' + (livechatCount.value + 1);
+	return 'guest-' + (livechatCount.value.value + 1);
 };