prevent channel names that look like IDs and adjust 'getActiveChannelUsersByIdOrName'

Author: fquirin

www/scripts/sepiaFW.account.js

@@ -118,6 +118,19 @@ function sepiaFW_build_account(){
 	}
 
 	//----------------------
+
+	//get general ID prefix
+	Account.getIdPrefix = function(){
+		if (userId){
+			return userId.split(/\d/,2)[0];
+		}else{
+			return undefined;
+		}
+	}
+	//does the given string look like an ID
+	Account.stringLooksLikeAnID = function(str){
+		return !!str.match(new RegExp("^" + Account.getIdPrefix().toLowerCase() + "\\d+$"));
+	}
 
 	//get user id
 	Account.getUserId = function(){

www/scripts/sepiaFW.ui.build.js

@@ -1209,6 +1209,10 @@ function sepiaFW_build_ui_build(){
 			userList.forEach(function (user) {
 				var entryClass = "";
 				var name = user.name; 		//TODO: distinguish identical names
+				//prevent names that are like IDs
+				if (SepiaFW.account.stringLooksLikeAnID(name)){
+					name = "ID:" + name;
+				}
 				if ($.inArray(user.id + "_" + user.deviceId, avoidDoubles) == -1){
 					if (user.id === userId && user.deviceId === deviceId){
 						entryClass = "me";

www/scripts/sepiaFW.webSocket.js

@@ -1480,7 +1480,7 @@ function sepiaFW_build_webSocket_client(){
 					receiver = recUid;		//we should set receiver in any case to prevent a public message
 				}
 				res.shift();
-				text = res.join(" ");
+				text = res.join(" ").trim();
 
 			//locked receiver overwrite
 			}else if (activeChatPartner && !hasSpecialCommand){
@@ -1551,10 +1551,12 @@ function sepiaFW_build_webSocket_client(){
 	}
 
 	Client.getActiveChannelUsersByIdOrName = function(nameOrId){
+		nameOrId = nameOrId.toLowerCase();
+		var id = SepiaFW.account.stringLooksLikeAnID(nameOrId)? nameOrId : "";
 		var receivers = [];
 		if (nameOrId){
 			$.each(userList, function(index, u){
-				if (nameOrId.toLowerCase() === u.name.toLowerCase() || nameOrId.toLowerCase() === u.id.toLowerCase()){
+				if ((id && id === u.id.toLowerCase()) || nameOrId === u.name.toLowerCase()){
 					receivers.push(u);
 				}
 			});