remove comments

RocketChat · May 18, 2021 · 5d8c3f2 · 5d8c3f2
1 parent e90ce2b
commit 5d8c3f2
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 17 deletions.
diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js
@@ -626,7 +626,6 @@ API.v1.addRoute('users.setPreferences', { authRequired: true }, {
 				sidebarViewMode: Match.Optional(String),
 				sidebarDisplayAvatar: Match.Optional(Boolean),
 				sidebarGroupByType: Match.Optional(Boolean),
-				// sidebarShowDiscussion: Match.Optional(Boolean),
 				muteFocusedConversations: Match.Optional(Boolean),
 			}),
 		});

diff --git a/app/discussion/server/config.js b/app/discussion/server/config.js
@@ -14,14 +14,6 @@ Meteor.startup(() => {
 		});
 	});
 
-	// settings.add('Accounts_Default_User_Preferences_sidebarShowDiscussion', true, {
-	// 	group: 'Accounts',
-	// 	section: 'Accounts_Default_User_Preferences',
-	// 	type: 'boolean',
-	// 	public: true,
-	// 	i18nLabel: 'Group_discussions',
-	// });
-
 	const globalQuery = {
 		_id: 'RetentionPolicy_Enabled',
 		value: true,

diff --git a/app/ui-sidenav/client/roomList.js b/app/ui-sidenav/client/roomList.js
@@ -24,7 +24,6 @@ Template.roomList.helpers({
 				'settings.preferences.sidebarSortby': 1,
 				'settings.preferences.sidebarShowFavorites': 1,
 				'settings.preferences.sidebarShowUnread': 1,
-				// 'settings.preferences.sidebarShowDiscussion': 1,
 				'services.tokenpass': 1,
 				messageViewMode: 1,
 			},
@@ -79,11 +78,6 @@ Template.roomList.helpers({
 				query.tokens = { $exists: true };
 			}
 
-			// if we display discussions as a separate group, we should hide them from the other lists
-			// if (getUserPreference(user, 'sidebarShowDiscussion')) {
-			// 	query.prid = { $exists: false };
-			// }
-
 			if (getUserPreference(user, 'sidebarShowUnread')) {
 				query.$or = [
 					{ alert: { $ne: true } },

diff --git a/server/methods/saveUserPreferences.js b/server/methods/saveUserPreferences.js
@@ -36,7 +36,6 @@ Meteor.methods({
 			sidebarViewMode: Match.Optional(String),
 			sidebarDisplayAvatar: Match.Optional(Boolean),
 			sidebarGroupByType: Match.Optional(Boolean),
-			// sidebarShowDiscussion: Match.Optional(Boolean),
 			muteFocusedConversations: Match.Optional(Boolean),
 		};
 		check(settings, Match.ObjectIncluding(keys));

diff --git a/tests/end-to-end/api/00-miscellaneous.js b/tests/end-to-end/api/00-miscellaneous.js
@@ -144,7 +144,6 @@ describe('miscellaneous', function() {
 					'sidebarDisplayAvatar',
 					'sidebarGroupByType',
 					'muteFocusedConversations',
-					// 'sidebarShowDiscussion',
 				];
 
 				expect(res.body).to.have.property('success', true);