diff --git a/dist/src/controllers/chatTribes.js b/dist/src/controllers/chatTribes.js index 46b6af2..217fb33 100644 --- a/dist/src/controllers/chatTribes.js +++ b/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, }); diff --git a/dist/src/controllers/chatTribes.js.map b/dist/src/controllers/chatTribes.js.map index 6fd3d2f..45cef41 100644 --- a/dist/src/controllers/chatTribes.js.map +++ b/dist/src/controllers/chatTribes.js.map @@ -1 +1 @@ -{"version":3,"file":"chatTribes.js","sourceRoot":"","sources":["../../../src/controllers/chatTribes.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"chatTribes.js","sourceRoot":"","sources":["../../../src/controllers/chatTribes.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/models/ts/chatMember.js b/dist/src/models/ts/chatMember.js index 1de5afe..7a6b552 100644 --- a/dist/src/models/ts/chatMember.js +++ b/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'] } diff --git a/dist/src/models/ts/chatMember.js.map b/dist/src/models/ts/chatMember.js.map index bfb4af6..7d839a6 100644 --- a/dist/src/models/ts/chatMember.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/dist/src/network/receive.js b/dist/src/network/receive.js index 924b7be..ab6d560 100644 --- a/dist/src/network/receive.js +++ b/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 \ No newline at end of file diff --git a/dist/src/network/receive.js.map b/dist/src/network/receive.js.map index 1f51096..8971263 100644 --- a/dist/src/network/receive.js.map +++ b/dist/src/network/receive.js.map @@ -1 +1 @@ -{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../../src/network/receive.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../../src/network/receive.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/network/send.js b/dist/src/network/send.js index 47a57e4..06ffb84 100644 --- a/dist/src/network/send.js +++ b/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) diff --git a/dist/src/network/send.js.map b/dist/src/network/send.js.map index 546991a..3d7c180 100644 --- a/dist/src/network/send.js.map +++ b/dist/src/network/send.js.map @@ -1 +1 @@ -{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/network/send.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/network/send.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/utils/setup.js b/dist/src/utils/setup.js index 09459ec..034382c 100644 --- a/dist/src/utils/setup.js +++ b/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'); diff --git a/dist/src/utils/setup.js.map b/dist/src/utils/setup.js.map index b756d67..3e8cfb8 100644 --- a/dist/src/utils/setup.js.map +++ b/dist/src/utils/setup.js.map @@ -1 +1 @@ -{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/utils/setup.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/utils/setup.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/controllers/chatTribes.ts b/src/controllers/chatTribes.ts index c01a64c..1cbf6d3 100644 --- a/src/controllers/chatTribes.ts +++ b/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, - sender: owner, + amount: amount||0, + 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, }) diff --git a/src/models/ts/chatMember.ts b/src/models/ts/chatMember.ts index 4a6ea79..71f64c3 100644 --- a/src/models/ts/chatMember.ts +++ b/src/models/ts/chatMember.ts @@ -26,4 +26,7 @@ export default class ChatMember extends Model { @Column status: number + @Column + lastAlias: string + } \ No newline at end of file diff --git a/src/network/receive.ts b/src/network/receive.ts index afd2918..2faed26 100644 --- a/src/network/receive.ts +++ b/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{ + 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); + } +} \ No newline at end of file diff --git a/src/network/send.ts b/src/network/send.ts index e297437..08846d0 100644 --- a/src/network/send.ts +++ b/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) diff --git a/src/utils/setup.ts b/src/utils/setup.ts index 28a6770..d55a763 100644 --- a/src/utils/setup.ts +++ b/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')