From cd65313c352eda85483ff29e56080a200d8a7cfe Mon Sep 17 00:00:00 2001
From: Mikael Mello <mikaelmmello@gmail.com>
Date: Wed, 7 Mar 2018 23:43:44 -0300
Subject: [PATCH 1/6] Changes all 'mergeChannels' to 'groupByType'.

Modifies boolean logic as necessary.
---
 packages/rocketchat-api/server/v1/users.js            | 2 +-
 packages/rocketchat-lib/lib/roomTypes/conversation.js | 3 ++-
 packages/rocketchat-lib/lib/roomTypes/direct.js       | 4 ++--
 packages/rocketchat-lib/lib/roomTypes/private.js      | 4 ++--
 packages/rocketchat-lib/lib/roomTypes/public.js       | 4 ++--
 packages/rocketchat-ui-sidenav/client/sideNav.js      | 8 ++++----
 packages/rocketchat-ui-sidenav/client/sortlist.html   | 4 ++--
 packages/rocketchat-ui-sidenav/client/sortlist.js     | 5 ++---
 server/methods/channelsList.js                        | 7 ++++---
 server/methods/saveUserPreferences.js                 | 8 ++++----
 10 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js
index ab92925e3c39..9b8b0f886889 100644
--- a/packages/rocketchat-api/server/v1/users.js
+++ b/packages/rocketchat-api/server/v1/users.js
@@ -321,7 +321,7 @@ RocketChat.API.v1.addRoute('users.setPreferences', { authRequired: true }, {
 				sidebarSortby: Match.Optional(String),
 				sidebarViewMode: Match.Optional(String),
 				sidebarHideAvatar: Match.Optional(Boolean),
-				mergeChannels: Match.Optional(Boolean),
+				groupByType: Match.Optional(Boolean),
 				muteFocusedConversations: Match.Optional(Boolean)
 			})
 		});
diff --git a/packages/rocketchat-lib/lib/roomTypes/conversation.js b/packages/rocketchat-lib/lib/roomTypes/conversation.js
index 6f7caa07bdc5..9a0f9eb51d8f 100644
--- a/packages/rocketchat-lib/lib/roomTypes/conversation.js
+++ b/packages/rocketchat-lib/lib/roomTypes/conversation.js
@@ -11,6 +11,7 @@ export class ConversationRoomType extends RoomTypeConfig {
 
 	condition() {
 		const user = Meteor.user();
-		return RocketChat.getUserPreference(user, 'mergeChannels');
+		// returns true only if groupByType is not set
+		return !RocketChat.getUserPreference(user, 'groupByType');
 	}
 }
diff --git a/packages/rocketchat-lib/lib/roomTypes/direct.js b/packages/rocketchat-lib/lib/roomTypes/direct.js
index 44078e0e9190..d541e3d2776b 100644
--- a/packages/rocketchat-lib/lib/roomTypes/direct.js
+++ b/packages/rocketchat-lib/lib/roomTypes/direct.js
@@ -62,8 +62,8 @@ export class DirectMessageRoomType extends RoomTypeConfig {
 
 	condition() {
 		const user = Meteor.user();
-		const mergeChannels = RocketChat.getUserPreference(user, 'mergeChannels');
-		return !mergeChannels && RocketChat.authz.hasAtLeastOnePermission(['view-d-room', 'view-joined-room']);
+		const groupByType = RocketChat.getUserPreference(user, 'groupByType');
+		return groupByType && RocketChat.authz.hasAtLeastOnePermission(['view-d-room', 'view-joined-room']);
 	}
 
 	getUserStatus(roomId) {
diff --git a/packages/rocketchat-lib/lib/roomTypes/private.js b/packages/rocketchat-lib/lib/roomTypes/private.js
index 5522d95a8110..67ee620dd2c3 100644
--- a/packages/rocketchat-lib/lib/roomTypes/private.js
+++ b/packages/rocketchat-lib/lib/roomTypes/private.js
@@ -44,8 +44,8 @@ export class PrivateRoomType extends RoomTypeConfig {
 
 	condition() {
 		const user = Meteor.user();
-		const mergeChannels = RocketChat.getUserPreference(user, 'mergeChannels');
-		return !mergeChannels && RocketChat.authz.hasAllPermission('view-p-room');
+		const groupByType = RocketChat.getUserPreference(user, 'groupByType');
+		return groupByType && RocketChat.authz.hasAllPermission('view-p-room');
 	}
 
 	isGroupChat() {
diff --git a/packages/rocketchat-lib/lib/roomTypes/public.js b/packages/rocketchat-lib/lib/roomTypes/public.js
index fb9c9e277ad3..62107db1e735 100644
--- a/packages/rocketchat-lib/lib/roomTypes/public.js
+++ b/packages/rocketchat-lib/lib/roomTypes/public.js
@@ -43,8 +43,8 @@ export class PublicRoomType extends RoomTypeConfig {
 	condition() {
 		const user = Meteor.user();
 		// const roomsListExhibitionMode = RocketChat.getUserPreference(user, 'roomsListExhibitionMode');
-		const mergeChannels = RocketChat.getUserPreference(user, 'mergeChannels');
-		return !mergeChannels && (RocketChat.authz.hasAtLeastOnePermission(['view-c-room', 'view-joined-room']) || RocketChat.settings.get('Accounts_AllowAnonymousRead') === true);
+		const groupByType = RocketChat.getUserPreference(user, 'groupByType');
+		return groupByType && (RocketChat.authz.hasAtLeastOnePermission(['view-c-room', 'view-joined-room']) || RocketChat.settings.get('Accounts_AllowAnonymousRead') === true);
 	}
 
 	showJoinLink(roomId) {
diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.js b/packages/rocketchat-ui-sidenav/client/sideNav.js
index f360e188322e..62ccd691ac08 100644
--- a/packages/rocketchat-ui-sidenav/client/sideNav.js
+++ b/packages/rocketchat-ui-sidenav/client/sideNav.js
@@ -73,16 +73,16 @@ Template.sideNav.onRendered(function() {
 });
 
 Template.sideNav.onCreated(function() {
-	this.mergedChannels = new ReactiveVar(false);
+	this.groupedByType = new ReactiveVar(false);
 
 	this.autorun(() => {
 		const user = RocketChat.models.Users.findOne(Meteor.userId(), {
 			fields: {
 				'settings.preferences.roomsListExhibitionMode': 1,
-				'settings.preferences.mergeChannels': 1
+				'settings.preferences.groupByType': 1
 			}
 		});
-		const userPref = RocketChat.getUserPreference(user, 'roomsListExhibitionMode') === 'category' && RocketChat.getUserPreference(user, 'mergeChannels');
-		this.mergedChannels.set(userPref ? userPref : RocketChat.settings.get('UI_Merge_Channels_Groups'));
+		const userPref = RocketChat.getUserPreference(user, 'roomsListExhibitionMode') === 'category' && RocketChat.getUserPreference(user, 'groupByType');
+		this.groupedByType.set(userPref ? userPref : !RocketChat.settings.get('UI_Merge_Channels_Groups'));
 	});
 });
diff --git a/packages/rocketchat-ui-sidenav/client/sortlist.html b/packages/rocketchat-ui-sidenav/client/sortlist.html
index ddb42354fbfe..191651594b9d 100644
--- a/packages/rocketchat-ui-sidenav/client/sortlist.html
+++ b/packages/rocketchat-ui-sidenav/client/sortlist.html
@@ -22,9 +22,9 @@
 		</ul>
 		<span class="rc-popover__divider"></span>
 		<ul class="rc-popover__list">
-			<li class="rc-popover__item {{bold 'mergeChannels'}}">
+			<li class="rc-popover__item {{bold 'groupByType'}}">
 				<label class="rc-popover__label">
-					<input type="checkbox" name="mergeChannels" class="hidden" checked="{{checked 'mergeChannels'}}"/>
+					<input type="checkbox" name="groupByType" class="hidden" checked="{{checked 'groupByType'}}"/>
 					<span class="rc-popover__icon">
 						{{> icon block="rc-popover__icon-element" icon='sort-amount-down' }}
 					</span>
diff --git a/packages/rocketchat-ui-sidenav/client/sortlist.js b/packages/rocketchat-ui-sidenav/client/sortlist.js
index 677f3f82f663..9d0c5289b97e 100644
--- a/packages/rocketchat-ui-sidenav/client/sortlist.js
+++ b/packages/rocketchat-ui-sidenav/client/sortlist.js
@@ -5,9 +5,8 @@ const checked = function(prop, field) {
 	if (prop === 'sidebarShowFavorites') {
 		return RocketChat.getUserPreference(user, 'sidebarShowFavorites');
 	}
-	if (prop === 'mergeChannels') {
-		// TODO change mergeChannels to GroupByType
-		return !RocketChat.getUserPreference(user, 'mergeChannels');
+	if (prop === 'groupByType') {
+		return RocketChat.getUserPreference(user, 'groupByType');
 	}
 	if (prop === 'sidebarShowUnread') {
 		return RocketChat.getUserPreference(user, 'sidebarShowUnread');
diff --git a/server/methods/channelsList.js b/server/methods/channelsList.js
index 5f06002743b8..7cb76be0f9d9 100644
--- a/server/methods/channelsList.js
+++ b/server/methods/channelsList.js
@@ -62,11 +62,12 @@ Meteor.methods({
 
 		if (channelType !== 'public' && RocketChat.authz.hasPermission(Meteor.userId(), 'view-p-room')) {
 			const user = Meteor.user();
-			const userPref = RocketChat.getUserPreference(user, 'mergeChannels') && RocketChat.getUserPreference(user, 'roomsListExhibitionMode') === 'category';
+			const userPref = RocketChat.getUserPreference(user, 'groupByType') && RocketChat.getUserPreference(user, 'roomsListExhibitionMode') === 'category';
 			const globalPref = RocketChat.settings.get('UI_Merge_Channels_Groups');
-			const mergeChannels = userPref !== undefined ? userPref : globalPref;
+			// needs to negate globalPref because userPref represents its opposite
+			const groupByType = userPref !== undefined ? userPref : !globalPref;
 
-			if (mergeChannels) {
+			if (!groupByType) {
 				roomTypes.push({
 					type: 'p',
 					username: user.username
diff --git a/server/methods/saveUserPreferences.js b/server/methods/saveUserPreferences.js
index 9f3fa8c75b5c..eb999f4425ca 100644
--- a/server/methods/saveUserPreferences.js
+++ b/server/methods/saveUserPreferences.js
@@ -34,9 +34,9 @@ Meteor.methods({
 			muteFocusedConversations: Match.Optional(Boolean)
 		};
 		check(settings, Match.ObjectIncluding(keys));
-		if (settings.mergeChannels) {
+		if (settings.groupByType) {
 			check(settings, Match.ObjectIncluding({
-				mergeChannels: Match.OneOf(Number, Boolean) //eslint-disable-line new-cap
+				groupByType: Match.OneOf(Number, Boolean) //eslint-disable-line new-cap
 			}));
 		}
 		const user = Meteor.userId();
@@ -48,8 +48,8 @@ Meteor.methods({
 			RocketChat.models.Users.setLanguage(user, settings.language);
 		}
 
-		if (settings.mergeChannels != null) {
-			settings.mergeChannels = ['1', true].includes(settings.mergeChannels);
+		if (settings.groupByType != null) {
+			settings.groupByType = ['1', true].includes(settings.groupByType);
 		}
 
 

From 5e8d7370f4b58814b040d7c37a1c3a7ba3702ac6 Mon Sep 17 00:00:00 2001
From: Mikael Mello <mikaelmmello@gmail.com>
Date: Wed, 30 May 2018 14:27:55 -0300
Subject: [PATCH 2/6] Change occurrences of UI_Merge_Channels_Groups to
 UI_Group_Channels_By_Type

---
 packages/rocketchat-i18n/i18n/en.i18n.json                    | 1 +
 packages/rocketchat-lib/server/startup/settings.js            | 4 ++--
 packages/rocketchat-ui-account/client/accountPreferences.html | 1 +
 packages/rocketchat-ui-sidenav/client/sideNav.js              | 2 +-
 server/methods/channelsList.js                                | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 7a1b3e0412d1..7567d2048e7e 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2181,6 +2181,7 @@
   "UI_Click_Direct_Message_Description": "Skip opening profile tab, instead go straight to conversation",
   "UI_DisplayRoles": "Display Roles",
   "UI_Merge_Channels_Groups": "Merge Private Groups with Channels",
+  "UI_Group_Channels_By_Type": "Group channels by type",
   "UI_Unread_Counter_Style": "Unread Counter Style",
   "UI_Use_Name_Avatar": "Use Full Name Initials to Generate Default Avatar",
   "UI_Use_Real_Name": "Use Real Name",
diff --git a/packages/rocketchat-lib/server/startup/settings.js b/packages/rocketchat-lib/server/startup/settings.js
index 8f655fc6b804..a4cc189f874f 100644
--- a/packages/rocketchat-lib/server/startup/settings.js
+++ b/packages/rocketchat-lib/server/startup/settings.js
@@ -1634,9 +1634,9 @@ RocketChat.settings.addGroup('Layout', function() {
 			type: 'boolean',
 			'public': true
 		});
-		this.add('UI_Merge_Channels_Groups', true, {
+		this.add('UI_Group_Channels_By_Type', true, {
 			type: 'boolean',
-			'public': true
+			'public': false
 		});
 		this.add('UI_Use_Name_Avatar', false, {
 			type: 'boolean',
diff --git a/packages/rocketchat-ui-account/client/accountPreferences.html b/packages/rocketchat-ui-account/client/accountPreferences.html
index 8ec4479fda1f..dda8166a828c 100644
--- a/packages/rocketchat-ui-account/client/accountPreferences.html
+++ b/packages/rocketchat-ui-account/client/accountPreferences.html
@@ -203,6 +203,7 @@ <h1>{{_ "Messages"}}</h1>
 									</select>
 								</div>
 							</div> -->
+							<!-- Warning the setting has changed to UI_Group_Channels_By_Type, this was not updated because it is commented and non existent in the js file-->
 							<!-- {{# with disabled=showMergedChannels}}
 							<div class="input-line double-col" id="mergeChannels" {{disabled}}>
 								<label>{{_ "UI_Merge_Channels_Groups"}}</label>
diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.js b/packages/rocketchat-ui-sidenav/client/sideNav.js
index 3bf0e8be1245..ce9956e0734f 100644
--- a/packages/rocketchat-ui-sidenav/client/sideNav.js
+++ b/packages/rocketchat-ui-sidenav/client/sideNav.js
@@ -86,6 +86,6 @@ Template.sideNav.onCreated(function() {
 			}
 		});
 		const userPref = RocketChat.getUserPreference(user, 'roomsListExhibitionMode') === 'category' && RocketChat.getUserPreference(user, 'groupByType');
-		this.groupedByType.set(userPref ? userPref : !RocketChat.settings.get('UI_Merge_Channels_Groups'));
+		this.groupedByType.set(userPref ? userPref : RocketChat.settings.get('UI_Group_Channels_By_Type'));
 	});
 });
diff --git a/server/methods/channelsList.js b/server/methods/channelsList.js
index 7cb76be0f9d9..d9cd88e255fb 100644
--- a/server/methods/channelsList.js
+++ b/server/methods/channelsList.js
@@ -63,9 +63,9 @@ Meteor.methods({
 		if (channelType !== 'public' && RocketChat.authz.hasPermission(Meteor.userId(), 'view-p-room')) {
 			const user = Meteor.user();
 			const userPref = RocketChat.getUserPreference(user, 'groupByType') && RocketChat.getUserPreference(user, 'roomsListExhibitionMode') === 'category';
-			const globalPref = RocketChat.settings.get('UI_Merge_Channels_Groups');
+			const globalPref = RocketChat.settings.get('UI_Group_Channels_By_Type');
 			// needs to negate globalPref because userPref represents its opposite
-			const groupByType = userPref !== undefined ? userPref : !globalPref;
+			const groupByType = userPref !== undefined ? userPref : globalPref;
 
 			if (!groupByType) {
 				roomTypes.push({

From cd4b12792c38c21784f1b71daf3718cb6550ce95 Mon Sep 17 00:00:00 2001
From: Mikael Mello <mikaelmmello@gmail.com>
Date: Wed, 30 May 2018 14:45:44 -0300
Subject: [PATCH 3/6] Add migration to change from mergeChannels to groupByType
 preference

---
 server/startup/migrations/v122.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 server/startup/migrations/v122.js

diff --git a/server/startup/migrations/v122.js b/server/startup/migrations/v122.js
new file mode 100644
index 000000000000..9e020424953d
--- /dev/null
+++ b/server/startup/migrations/v122.js
@@ -0,0 +1,29 @@
+RocketChat.Migrations.add({
+	version: 122,
+	up() {
+		RocketChat.models.Users.update({
+			'settings.preferences.mergeChannels': true
+		}, {
+			$unset: {
+				'settings.preferences.mergeChannels': 1
+			},
+			$set: {
+				'settings.preferences.groupByType': false
+			}
+		}, {
+			multi: true
+		});
+		RocketChat.models.Users.update({
+			'settings.preferences.mergeChannels': false
+		}, {
+			$unset: {
+				'settings.preferences.mergeChannels': 1
+			},
+			$set: {
+				'settings.preferences.groupByType': true
+			}
+		}, {
+			multi: true
+		});
+	}
+});

From 590d3173da423f3779d5e1837e9616f4f3988e64 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Wed, 6 Jun 2018 19:59:48 -0300
Subject: [PATCH 4/6] Update and rename v122.js to v123.js

---
 server/startup/migrations/{v122.js => v123.js} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename server/startup/migrations/{v122.js => v123.js} (97%)

diff --git a/server/startup/migrations/v122.js b/server/startup/migrations/v123.js
similarity index 97%
rename from server/startup/migrations/v122.js
rename to server/startup/migrations/v123.js
index 9e020424953d..0a2a19623def 100644
--- a/server/startup/migrations/v122.js
+++ b/server/startup/migrations/v123.js
@@ -1,5 +1,5 @@
 RocketChat.Migrations.add({
-	version: 122,
+	version: 123,
 	up() {
 		RocketChat.models.Users.update({
 			'settings.preferences.mergeChannels': true

From cf6fcf42aaac7640f3ae4ae019d23953a120ddef Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Wed, 6 Jun 2018 20:00:29 -0300
Subject: [PATCH 5/6] remove old code

---
 .../client/accountPreferences.html            | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/packages/rocketchat-ui-account/client/accountPreferences.html b/packages/rocketchat-ui-account/client/accountPreferences.html
index dda8166a828c..232f358b7288 100644
--- a/packages/rocketchat-ui-account/client/accountPreferences.html
+++ b/packages/rocketchat-ui-account/client/accountPreferences.html
@@ -193,27 +193,6 @@ <h1>{{_ "Messages"}}</h1>
 									<label><input type="radio" name="hideAvatars" value="false" checked="{{checked 'hideAvatars' false}}"/> {{_ "False"}}</label>
 								</div>
 							</div>
-							<!-- <div class="input-line double-col">
-								<label for="roomsListExhibitionMode">{{_ "Sidebar_list_mode"}}</label>
-								<div>
-									<select class="input-monitor rc-input__element" name="roomsListExhibitionMode" id="roomsListExhibitionMode">
-										<option value="unread" selected="{{selected 'roomsListExhibitionMode' 'unread'}}">{{_ "Unread_Rooms_Mode"}}</option>
-										<option value="activity" selected="{{selected 'roomsListExhibitionMode' 'activity'}}">{{_ "Sort_by_activity"}}</option>
-										<option value="category" selected="{{selected 'roomsListExhibitionMode' 'category'}}">{{_ "Split_by_categories"}}</option>
-									</select>
-								</div>
-							</div> -->
-							<!-- Warning the setting has changed to UI_Group_Channels_By_Type, this was not updated because it is commented and non existent in the js file-->
-							<!-- {{# with disabled=showMergedChannels}}
-							<div class="input-line double-col" id="mergeChannels" {{disabled}}>
-								<label>{{_ "UI_Merge_Channels_Groups"}}</label>
-								<div>
-									<label><input type="radio" name="mergeChannels" value="1" checked="{{checked 'mergeChannels' true 'default'}}" {{disabled}}/> {{_ "True"}}</label>
-									<label><input type="radio" name="mergeChannels" value="0" checked="{{checked 'mergeChannels' false 'default'}}" {{disabled}}/> {{_ "False"}}</label>
-									<label><input type="radio" name="mergeChannels" value="-1" checked="{{checked 'mergeChannels' 'default' 'default'}}" {{disabled}}/> {{_ "Default"}}</label>
-								</div>
-							</div>
-							{{/with}} -->
 							<div class="input-line double-col" id="messageViewMode">
 								<label>{{_ "View_mode"}}</label>
 								<div>

From 435e9e2e77814fff1f69cdcc4b83664e737ee5a8 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Wed, 6 Jun 2018 20:03:53 -0300
Subject: [PATCH 6/6] Update and rename v123.js to v124.js

---
 server/startup/migrations/{v123.js => v124.js} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename server/startup/migrations/{v123.js => v124.js} (97%)

diff --git a/server/startup/migrations/v123.js b/server/startup/migrations/v124.js
similarity index 97%
rename from server/startup/migrations/v123.js
rename to server/startup/migrations/v124.js
index 0a2a19623def..942dbe38633b 100644
--- a/server/startup/migrations/v123.js
+++ b/server/startup/migrations/v124.js
@@ -1,5 +1,5 @@
 RocketChat.Migrations.add({
-	version: 123,
+	version: 124,
 	up() {
 		RocketChat.models.Users.update({
 			'settings.preferences.mergeChannels': true