Remove setting and add migration to create the general channel

matheusbsilva137 · matheusbsilva137 · commit 6de5e48934ba · 2021-09-01T20:44:00.000-03:00
diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
@@ -871,10 +871,6 @@ settings.addGroup('General', function() {
 		type: 'boolean',
 		public: true,
 	});
-	this.add('General_Default', true, {
-		type: 'boolean',
-		public: true,
-	});
 	this.add('First_Channel_After_Login', '', {
 		type: 'string',
 		public: true,
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2014,8 +2014,6 @@
   "Full_Screen": "Full Screen",
   "Gaming": "Gaming",
   "General": "General",
-  "General_Default": "Keep general room on the server",
-  "General_Default_Description": "Recreate the general room on server restart if this room is deleted.",
   "Generate_new_key": "Generate a new key",
   "Generate_New_Link": "Generate New Link",
   "Generating_key": "Generating key",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -1659,8 +1659,6 @@
   "Full_Screen": "Tela cheia",
   "Gaming": "Jogos",
   "General": "Geral",
-  "General_Default": "Manter a sala geral no servidor",
-  "General_Default_Description": "Recriar a sala geral na renicialização do servidor se esta sala for excluída.",
   "Generate_new_key": "Gerar uma nova chave",
   "Generate_New_Link": "Gerar Novo Link",
   "Generating_key": "Gerando chave",
diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -1474,8 +1474,6 @@
   "Full_Screen": "Tela cheia",
   "Gaming": "Jogos",
   "General": "Geral",
-  "General_Default": "Manter a sala geral no servidor",
-  "General_Default_Description": "Recriar a sala geral na renicialização do servidor se esta sala for excluída.",
   "Get_link": "Obter Ligação",
   "github_no_public_email": "Não possui um e-mail público na sua conta GitHub",
   "Give_a_unique_name_for_the_custom_oauth": "Dê um nome exclusivo para o oauth customizado",
diff --git a/server/startup/initialData.js b/server/startup/initialData.js
@@ -11,12 +11,6 @@ import { checkUsernameAvailability, addUserToDefaultChannels } from '../../app/l
 
 Meteor.startup(function() {
 	Meteor.defer(() => {
-		if (!Rooms.findOneById('GENERAL') && settings.get('General_Default')) {
-			Rooms.createWithIdTypeAndName('GENERAL', 'c', 'general', {
-				default: true,
-			});
-		}
-
 		if (!Users.findOneById('rocket.cat')) {
 			Users.create({
 				_id: 'rocket.cat',
diff --git a/server/startup/migrations/index.js b/server/startup/migrations/index.js
@@ -228,4 +228,5 @@ import './v228';
 import './v229';
 import './v230';
 import './v231';
+import './v232';
 import './xrun';
diff --git a/server/startup/migrations/v232.ts b/server/startup/migrations/v232.ts
@@ -0,0 +1,13 @@
+import { Settings, Rooms } from '../../../app/models/server';
+import { Migrations } from '../../../app/migrations';
+
+Migrations.add({
+	version: 232,
+	up() {
+        if (Settings.findOneById('Show_Setup_Wizard') === 'pending' && !Rooms.findOneById('GENERAL')) {
+			Rooms.createWithIdTypeAndName('GENERAL', 'c', 'general', {
+				default: true,
+			});
+		}
+	},
+});
