my_alias and my_photo_url on tribe join or request, check existing ChatMember aliases to make sure unique

dist/src/controllers/chatTribes.js

@@ -24,7 +24,7 @@ const constants_1 = require("../constants");
 function joinTribe(req, res) {
     return __awaiter(this, void 0, void 0, function* () {
         console.log('=> joinTribe');
-        const { uuid, group_key, name, host, amount, img, owner_pubkey, owner_alias } = req.body;
+        const { uuid, group_key, name, host, amount, img, owner_pubkey, owner_alias, my_alias, my_photo_url } = req.body;
         const is_private = req.body.private;
         const existing = yield models_1.models.Chat.findOne({ where: { uuid } });
         if (existing) {
@@ -77,6 +77,10 @@ function joinTribe(req, res) {
             status: chatStatus,
             priceToJoin: amount || 0,
         };
+        if (my_alias)
+            chatParams.myAlias = my_alias;
+        if (my_photo_url)
+            chatParams.myPhotoUrl = my_photo_url;
         const typeToSend = is_private ?
             constants_1.default.message_types.member_request :
             constants_1.default.message_types.group_join;
@@ -85,15 +89,19 @@ function joinTribe(req, res) {
             chatParams.contactIds;
         console.log('=> joinTribe: typeToSend', typeToSend);
         console.log('=> joinTribe: contactIdsToSend', contactIdsToSend);
+        // set my alias to be the custom one
+        const theOwner = owner.dataValues || owner;
+        if (my_alias)
+            theOwner.alias = my_alias;
         network.sendMessage({
             chat: Object.assign(Object.assign({}, chatParams), { contactIds: contactIdsToSend, members: {
                     [owner.publicKey]: {
                         key: owner.contactKey,
-                        alias: owner.alias || ''
+                        alias: my_alias || owner.alias || ''
                     }
                 } }),
             amount: amount || 0,
-            sender: owner,
+            sender: theOwner,
             message: {},
             type: typeToSend,
             failure: function (e) {
@@ -130,7 +138,7 @@ function receiveMemberRequest(payload) {
         date.setMilliseconds(0);
         let theSender = null;
         const member = chat_members[sender_pub_key];
-        const senderAlias = sender_alias || (member && member.alias) || 'Unknown';
+        const senderAlias = (member && member.alias) || sender_alias || 'Unknown';
         const sender = yield models_1.models.Contact.findOne({ where: { publicKey: sender_pub_key } });
         if (sender) {
             theSender = sender; // might already include??
@@ -140,7 +148,7 @@ function receiveMemberRequest(payload) {
                 const createdContact = yield models_1.models.Contact.create({
                     publicKey: sender_pub_key,
                     contactKey: member.key,
-                    alias: senderAlias,
+                    alias: sender_alias || senderAlias,
                     status: 1,
                     fromGroup: true,
                     photoUrl: sender_photo_url
@@ -156,6 +164,7 @@ function receiveMemberRequest(payload) {
             role: constants_1.default.chat_roles.reader,
             status: constants_1.default.chat_statuses.pending,
             lastActive: date,
+            lastAlias: senderAlias,
         });
         // maybe check here manually????
         try {
@@ -165,6 +174,7 @@ function receiveMemberRequest(payload) {
                 role: constants_1.default.chat_roles.reader,
                 status: constants_1.default.chat_statuses.pending,
                 lastActive: date,
+                lastAlias: senderAlias,
             });
         }
         catch (e) { }
@@ -178,7 +188,7 @@ function receiveMemberRequest(payload) {
             network_type
         };
         if (isTribe) {
-            msg.senderAlias = sender_alias;
+            msg.senderAlias = senderAlias;
             msg.senderPic = sender_photo_url;
         }
         const message = yield models_1.models.Message.create(msg);
@@ -316,7 +326,7 @@ function approveOrRejectMember(req, res) {
 exports.approveOrRejectMember = approveOrRejectMember;
 function receiveMemberApprove(payload) {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log('=> receiveMemberApprove');
+        console.log('=> receiveMemberApprove'); // received by the joiner only
         const { owner, chat, chat_name, sender, network_type } = yield helpers.parseReceiveParams(payload);
         if (!chat)
             return console.log('no chat');
@@ -342,16 +352,20 @@ function receiveMemberApprove(payload) {
         });
         const amount = chat.priceToJoin || 0;
         const theChat = chat.dataValues || chat;
+        const theOwner = owner.dataValues || owner;
+        const theAlias = chat.myAlias || owner.alias;
+        if (theAlias)
+            theOwner.alias = theAlias;
         // send JOIN and my info to all 
         network.sendMessage({
             chat: Object.assign(Object.assign({}, theChat), { members: {
                     [owner.publicKey]: {
                         key: owner.contactKey,
-                        alias: owner.alias || ''
+                        alias: theAlias || ''
                     }
                 } }),
             amount,
-            sender: owner,
+            sender: theOwner,
             message: {},
             type: constants_1.default.message_types.group_join,
         });

dist/src/models/ts/chatMember.js

@@ -40,6 +40,10 @@ __decorate([
     sequelize_typescript_1.Column,
     __metadata("design:type", Number)
 ], ChatMember.prototype, "status", void 0);
+__decorate([
+    sequelize_typescript_1.Column,
+    __metadata("design:type", String)
+], ChatMember.prototype, "lastAlias", void 0);
 ChatMember = __decorate([
     sequelize_typescript_1.Table({ tableName: 'sphinx_chat_members', underscored: true, indexes: [
             { unique: true, fields: ['chat_id', 'contact_id'] }

dist/src/models/ts/chatMember.js.map

@@ -1 +1 @@
-{"version":3,"file":"chatMember.js","sourceRoot":"","sources":["../../../../src/models/ts/chatMember.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAA4D;AAK5D,IAAqB,UAAU,GAA/B,MAAqB,UAAW,SAAQ,4BAAiB;CAuBxD,CAAA;AApBC;IADC,6BAAM;;0CACO;AAGd;IADC,6BAAM;;6CACU;AAGjB;IADC,6BAAM;;wCACK;AAGZ;IADC,6BAAM;;8CACW;AAGlB;IADC,6BAAM;;iDACc;AAGrB;IADC,6BAAM;8BACK,IAAI;8CAAA;AAGhB;IADC,6BAAM;;0CACO;AArBK,UAAU;IAH9B,4BAAK,CAAC,EAAC,SAAS,EAAE,qBAAqB,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAC;YACnE,EAAC,MAAM,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC,SAAS,EAAC,YAAY,CAAC,EAAC;SAC/C,EAAC,CAAC;GACkB,UAAU,CAuB9B;kBAvBoB,UAAU"}
+{"version":3,"file":"chatMember.js","sourceRoot":"","sources":["../../../../src/models/ts/chatMember.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAA4D;AAK5D,IAAqB,UAAU,GAA/B,MAAqB,UAAW,SAAQ,4BAAiB;CA0BxD,CAAA;AAvBC;IADC,6BAAM;;0CACO;AAGd;IADC,6BAAM;;6CACU;AAGjB;IADC,6BAAM;;wCACK;AAGZ;IADC,6BAAM;;8CACW;AAGlB;IADC,6BAAM;;iDACc;AAGrB;IADC,6BAAM;8BACK,IAAI;8CAAA;AAGhB;IADC,6BAAM;;0CACO;AAGd;IADC,6BAAM;;6CACU;AAxBE,UAAU;IAH9B,4BAAK,CAAC,EAAC,SAAS,EAAE,qBAAqB,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAC;YACnE,EAAC,MAAM,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC,SAAS,EAAC,YAAY,CAAC,EAAC;SAC/C,EAAC,CAAC;GACkB,UAAU,CA0B9B;kBA1BoB,UAAU"}

dist/src/network/receive.js

@@ -93,8 +93,11 @@ function onReceive(payload) {
             const needsPricePerMessage = typesThatNeedPricePerMessage.includes(payload.type);
             // CHECK THEY ARE IN THE GROUP if message
             const senderContact = yield models_1.models.Contact.findOne({ where: { publicKey: payload.sender.pub_key } });
+            if (!senderContact)
+                return; // need sender contact!
+            const senderContactId = senderContact.id;
             if (needsPricePerMessage) {
-                const senderMember = senderContact && (yield models_1.models.ChatMember.findOne({ where: { contactId: senderContact.id, chatId: chat.id } }));
+                const senderMember = yield models_1.models.ChatMember.findOne({ where: { contactId: senderContactId, chatId: chat.id } });
                 if (!senderMember)
                     doAction = false;
             }
@@ -107,7 +110,7 @@ function onReceive(payload) {
                     timers.addTimer({
                         amount: chat.escrowAmount,
                         millis: chat.escrowMillis,
-                        receiver: senderContact.id,
+                        receiver: senderContactId,
                         msgId: payload.message.id,
                         chatId: chat.id,
                     });
@@ -118,7 +121,7 @@ function onReceive(payload) {
                 if (payload.message.amount < chat.priceToJoin)
                     doAction = false;
                 if (chat.private) { // check if has been approved
-                    const senderMember = senderContact && (yield models_1.models.ChatMember.findOne({ where: { contactId: senderContact.id, chatId: chat.id } }));
+                    const senderMember = yield models_1.models.ChatMember.findOne({ where: { contactId: senderContactId, chatId: chat.id } });
                     if (!(senderMember && senderMember.status === constants_1.default.chat_statuses.approved)) {
                         doAction = false; // dont let if private and not approved
                     }
@@ -130,7 +133,7 @@ function onReceive(payload) {
                 if (payload.message.uuid) {
                     const ogMsg = yield models_1.models.Message.findOne({ where: {
                             uuid: payload.message.uuid,
-                            sender: senderContact.id,
+                            sender: senderContactId,
                         } });
                     if (ogMsg)
                         doAction = true;
@@ -214,6 +217,9 @@ function forwardMessageToTribe(ogpayload, sender, realSatsContactId, amtToForwar
     return __awaiter(this, void 0, void 0, function* () {
         // console.log('forwardMessageToTribe')
         const chat = yield models_1.models.Chat.findOne({ where: { uuid: ogpayload.chat.uuid } });
+        if (!chat)
+            return;
+        const senderContactId = sender.id; // og msg sender
         let payload;
         if (sender && typesToModify.includes(ogpayload.type)) {
             payload = yield modify_1.modifyPayloadAndSaveMediaKey(ogpayload, chat, sender);
@@ -221,16 +227,32 @@ function forwardMessageToTribe(ogpayload, sender, realSatsContactId, amtToForwar
         else {
             payload = ogpayload;
         }
-        // dont need sender beyond here
-        //const sender = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}})
         const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
         const type = payload.type;
         const message = payload.message;
         // HERE: NEED TO MAKE SURE ALIAS IS UNIQUE
         // ASK xref TABLE and put alias there too?
+        const owner_alias = chat.myAlias || owner.alias;
+        const sender_alias = payload.sender && payload.sender.alias;
+        let final_sender_alias = sender_alias;
+        const chatMembers = yield models_1.models.ChatMember.findAll({ where: { chatId: chat.id } });
+        if (!(chatMembers && chatMembers.length))
+            return;
+        asyncForEach(chatMembers, (cm) => {
+            if (cm.contactId === senderContactId)
+                return; // dont check against self of course
+            if (sender_alias === cm.lastAlias || sender_alias === owner_alias) {
+                // impersonating! switch it up!
+                final_sender_alias = `${sender_alias}_2`;
+            }
+        });
+        if (sender_alias !== final_sender_alias) {
+            const theChatMember = yield models_1.models.ChatMember.findOne({ where: { chatId: chat.id, contactId: senderContactId } });
+            yield theChatMember.update({ lastAlias: final_sender_alias });
+        }
         send_1.sendMessage({
             type, message,
-            sender: Object.assign(Object.assign({}, owner.dataValues), { alias: (payload.sender && payload.sender.alias) || '', photoUrl: (payload.sender && payload.sender.photo_url) || '', role: constants_1.default.chat_roles.reader }),
+            sender: Object.assign(Object.assign({}, owner.dataValues), { alias: final_sender_alias || '', photoUrl: (payload.sender && payload.sender.photo_url) || '', role: constants_1.default.chat_roles.reader }),
             amount: amtToForwardToRealSatsContactId || 0,
             chat: chat,
             skipPubKey: payload.sender.pub_key,
@@ -418,4 +440,11 @@ function weave(p) {
         return payload;
     }
 }
+function asyncForEach(array, callback) {
+    return __awaiter(this, void 0, void 0, function* () {
+        for (let index = 0; index < array.length; index++) {
+            yield callback(array[index], index, array);
+        }
+    });
+}
 //# sourceMappingURL=receive.js.map

dist/src/network/send.js

@@ -107,7 +107,7 @@ function sendMessage(params) {
                 console.log("KEYSEND ERROR", e);
                 no = e;
             }
-            yield sleep(2);
+            yield sleep(10);
         }));
         if (no) {
             if (failure)

dist/src/utils/setup.js

@@ -49,6 +49,7 @@ function setVersion() {
 }
 function migrate() {
     return __awaiter(this, void 0, void 0, function* () {
+        addTableColumn('sphinx_chat_members', 'last_alias');
         addTableColumn('sphinx_chats', 'my_photo_url');
         addTableColumn('sphinx_chats', 'my_alias');
         addTableColumn('sphinx_messages', 'sender_pic');

src/controllers/chatTribes.ts

@@ -13,7 +13,7 @@ import constants from '../constants'
 
 export async function joinTribe(req, res){
 	console.log('=> joinTribe')
-	const { uuid, group_key, name, host, amount, img, owner_pubkey, owner_alias } = req.body
+	const { uuid, group_key, name, host, amount, img, owner_pubkey, owner_alias, my_alias, my_photo_url } = req.body
 	const is_private = req.body.private
 
 	const existing = await models.Chat.findOne({where:{uuid}})
@@ -56,7 +56,7 @@ export async function joinTribe(req, res){
 	const chatStatus = is_private ?
 		constants.chat_statuses.pending :
 		constants.chat_statuses.approved
-	const chatParams = {
+	const chatParams:{[k:string]:any} = {
 		uuid: uuid,
 		contactIds: JSON.stringify(contactIds),
 		photoUrl: img||'',
@@ -71,6 +71,8 @@ export async function joinTribe(req, res){
 		status: chatStatus,
 		priceToJoin: amount||0,
 	}
+	if(my_alias) chatParams.myAlias = my_alias
+	if(my_photo_url) chatParams.myPhotoUrl = my_photo_url
 	
 	const typeToSend = is_private ?
 		constants.message_types.member_request :
@@ -80,6 +82,9 @@ export async function joinTribe(req, res){
 		chatParams.contactIds
 	console.log('=> joinTribe: typeToSend', typeToSend)
 	console.log('=> joinTribe: contactIdsToSend', contactIdsToSend)
+	// set my alias to be the custom one
+	const theOwner = owner.dataValues||owner
+	if(my_alias) theOwner.alias = my_alias
 	network.sendMessage({ // send my data to tribe owner
 		chat: {
 			...chatParams, 
@@ -87,12 +92,12 @@ export async function joinTribe(req, res){
 			members: {
 				[owner.publicKey]: {
 					key: owner.contactKey,
-					alias: owner.alias||''
+					alias: my_alias||owner.alias||''
 				}
 			}
 		},
-		amount:amount||0,
+		amount: amount||0,
-		sender: owner,
+		sender: theOwner,
 		message: {},
 		type: typeToSend,
 		failure: function (e) {
@@ -127,7 +132,7 @@ export async function receiveMemberRequest(payload) {
 	
 	let theSender: any = null
 	const member = chat_members[sender_pub_key]
-	const senderAlias = sender_alias || (member && member.alias) || 'Unknown'
+	const senderAlias = (member && member.alias) || sender_alias || 'Unknown'
 
 	const sender = await models.Contact.findOne({ where: { publicKey: sender_pub_key } })
 	if (sender) {
@@ -137,7 +142,7 @@ export async function receiveMemberRequest(payload) {
 			const createdContact = await models.Contact.create({
 				publicKey: sender_pub_key,
 				contactKey: member.key,
-				alias: senderAlias,
+				alias: sender_alias || senderAlias,
 				status: 1,
 				fromGroup: true,
 				photoUrl: sender_photo_url
@@ -153,6 +158,7 @@ export async function receiveMemberRequest(payload) {
 		role: constants.chat_roles.reader,
 		status: constants.chat_statuses.pending,
 		lastActive: date,
+		lastAlias: senderAlias,
 	})
 	// maybe check here manually????
 	try{
@@ -162,6 +168,7 @@ export async function receiveMemberRequest(payload) {
 			role: constants.chat_roles.reader,
 			status: constants.chat_statuses.pending,
 			lastActive: date,
+			lastAlias: senderAlias,
 		})
 	} catch(e){}
 
@@ -175,7 +182,7 @@ export async function receiveMemberRequest(payload) {
 		network_type
 	}
 	if(isTribe) {
-		msg.senderAlias = sender_alias
+		msg.senderAlias = senderAlias
 		msg.senderPic = sender_photo_url
 	}
 	const message = await models.Message.create(msg)
@@ -318,7 +325,7 @@ export async function approveOrRejectMember(req,res) {
 }
 
 export async function receiveMemberApprove(payload) {
-	console.log('=> receiveMemberApprove')
+	console.log('=> receiveMemberApprove') // received by the joiner only
 	const { owner, chat, chat_name, sender, network_type } = await helpers.parseReceiveParams(payload)
 	if(!chat) return console.log('no chat')
 	await chat.update({status: constants.chat_statuses.approved})
@@ -345,18 +352,21 @@ export async function receiveMemberApprove(payload) {
 
 	const amount = chat.priceToJoin||0
 	const theChat = chat.dataValues||chat
+	const theOwner = owner.dataValues||owner
+	const theAlias = chat.myAlias || owner.alias
+	if(theAlias) theOwner.alias = theAlias
 	// send JOIN and my info to all 
 	network.sendMessage({
 		chat: { ...theChat, 
 			members: {
 				[owner.publicKey]: {
 					key: owner.contactKey,
-					alias: owner.alias||''
+					alias: theAlias||''
 				}
 			}
 		},
 		amount,
-		sender: owner,
+		sender: theOwner,
 		message: {},
 		type: constants.message_types.group_join,
 	})

src/models/ts/chatMember.ts

@@ -26,4 +26,7 @@ export default class ChatMember extends Model<ChatMember> {
   @Column
   status: number
 
+  @Column
+  lastAlias: string
+
 }

src/network/receive.ts

@@ -83,8 +83,10 @@ async function onReceive(payload){
 		const needsPricePerMessage = typesThatNeedPricePerMessage.includes(payload.type)
 		// CHECK THEY ARE IN THE GROUP if message
 		const senderContact = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}})
+		if(!senderContact) return // need sender contact!
+		const senderContactId = senderContact.id
 		if(needsPricePerMessage) {
-			const senderMember = senderContact && await models.ChatMember.findOne({where:{contactId:senderContact.id, chatId:chat.id}})
+			const senderMember = await models.ChatMember.findOne({where:{contactId:senderContactId, chatId:chat.id}})
 			if(!senderMember) doAction=false
 		}
 		// CHECK PRICES
@@ -96,7 +98,7 @@ async function onReceive(payload){
 				timers.addTimer({ // pay them back
 					amount: chat.escrowAmount, 
 					millis:chat.escrowMillis,
-					receiver: senderContact.id,
+					receiver: senderContactId,
 					msgId: payload.message.id,
 					chatId: chat.id,
 				})
@@ -106,7 +108,7 @@ async function onReceive(payload){
 		if(payload.type===msgtypes.group_join) {
 			if(payload.message.amount<chat.priceToJoin) doAction=false
 			if(chat.private) { // check if has been approved
-				const senderMember = senderContact && await models.ChatMember.findOne({where:{contactId:senderContact.id, chatId:chat.id}})
+				const senderMember = await models.ChatMember.findOne({where:{contactId:senderContactId, chatId:chat.id}})
 				if(!(senderMember && senderMember.status===constants.chat_statuses.approved)){
 					doAction=false // dont let if private and not approved
 				}
@@ -118,7 +120,7 @@ async function onReceive(payload){
 			if(payload.message.uuid) {
 				const ogMsg = await models.Message.findOne({where:{
 					uuid: payload.message.uuid,
-					sender: senderContact.id,
+					sender: senderContactId,
 				}})
 				if(ogMsg) doAction = true
 			}
@@ -194,6 +196,9 @@ async function doTheAction(data){
 async function forwardMessageToTribe(ogpayload, sender, realSatsContactId, amtToForwardToRealSatsContactId){
 	// console.log('forwardMessageToTribe')
 	const chat = await models.Chat.findOne({where:{uuid:ogpayload.chat.uuid}})
+	if(!chat) return
+
+	const senderContactId = sender.id // og msg sender
 
 	let payload
 	if(sender && typesToModify.includes(ogpayload.type)){
@@ -201,25 +206,41 @@ async function forwardMessageToTribe(ogpayload, sender, realSatsContactId, amtTo
 	} else {
 		payload = ogpayload
 	}
-	// dont need sender beyond here
 
-	//const sender = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}})
 	const owner = await models.Contact.findOne({where:{isOwner:true}})
 	const type = payload.type
 	const message = payload.message
 	// HERE: NEED TO MAKE SURE ALIAS IS UNIQUE
 	// ASK xref TABLE and put alias there too?
+
+	const owner_alias = chat.myAlias || owner.alias
+	const sender_alias = payload.sender&&payload.sender.alias
+	let final_sender_alias = sender_alias
+	const chatMembers = await models.ChatMember.findAll({where:{chatId:chat.id}})
+	if(!(chatMembers && chatMembers.length)) return
+	asyncForEach(chatMembers, (cm)=>{
+		if(cm.contactId===senderContactId) return // dont check against self of course
+		if(sender_alias===cm.lastAlias || sender_alias===owner_alias) {
+			// impersonating! switch it up!
+			final_sender_alias = `${sender_alias}_2`
+		}
+	})
+	if(sender_alias!==final_sender_alias) {
+		const theChatMember = await models.ChatMember.findOne({where:{chatId:chat.id,contactId:senderContactId}})
+		await theChatMember.update({lastAlias:final_sender_alias})
+	}
+
 	sendMessage({
 		type, message,
 		sender: {
 			...owner.dataValues,
-			alias: (payload.sender&&payload.sender.alias) || '',
+			alias: final_sender_alias || '',
 			photoUrl: (payload.sender&&payload.sender.photo_url) || '',
 			role: constants.chat_roles.reader,
 		},
 		amount: amtToForwardToRealSatsContactId||0,
 		chat: chat,
-		skipPubKey: payload.sender.pub_key, 
+		skipPubKey: payload.sender.pub_key, // dont forward back to self
 		realSatsContactId,
 		success: ()=>{},
 		receive: ()=>{},
@@ -386,3 +407,9 @@ function weave(p){
 		return payload
 	}
 }
+
+async function asyncForEach(array, callback) {
+	for (let index = 0; index < array.length; index++) {
+	  	await callback(array[index], index, array);
+	}
+}

src/network/send.ts

@@ -105,7 +105,7 @@ export async function sendMessage(params) {
 			console.log("KEYSEND ERROR", e)
 			no = e
 		}
-		await sleep(2)
+		await sleep(10)
 	})
 	if(no){
 		if(failure) failure(no)

src/utils/setup.ts

@@ -38,6 +38,8 @@ async function setVersion() {
 
 async function migrate() {
 
+  addTableColumn('sphinx_chat_members', 'last_alias')
+
   addTableColumn('sphinx_chats', 'my_photo_url')
   addTableColumn('sphinx_chats', 'my_alias')