[IMPROVE] Add groups to the directory channels list

app/models/server/models/Rooms.js

@@ -552,16 +552,17 @@ export class Rooms extends Base {
 		return this._db.find(query, options);
 	}
 
-	findByNameOrFNameAndTypeIncludingTeamRooms(name, type, teamIds, options) {
+	findByNameOrFNameAndRoomIdsIncludingTeamRooms(name, teamIds, roomIds, options) {
 		const query = {
-			t: type,
 			teamMain: {
 				$exists: false,
 			},
 			$and: [
 				{
 					$or: [
+						roomIds ? { _id: { $in: roomIds }, t: 'p' } : false,
 						{
+							t: 'c',
 							teamId: {
 								$exists: false,
 							},

server/methods/browseChannels.js

@@ -44,15 +44,16 @@ const sortUsers = function(field, direction) {
 	}
 };
 
-const getChannels = (user, canViewAnon, searchTerm, sort, pagination) => {
+const getChannelsAndGroups = (user, canViewAnon, searchTerm, sort, pagination) => {
 	if ((!user && !canViewAnon) || (user && !hasPermission(user._id, 'view-c-room'))) {
 		return;
 	}
 
 	const teams = Promise.await(Team.getAllPublicTeams());
 	const teamIds = teams.map(({ _id }) => _id);
+	const userRooms = user.__rooms;
 
-	const result = Rooms.findByNameOrFNameAndTypeIncludingTeamRooms(searchTerm, 'c', teamIds, {
+	const result = Rooms.findByNameOrFNameAndRoomIdsIncludingTeamRooms(searchTerm, teamIds, userRooms, {
 		...pagination,
 		sort: {
 			featured: -1,
@@ -227,7 +228,7 @@ Meteor.methods({
 
 		switch (type) {
 			case 'channels':
-				return getChannels(user, canViewAnonymous, regex, sortChannels(sortBy, sortDirection), pagination);
+				return getChannelsAndGroups(user, canViewAnonymous, regex, sortChannels(sortBy, sortDirection), pagination);
 			case 'teams':
 				return getTeams(user, text, sortChannels(sortBy, sortDirection), pagination);
 			case 'users':