From 9500436220709781c6c4ac6fc34f62d261fba525 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Thu, 3 Dec 2020 15:56:33 -0800 Subject: [PATCH] dont send the unique alias/pic if u are tribe admin and forwarding --- dist/src/controllers/chatTribes.js | 3 ++- dist/src/controllers/chatTribes.js.map | 2 +- dist/src/network/send.js | 8 ++++---- dist/src/network/send.js.map | 2 +- src/controllers/chatTribes.ts | 3 ++- src/network/send.ts | 8 ++++---- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dist/src/controllers/chatTribes.js b/dist/src/controllers/chatTribes.js index dc55cae..46b6af2 100644 --- a/dist/src/controllers/chatTribes.js +++ b/dist/src/controllers/chatTribes.js @@ -462,7 +462,8 @@ function replayChatHistory(chat, contact) { } } } - let msg = network.newmsg(m.type, chat, sender, Object.assign(Object.assign(Object.assign(Object.assign({ content }, mediaKeyMap && { mediaKey: mediaKeyMap }), newMediaTerms && { mediaToken: newMediaTerms }), m.mediaType && { mediaType: m.mediaType }), dateString && { date: dateString })); + const isForwarded = true; + let msg = network.newmsg(m.type, chat, sender, Object.assign(Object.assign(Object.assign(Object.assign({ content }, mediaKeyMap && { mediaKey: mediaKeyMap }), newMediaTerms && { mediaToken: newMediaTerms }), m.mediaType && { mediaType: m.mediaType }), dateString && { date: dateString }), isForwarded); msg = yield msg_1.decryptMessage(msg, chat); const data = yield msg_1.personalizeMessage(msg, contact, true); const mqttTopic = `${contact.publicKey}/${chat.uuid}`; diff --git a/dist/src/controllers/chatTribes.js.map b/dist/src/controllers/chatTribes.js.map index 715482c..6fd3d2f 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/network/send.js b/dist/src/network/send.js index d13678e..47a57e4 100644 --- a/dist/src/network/send.js +++ b/dist/src/network/send.js @@ -29,7 +29,7 @@ function sendMessage(params) { if (isTribeOwner && !isForwarded) { theSender = Object.assign(Object.assign({}, (sender.dataValues || sender)), { role: constants_1.default.chat_roles.owner }); } - let msg = newmsg(type, chat, theSender, message); + let msg = newmsg(type, chat, theSender, message, isForwarded); // console.log("=> MSG TO SEND",msg) // console.log(type,message) if (!(sender && sender.publicKey)) { @@ -164,16 +164,16 @@ function checkIfAutoConfirm(data) { confirmations_1.tribeOwnerAutoConfirmation(data.message.id, data.chat.uuid); } } -function newmsg(type, chat, sender, message) { +function newmsg(type, chat, sender, message, isForwarded) { const includeGroupKey = type === constants_1.default.message_types.group_create || type === constants_1.default.message_types.group_invite; const includeAlias = sender && sender.alias && chat.type === constants_1.default.chat_types.tribe; let aliasToInclude = sender.alias; - if (includeAlias && chat.myAlias) { + if (!isForwarded && includeAlias && chat.myAlias) { aliasToInclude = chat.myAlias; } const includePhotoUrl = sender && sender.photoUrl && !sender.privatePhoto && chat && chat.type === constants_1.default.chat_types.tribe; let photoUrlToInclude = sender.photoUrl; - if (includePhotoUrl && chat.myPhotoUrl) { + if (!isForwarded && includePhotoUrl && chat.myPhotoUrl) { photoUrlToInclude = chat.myPhotoUrl; } return { diff --git a/dist/src/network/send.js.map b/dist/src/network/send.js.map index 6c486d0..546991a 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/src/controllers/chatTribes.ts b/src/controllers/chatTribes.ts index 9a7bb31..c01a64c 100644 --- a/src/controllers/chatTribes.ts +++ b/src/controllers/chatTribes.ts @@ -464,13 +464,14 @@ export async function replayChatHistory(chat, contact) { } } } + const isForwarded = true let msg = network.newmsg(m.type, chat, sender, { content, // replaced with the remoteMessageContent (u are owner) {} ...mediaKeyMap && {mediaKey: mediaKeyMap}, ...newMediaTerms && {mediaToken: newMediaTerms}, ...m.mediaType && {mediaType: m.mediaType}, ...dateString && {date: dateString} - }) + }, isForwarded) msg = await decryptMessage(msg, chat) const data = await personalizeMessage(msg, contact, true) const mqttTopic = `${contact.publicKey}/${chat.uuid}` diff --git a/src/network/send.ts b/src/network/send.ts index 6ec0ea5..e297437 100644 --- a/src/network/send.ts +++ b/src/network/send.ts @@ -21,7 +21,7 @@ export async function sendMessage(params) { if(isTribeOwner && !isForwarded) { theSender = {...(sender.dataValues||sender), role:constants.chat_roles.owner} } - let msg = newmsg(type, chat, theSender, message) + let msg = newmsg(type, chat, theSender, message, isForwarded) // console.log("=> MSG TO SEND",msg) @@ -156,16 +156,16 @@ function checkIfAutoConfirm(data){ } } -export function newmsg(type, chat, sender, message){ +export function newmsg(type, chat, sender, message, isForwarded:boolean){ const includeGroupKey = type===constants.message_types.group_create || type===constants.message_types.group_invite const includeAlias = sender && sender.alias && chat.type===constants.chat_types.tribe let aliasToInclude = sender.alias - if(includeAlias && chat.myAlias) { + if(!isForwarded && includeAlias && chat.myAlias) { aliasToInclude = chat.myAlias } const includePhotoUrl = sender && sender.photoUrl && !sender.privatePhoto && chat && chat.type===constants.chat_types.tribe let photoUrlToInclude = sender.photoUrl - if(includePhotoUrl && chat.myPhotoUrl) { + if(!isForwarded && includePhotoUrl && chat.myPhotoUrl) { photoUrlToInclude = chat.myPhotoUrl } return {