[IMPROVE] Add support to queries in the im.members endpoint

app/api/server/v1/im.js

@@ -1,9 +1,10 @@
 import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
 
-import { Subscriptions, Uploads, Users, Messages, Rooms } from '../../../models';
-import { hasPermission } from '../../../authorization';
+import { Subscriptions, Uploads, Users, Messages, Rooms } from '../../../models/server';
+import { hasPermission } from '../../../authorization/server';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
-import { settings } from '../../../settings';
+import { settings } from '../../../settings/server';
 import { API } from '../api';
 import { getDirectMessageByNameOrIdWithOptionToJoin } from '../../../lib/server/functions/getDirectMessageByNameOrIdWithOptionToJoin';
 
@@ -202,22 +203,32 @@ API.v1.addRoute(['dm.members', 'im.members'], { authRequired: true }, {
 
 		const { offset, count } = this.getPaginationItems();
 		const { sort } = this.parseJsonQuery();
-		const cursor = Subscriptions.findByRoomId(findResult.room._id, {
-			sort: { 'u.username': sort && sort.username ? sort.username : 1 },
+
+		check(this.queryParams, Match.ObjectIncluding({
+			status: Match.Maybe([String]),
+			filter: Match.Maybe(String),
+		}));
+		const { status, filter } = this.queryParams;
+
+		const extraQuery = {
+			_id: { $in: findResult.room.uids },
+			...status && { status: { $in: status } },
+		};
+
+		const options = {
+			sort: { username: sort && sort.username ? sort.username : 1 },
+			fields: { _id: 1, username: 1, name: 1, status: 1, statusText: 1, utcOffset: 1 },
 			skip: offset,
 			limit: count,
-		});
+		};
 
-		const total = cursor.count();
-		const members = cursor.fetch().map((s) => s.u && s.u.username);
+		const cursor = Users.findByActiveUsersExcept(filter, [], options, null, [extraQuery]);
 
-		const users = Users.find({ username: { $in: members } }, {
-			fields: { _id: 1, username: 1, name: 1, status: 1, statusText: 1, utcOffset: 1 },
-			sort: { username: sort && sort.username ? sort.username : 1 },
-		}).fetch();
+		const members = cursor.fetch();
+		const total = cursor.count();
 
 		return API.v1.success({
-			members: users,
+			members,
 			count: members.length,
 			offset,
 			total,

tests/end-to-end/api/04-direct-message.js

@@ -441,5 +441,40 @@ describe('[Direct Messages]', function() {
 				})
 				.end(done);
 		});
+		it('should return and array with one member', (done) => {
+			request.get(api('im.members'))
+				.set(credentials)
+				.query({
+					username: 'rocket.cat',
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('count').and.to.be.equal(1);
+					expect(res.body).to.have.property('offset').and.to.be.equal(0);
+					expect(res.body).to.have.property('total').and.to.be.equal(2);
+					expect(res.body).to.have.property('members').and.to.have.lengthOf(1);
+				})
+				.end(done);
+		});
+		it('should return and array with one member queried by status', (done) => {
+			request.get(api('im.members'))
+				.set(credentials)
+				.query({
+					roomId: directMessage._id,
+					'status[]': ['online'],
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('count').and.to.be.equal(1);
+					expect(res.body).to.have.property('offset').and.to.be.equal(0);
+					expect(res.body).to.have.property('total').and.to.be.equal(2);
+					expect(res.body).to.have.property('members').and.to.have.lengthOf(1);
+				})
+				.end(done);
+		});
 	});
 });