rocketchat-lib part1

packages/rocketchat-lib/lib/configLogger.js

@@ -1,19 +1,21 @@
 /* globals LoggerManager */
+function log(fn = () => {}) {
+	return typeof LoggerManager !== 'undefined' && fn(LoggerManager);
+}
+
 RocketChat.settings.get('Log_Package', function(key, value) {
-	return (typeof LoggerManager !== 'undefined') && LoggerManager !== null && (LoggerManager.showPackage = value);
+	return log(LoggerManager => LoggerManager.showPackage = value);
 });
 
 RocketChat.settings.get('Log_File', function(key, value) {
-	return typeof LoggerManager !== 'undefined' && LoggerManager !== null && (LoggerManager.showFileAndLine = value);
+	return log(LoggerManager => LoggerManager.showFileAndLine = value);
 });
 
 RocketChat.settings.get('Log_Level', function(key, value) {
 	if (value != null) {
-		if (typeof LoggerManager !== 'undefined' && LoggerManager !== null) {
-			LoggerManager.logLevel = parseInt(value);
-		}
+		log(LoggerManager => LoggerManager.logLevel = parseInt(value));
 		Meteor.setTimeout(() => {
-			return typeof LoggerManager !== 'undefined' && LoggerManager !== null && LoggerManager.enable(true);
+			return log(LoggerManager => LoggerManager.enable(true));
 		}, 200);
 	}
 });

packages/rocketchat-lib/server/models/Reports.js

@@ -1,6 +1,3 @@
-// var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-//   hasProp = {}.hasOwnProperty;
-
 RocketChat.models.Reports = new class extends RocketChat.models._Base {
 	constructor() {
 		super('reports');

packages/rocketchat-lib/server/startup/oAuthServicesUpdate.js

@@ -19,7 +19,6 @@ function debounce(fn, delay) {
 
 function _OAuthServicesUpdate() {
 	const services = RocketChat.settings.get(/^(Accounts_OAuth_|Accounts_OAuth_Custom-)[a-z0-9_]+$/i);
-	const results = [];
 	services.forEach((service) => {
 		logger.oauth_updated(service.key);
 		let serviceName = service.key.replace('Accounts_OAuth_', '');
@@ -70,15 +69,15 @@ function _OAuthServicesUpdate() {
 				data.consumerKey = data.clientId;
 				delete data.clientId;
 			}
-			results.push(ServiceConfiguration.configurations.upsert({
+			ServiceConfiguration.configurations.upsert({
 				service: serviceName.toLowerCase()
 			}, {
 				$set: data
-			}));
+			});
 		} else {
-			results.push(ServiceConfiguration.configurations.remove({
+			ServiceConfiguration.configurations.remove({
 				service: serviceName.toLowerCase()
-			}));
+			});
 		}
 	});
 }

packages/rocketchat-lib/server/startup/settings.js

@@ -1,8 +1,12 @@
+// Insert server unique id if it doesn't exist
 RocketChat.settings.add('uniqueID', process.env.DEPLOYMENT_ID || Random.id(), {
 	'public': true,
 	hidden: true
 });
 
+// When you define a setting and want to add a description, you don't need to automatically define the i18nDescription
+// if you add a node to the i18n.json with the same setting name but with `_Description` it will automatically work.
+
 RocketChat.settings.addGroup('Accounts', function() {
 	this.add('Accounts_AllowDeleteOwnAccount', false, {
 		type: 'boolean',

packages/rocketchat-lib/server/startup/settingsOnLoadCdnPrefix.js

@@ -1,13 +1,16 @@
 /* globals WebAppInternals*/
+function testWebAppInternals(fn) {
+	typeof WebAppInternals !== 'undefined' && fn(WebAppInternals);
+}
 RocketChat.settings.onload('CDN_PREFIX', function(key, value) {
 	if (_.isString(value || false)) {
-		return typeof WebAppInternals !== 'undefined' && WebAppInternals !== null && WebAppInternals.setBundledJsCssPrefix(value);
+		return testWebAppInternals(WebAppInternals => WebAppInternals.setBundledJsCssPrefix(value));
 	}
 });
 
 Meteor.startup(function() {
 	const value = RocketChat.settings.get('CDN_PREFIX');
 	if (_.isString(value || false)) {
-		return typeof WebAppInternals !== 'undefined' && WebAppInternals !== null && WebAppInternals.setBundledJsCssPrefix(value);
+		return testWebAppInternals(WebAppInternals => WebAppInternals.setBundledJsCssPrefix(value));
 	}
 });