Fixes

Signed-off-by: Eugene Bolshakov <pub@relvarsoft.com>
xbolshe · Feb 11, 2018 · ee40cbc · ee40cbc
1 parent 032071b
commit ee40cbc
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 23 deletions.
diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js
@@ -145,7 +145,7 @@ RocketChat.API.v1.addRoute('channels.counters', { authRequired: true }, {
 		let msgs = null;
 		let latest = null;
 		let members = null;
-		
+
 		if (ruserId) {
 			if (!access) {
 				return RocketChat.API.v1.unauthorized();
@@ -172,13 +172,13 @@ RocketChat.API.v1.addRoute('channels.counters', { authRequired: true }, {
 		}
 
 		return RocketChat.API.v1.success({
-			joined: joined,
-			members: members,
-			unreads: unreads,
-			unreadsFrom: unreadsFrom,
-			msgs: msgs,
-			latest: latest,
-			userMentions: userMentions
+			joined,
+			members,
+			unreads,
+			unreadsFrom,
+			msgs,
+			latest,
+			userMentions
 		});
 	}
 });

diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js
@@ -117,6 +117,9 @@ RocketChat.API.v1.addRoute('groups.counters', { authRequired: true }, {
 		let userMentions = null;
 		let unreadsFrom = null;
 		let joined = false;
+		let msgs = null;
+		let latest = null;
+		let members = null;
 
 		if ((!params.roomId || !params.roomId.trim()) && (!params.roomName || !params.roomName.trim())) {
 			throw new Meteor.Error('error-room-param-not-provided', 'The parameter "roomId" or "roomName" is required');
@@ -150,21 +153,21 @@ RocketChat.API.v1.addRoute('groups.counters', { authRequired: true }, {
 			unreadsFrom = group.ls;
 			joined = true;
 		}
-		
+
 		if (access || joined) {
 			msgs = room.msgs;
 			latest = room.lm;
 			members = room.usernames.length;
 		}
 
 		return RocketChat.API.v1.success({
-			joined: joined,
-			members: members,
-			unreads: unreads,
-			unreadsFrom: unreadsFrom,
-			msgs: msgs,
-			latest: latest,
-			userMentions: userMentions
+			joined,
+			members,
+			unreads,
+			unreadsFrom,
+			msgs,
+			latest,
+			userMentions
 		});
 	}
 });

diff --git a/packages/rocketchat-api/server/v1/im.js b/packages/rocketchat-api/server/v1/im.js
@@ -86,13 +86,13 @@ RocketChat.API.v1.addRoute(['dm.counters', 'im.counters'], { authRequired: true
 		}
 
 		return RocketChat.API.v1.success({
-			joined: joined,
-			members: members,
-			unreads: unreads,
-			unreadsFrom: unreadsFrom,
-			msgs: msgs,
-			latest: latest,
-			userMentions: userMentions
+			joined,
+			members,
+			unreads,
+			unreadsFrom,
+			msgs,
+			latest,
+			userMentions
 		});
 	}
 });