increment username if just exists

Keplerjs · Jan 10, 2019 · 603c27d · 603c27d
1 parent 573bd4b
commit 603c27d
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 13 deletions.
diff --git a/packages/core/server/Accounts.js b/packages/core/server/Accounts.js
@@ -135,10 +135,7 @@ Accounts.onCreateUser(function(options, user) {
 		username = options.profile.username;
 		avatar = options.profile.picture;
 		lang = options.profile.languages[0];
-/*		emails = [{
-			address: user.services.openstreetmap.email,
-			verified: user.services.openstreetmap.verified_email
-		}];*/
+		emails = [];
 	}
 	//TODO else if(user.services.twitter) {
 	//	source.service = 'twitter';

diff --git a/packages/core/server/profile.js b/packages/core/server/profile.js
@@ -100,6 +100,7 @@ Meteor.methods({
 			$pull: {friends: blockUserId},
 			$addToSet: {usersBlocked: blockUserId}
 		});
+
 		Users.update(blockUserId, {
 			$pull: {
 				friends: this.userId,
@@ -139,11 +140,16 @@ Meteor.methods({
 			throw new Meteor.Error(500, i18n('error_novalid')+' '+i18n('error_validchars'));
 		*/
 		username = K.Util.sanitize.username(username);
+		if(username==='') {
+			throw new Meteor.Error(500, i18n('error_validchars'), username);
+		}
 
 		var user = Users.findOne({username: username}, {fields: {username:1}});
 
-		if(user && user._id !== this.userId)
-			throw new Meteor.Error(500, '<big>'+username+'</big> '+i18n('error_taken'));
+		if(user && user._id !== this.userId) {
+			var usernameInc = K.Util.sanitize.nthName(username);
+			throw new Meteor.Error(500, i18n('error_taken',username), usernameInc);
+		}
 
 		console.log('Profile: setUsername updated', this.userId, username);
 

diff --git a/packages/i18n/i18n/de.js b/packages/i18n/i18n/de.js
@@ -55,7 +55,7 @@ i18n.map('de', {
 
 	error_novalid: "not valid",
 	error_validchars: "letters, numbers, '-' '.' '_' min 3 max 30 chars",
-	error_taken: "already been taken",
+	error_taken: "username <i>{$1}</i> already been taken",
 
 	btn_ok: "OK",
 	btn_cancel: "Abbrechen",

diff --git a/packages/i18n/i18n/en.js b/packages/i18n/i18n/en.js
@@ -60,7 +60,7 @@ i18n.map('en', {
 
 	error_novalid: "not valid!",
 	error_validchars: "Use letters, numbers, '-' '.' '_' min 3 max 16 chars",
-	error_taken: "already been taken",
+	error_taken: "username <i>{$1}</i> already been taken",
 
 	btn_ok: "Ok",
 	btn_cancel: "Cancel",

diff --git a/packages/i18n/i18n/es.js b/packages/i18n/i18n/es.js
@@ -54,7 +54,7 @@ i18n.map('es', {
 
 	error_novalid: "not valid",
 	error_validchars: "letters, numbers, '-' '.' '_' min 3 max 30 chars",
-	error_taken: "already been taken",
+	error_taken: "username <i>{$1}</i> already been taken",
 
 	btn_ok: "Ok",
 	btn_cancel: "Anular",

diff --git a/packages/i18n/i18n/fr.js b/packages/i18n/i18n/fr.js
@@ -53,7 +53,7 @@ i18n.map('fr', {
 
 	error_novalid: "not valid",
 	error_validchars: "letters, numbers, '-' '.' '_' min 3 max 30 chars",
-	error_taken: "already been taken",
+	error_taken: "username <i>{$1}</i> already been taken",
 
 	btn_ok: "Ok",
 	btn_cancel: "Annuler",

diff --git a/packages/i18n/i18n/it.js b/packages/i18n/i18n/it.js
@@ -95,7 +95,7 @@ i18n.map('it', {
 
 	error_novalid: "non valido",
 	error_validchars: "lettere, numberi, '-' '.' '_' min 3 max 30 caratteri",
-	error_taken: "gia stato preso",
+	error_taken: "username <i>{$1}</i> gia stato preso",
 
 	map_gps_title: "Tua posizione",
 	map_gps_error: "gps non disponibile",

diff --git a/packages/i18n/i18n/sv.js b/packages/i18n/i18n/sv.js
@@ -55,7 +55,7 @@ i18n.map('sv', {
 
 	error_novalid: "not valid",
 	error_validchars: "letters, numbers, '-' '.' '_' min 3 max 30 chars",
-	error_taken: "already been taken",
+	error_taken: "username <i>{$1}</i> already been taken",
 
 	btn_ok: "Ok",
 	btn_cancel: "Avbryt",

diff --git a/packages/ui/client/views/panels/settings/bio.js b/packages/ui/client/views/panels/settings/bio.js
@@ -21,7 +21,7 @@ Template.panelSettings_ui_bio.events({
 
 			if(err) {
 				mes$.html(err.reason)
-				input$.val( tmpl.data.username );
+				input$.val( err.details || tmpl.data.username );
 			}
 			else {
 				input$.val(sanitized);