dont send the unique alias/pic if u are tribe admin and forwarding

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}`;

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 {

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}`

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 {