Merge pull request #117 from stakwork/sender_pic

Sender pic

dist/src/controllers/bots.js

@@ -308,6 +308,7 @@ function receiveBotRes(payload) {
         const action = dat.action;
         const bot_name = dat.bot_name;
         const sender_alias = dat.sender.alias;
+        const sender_pic = dat.sender_photo_url;
         const date_string = dat.message.date;
         const network_type = dat.network_type || 0;
         if (!chat_uuid)
@@ -350,6 +351,7 @@ function receiveBotRes(payload) {
                 createdAt: date,
                 updatedAt: date,
                 senderAlias: sender_alias || 'Bot',
+                senderPic: sender_pic,
                 network_type
             };
             const message = yield models_1.models.Message.create(msg);

dist/src/controllers/chatTribes.js

@@ -119,7 +119,7 @@ exports.joinTribe = joinTribe;
 function receiveMemberRequest(payload) {
     return __awaiter(this, void 0, void 0, function* () {
         console.log('=> receiveMemberRequest');
-        const { sender_pub_key, sender_alias, chat_uuid, chat_members, chat_type, isTribeOwner, network_type } = yield helpers.parseReceiveParams(payload);
+        const { sender_pub_key, sender_alias, chat_uuid, chat_members, chat_type, isTribeOwner, network_type, sender_photo_url } = yield helpers.parseReceiveParams(payload);
         const chat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } });
         if (!chat)
             return console.log('no chat');
@@ -143,6 +143,7 @@ function receiveMemberRequest(payload) {
                     alias: senderAlias,
                     status: 1,
                     fromGroup: true,
+                    photoUrl: sender_photo_url
                 });
                 theSender = createdContact;
             }
@@ -178,6 +179,7 @@ function receiveMemberRequest(payload) {
         };
         if (isTribe) {
             msg.senderAlias = sender_alias;
+            msg.senderPic = sender_photo_url;
         }
         const message = yield models_1.models.Message.create(msg);
         const theChat = yield addPendingContactIdsToChat(chat);
@@ -435,7 +437,7 @@ function replayChatHistory(chat, contact) {
             asyncForEach(msgs, (m) => __awaiter(this, void 0, void 0, function* () {
                 if (!network.typesToReplay.includes(m.type))
                     return; // only for message for now
-                const sender = Object.assign(Object.assign(Object.assign({}, owner.dataValues), m.senderAlias && { alias: m.senderAlias }), { role: constants_1.default.chat_roles.reader });
+                const sender = Object.assign(Object.assign(Object.assign(Object.assign({}, owner.dataValues), m.senderAlias && { alias: m.senderAlias }), { role: constants_1.default.chat_roles.reader }), m.senderPic && { photoUrl: m.senderPic });
                 let content = '';
                 try {
                     content = JSON.parse(m.remoteMessageContent);

dist/src/controllers/chats.js

@@ -319,7 +319,7 @@ exports.deleteChat = (req, res) => __awaiter(void 0, void 0, void 0, function* (
 function receiveGroupJoin(payload) {
     return __awaiter(this, void 0, void 0, function* () {
         console.log('=> receiveGroupJoin');
-        const { sender_pub_key, sender_alias, chat_uuid, chat_members, chat_type, isTribeOwner, date_string, network_type } = yield helpers.parseReceiveParams(payload);
+        const { sender_pub_key, sender_alias, chat_uuid, chat_members, chat_type, isTribeOwner, date_string, network_type, sender_photo_url } = yield helpers.parseReceiveParams(payload);
         const chat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } });
         if (!chat)
             return;
@@ -353,6 +353,7 @@ function receiveGroupJoin(payload) {
                         alias: senderAlias,
                         status: 1,
                         fromGroup: true,
+                        photoUrl: sender_photo_url
                     });
                     theSender = createdContact;
                     contactIds.push(createdContact.id);
@@ -392,6 +393,7 @@ function receiveGroupJoin(payload) {
         };
         if (isTribe) {
             msg.senderAlias = sender_alias;
+            msg.senderPic = sender_photo_url;
         }
         const message = yield models_1.models.Message.create(msg);
         const theChat = yield chatTribes_1.addPendingContactIdsToChat(chat);
@@ -409,7 +411,7 @@ exports.receiveGroupJoin = receiveGroupJoin;
 function receiveGroupLeave(payload) {
     return __awaiter(this, void 0, void 0, function* () {
         console.log('=> receiveGroupLeave');
-        const { sender_pub_key, chat_uuid, chat_type, sender_alias, isTribeOwner, date_string, network_type } = yield helpers.parseReceiveParams(payload);
+        const { sender_pub_key, chat_uuid, chat_type, sender_alias, isTribeOwner, date_string, network_type, sender_photo_url } = yield helpers.parseReceiveParams(payload);
         const chat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } });
         if (!chat)
             return;
@@ -453,6 +455,7 @@ function receiveGroupLeave(payload) {
         };
         if (isTribe) {
             msg.senderAlias = sender_alias;
+            msg.senderPic = sender_photo_url;
         }
         const message = yield models_1.models.Message.create(msg);
         socket.sendJson({

dist/src/controllers/invoices.js

@@ -207,7 +207,7 @@ exports.receiveInvoice = (payload) => __awaiter(void 0, void 0, void 0, function
     const network_type = dat.network_type || 0;
     var date = new Date();
     date.setMilliseconds(0);
-    const { owner, sender, chat, msg_id, chat_type, sender_alias, msg_uuid } = yield helpers.parseReceiveParams(payload);
+    const { owner, sender, chat, msg_id, chat_type, sender_alias, msg_uuid, sender_photo_url } = yield helpers.parseReceiveParams(payload);
     if (!owner || !sender || !chat) {
         return console.log('=> no group chat!');
     }
@@ -233,6 +233,7 @@ exports.receiveInvoice = (payload) => __awaiter(void 0, void 0, void 0, function
     const isTribe = chat_type === constants_1.default.chat_types.tribe;
     if (isTribe) {
         msg.senderAlias = sender_alias;
+        msg.senderPic = sender_photo_url;
     }
     const message = yield models_1.models.Message.create(msg);
     console.log('received keysend invoice message', message.id);

dist/src/controllers/media.js

@@ -391,7 +391,7 @@ exports.receiveAttachment = (payload) => __awaiter(void 0, void 0, void 0, funct
     // console.log('received attachment', { payload })
     var date = new Date();
     date.setMilliseconds(0);
-    const { owner, sender, chat, mediaToken, mediaKey, mediaType, content, msg_id, chat_type, sender_alias, msg_uuid, reply_uuid, network_type } = yield helpers.parseReceiveParams(payload);
+    const { owner, sender, chat, mediaToken, mediaKey, mediaType, content, msg_id, chat_type, sender_alias, msg_uuid, reply_uuid, network_type, sender_photo_url } = yield helpers.parseReceiveParams(payload);
     if (!owner || !sender || !chat) {
         return console.log('=> no group chat!');
     }
@@ -418,6 +418,7 @@ exports.receiveAttachment = (payload) => __awaiter(void 0, void 0, void 0, funct
     const isTribe = chat_type === constants_1.default.chat_types.tribe;
     if (isTribe) {
         msg.senderAlias = sender_alias;
+        msg.senderPic = sender_photo_url;
     }
     const message = yield models_1.models.Message.create(msg);
     // console.log('saved attachment', message.dataValues)

dist/src/controllers/messages.js

@@ -217,7 +217,7 @@ exports.sendMessage = (req, res) => __awaiter(void 0, void 0, void 0, function*
 });
 exports.receiveMessage = (payload) => __awaiter(void 0, void 0, void 0, function* () {
     // console.log('received message', { payload })
-    const { owner, sender, chat, content, remote_content, msg_id, chat_type, sender_alias, msg_uuid, date_string, reply_uuid, amount, network_type } = yield helpers.parseReceiveParams(payload);
+    const { owner, sender, chat, content, remote_content, msg_id, chat_type, sender_alias, msg_uuid, date_string, reply_uuid, amount, network_type, sender_photo_url } = yield helpers.parseReceiveParams(payload);
     if (!owner || !sender || !chat) {
         return console.log('=> no group chat!');
     }
@@ -242,6 +242,7 @@ exports.receiveMessage = (payload) => __awaiter(void 0, void 0, void 0, function
     const isTribe = chat_type === constants_1.default.chat_types.tribe;
     if (isTribe) {
         msg.senderAlias = sender_alias;
+        msg.senderPic = sender_photo_url;
         if (remote_content)
             msg.remoteMessageContent = remote_content;
     }
@@ -257,7 +258,7 @@ exports.receiveMessage = (payload) => __awaiter(void 0, void 0, void 0, function
     confirmations_1.sendConfirmation({ chat: theChat, sender: owner, msg_id });
 });
 exports.receiveBoost = (payload) => __awaiter(void 0, void 0, void 0, function* () {
-    const { owner, sender, chat, content, remote_content, chat_type, sender_alias, msg_uuid, date_string, reply_uuid, amount, network_type } = yield helpers.parseReceiveParams(payload);
+    const { owner, sender, chat, content, remote_content, chat_type, sender_alias, msg_uuid, date_string, reply_uuid, amount, network_type, sender_photo_url } = yield helpers.parseReceiveParams(payload);
     console.log('=> received boost ' + amount + ' sats on network:', network_type);
     if (!owner || !sender || !chat) {
         return console.log('=> no group chat!');
@@ -283,6 +284,7 @@ exports.receiveBoost = (payload) => __awaiter(void 0, void 0, void 0, function*
     const isTribe = chat_type === constants_1.default.chat_types.tribe;
     if (isTribe) {
         msg.senderAlias = sender_alias;
+        msg.senderPic = sender_photo_url;
         if (remote_content)
             msg.remoteMessageContent = remote_content;
     }

dist/src/controllers/payment.js

@@ -116,7 +116,7 @@ exports.receivePayment = (payload) => __awaiter(void 0, void 0, void 0, function
     console.log('received payment', { payload });
     var date = new Date();
     date.setMilliseconds(0);
-    const { owner, sender, chat, amount, content, mediaType, mediaToken, chat_type, sender_alias, msg_uuid, reply_uuid, network_type } = yield helpers.parseReceiveParams(payload);
+    const { owner, sender, chat, amount, content, mediaType, mediaToken, chat_type, sender_alias, msg_uuid, reply_uuid, network_type, sender_photo_url } = yield helpers.parseReceiveParams(payload);
     if (!owner || !sender || !chat) {
         return console.log('=> no group chat!');
     }
@@ -140,6 +140,7 @@ exports.receivePayment = (payload) => __awaiter(void 0, void 0, void 0, function
         msg.mediaToken = mediaToken;
     if (chat_type === constants_1.default.chat_types.tribe) {
         msg.senderAlias = sender_alias;
+        msg.senderPic = sender_photo_url;
     }
     if (reply_uuid)
         msg.replyUuid = reply_uuid;

dist/src/helpers.js

@@ -148,7 +148,7 @@ function parseReceiveParams(payload) {
         const dat = payload.content || payload;
         const sender_pub_key = dat.sender.pub_key;
         const sender_alias = dat.sender.alias;
-        const sender_photo_url = dat.sender.photo_url;
+        const sender_photo_url = dat.sender.photo_url || '';
         const chat_uuid = dat.chat.uuid;
         const chat_type = dat.chat.type;
         const chat_members = dat.chat.members || {};

dist/src/models/ts/message.js

@@ -121,6 +121,10 @@ __decorate([
     sequelize_typescript_1.Column,
     __metadata("design:type", String)
 ], Message.prototype, "senderAlias", void 0);
+__decorate([
+    sequelize_typescript_1.Column,
+    __metadata("design:type", String)
+], Message.prototype, "senderPic", void 0);
 __decorate([
     sequelize_typescript_1.Column,
     __metadata("design:type", String)

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

@@ -1 +1 @@
-{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/models/ts/message.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAsE;AAGtE,IAAqB,OAAO,GAA5B,MAAqB,OAAQ,SAAQ,4BAAc;CA8FlD,CAAA;AAtFC;IANC,6BAAM,CAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC;;mCACQ;AAGV;IADC,6BAAM;;qCACK;AAGZ;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;uCACV;AAGd;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;qCACZ;AAGZ;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;uCACV;AAGd;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;yCACR;AAGhB;IADC,6BAAM,CAAC,+BAAQ,CAAC,OAAO,CAAC;;uCACX;AAGd;IADC,6BAAM,CAAC,+BAAQ,CAAC,OAAO,CAAC;;2CACP;AAGlB;IADC,6BAAM;;4CACY;AAGnB;IADC,6BAAM,CAAC,+BAAQ,CAAC,IAAI,CAAC;;+CACA;AAGtB;IADC,6BAAM;8BACD,IAAI;qCAAA;AAGV;IADC,6BAAM;8BACS,IAAI;+CAAA;AAGpB;IADC,6BAAM,CAAC,+BAAQ,CAAC,IAAI,CAAC;;+CACA;AAGtB;IADC,6BAAM,CAAC,+BAAQ,CAAC,IAAI,CAAC;;qDACM;AAG5B;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;uCACV;AAGd;IADC,6BAAM,CAAC,+BAAQ,CAAC,IAAI,CAAC;;0CACL;AAGjB;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;yCACR;AAGhB;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;+CACF;AAGtB;IADC,6BAAM;;yCACS;AAGhB;IADC,6BAAM;;0CACU;AAGjB;IADC,6BAAM;;2CACW;AAOlB;IALC,6BAAM,CAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO;QACtB,YAAY,EAAE,KAAK;QACnB,SAAS,EAAE,KAAK;KACjB,CAAC;;qCACW;AAGb;IADC,6BAAM;8BACI,IAAI;0CAAA;AAGf;IADC,6BAAM;8BACI,IAAI;0CAAA;AAGf;IADC,6BAAM;;4CACY;AAGnB;IADC,6BAAM;;6CACa;AAGpB;IADC,6BAAM;;0CACU;AAGjB;IADC,6BAAM,CAAC,+BAAQ,CAAC,OAAO,CAAC;;6CACL;AA7FD,OAAO;IAD3B,4BAAK,CAAC,EAAC,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,IAAI,EAAC,CAAC;GACpC,OAAO,CA8F3B;kBA9FoB,OAAO"}
+{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/models/ts/message.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAsE;AAGtE,IAAqB,OAAO,GAA5B,MAAqB,OAAQ,SAAQ,4BAAc;CAiGlD,CAAA;AAzFC;IANC,6BAAM,CAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC;;mCACQ;AAGV;IADC,6BAAM;;qCACK;AAGZ;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;uCACV;AAGd;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;qCACZ;AAGZ;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;uCACV;AAGd;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;yCACR;AAGhB;IADC,6BAAM,CAAC,+BAAQ,CAAC,OAAO,CAAC;;uCACX;AAGd;IADC,6BAAM,CAAC,+BAAQ,CAAC,OAAO,CAAC;;2CACP;AAGlB;IADC,6BAAM;;4CACY;AAGnB;IADC,6BAAM,CAAC,+BAAQ,CAAC,IAAI,CAAC;;+CACA;AAGtB;IADC,6BAAM;8BACD,IAAI;qCAAA;AAGV;IADC,6BAAM;8BACS,IAAI;+CAAA;AAGpB;IADC,6BAAM,CAAC,+BAAQ,CAAC,IAAI,CAAC;;+CACA;AAGtB;IADC,6BAAM,CAAC,+BAAQ,CAAC,IAAI,CAAC;;qDACM;AAG5B;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;uCACV;AAGd;IADC,6BAAM,CAAC,+BAAQ,CAAC,IAAI,CAAC;;0CACL;AAGjB;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;yCACR;AAGhB;IADC,6BAAM,CAAC,+BAAQ,CAAC,MAAM,CAAC;;+CACF;AAGtB;IADC,6BAAM;;yCACS;AAGhB;IADC,6BAAM;;0CACU;AAGjB;IADC,6BAAM;;2CACW;AAOlB;IALC,6BAAM,CAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,OAAO;QACtB,YAAY,EAAE,KAAK;QACnB,SAAS,EAAE,KAAK;KACjB,CAAC;;qCACW;AAGb;IADC,6BAAM;8BACI,IAAI;0CAAA;AAGf;IADC,6BAAM;8BACI,IAAI;0CAAA;AAGf;IADC,6BAAM;;4CACY;AAGnB;IADC,6BAAM;;0CACU;AAGjB;IADC,6BAAM;;6CACa;AAGpB;IADC,6BAAM;;0CACU;AAGjB;IADC,6BAAM,CAAC,+BAAQ,CAAC,OAAO,CAAC;;6CACL;AAhGD,OAAO;IAD3B,4BAAK,CAAC,EAAC,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,IAAI,EAAC,CAAC;GACpC,OAAO,CAiG3B;kBAjGoB,OAAO"}

dist/src/network/receive.js

@@ -230,7 +230,7 @@ function forwardMessageToTribe(ogpayload, sender, realSatsContactId, amtToForwar
         // ASK xref TABLE and put alias there too?
         send_1.sendMessage({
             type, message,
-            sender: Object.assign(Object.assign(Object.assign({}, owner.dataValues), payload.sender && payload.sender.alias && { alias: payload.sender.alias }), { role: constants_1.default.chat_roles.reader }),
+            sender: Object.assign(Object.assign(Object.assign(Object.assign({}, owner.dataValues), payload.sender && payload.sender.alias && { alias: payload.sender.alias }), payload.sender && payload.sender.photo_url && { photoUrl: payload.sender.photo_url }), { role: constants_1.default.chat_roles.reader }),
             amount: amtToForwardToRealSatsContactId || 0,
             chat: chat,
             skipPubKey: payload.sender.pub_key,

dist/src/network/send.js

@@ -167,16 +167,12 @@ function checkIfAutoConfirm(data) {
 function newmsg(type, chat, sender, message) {
     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;
-    // const includePhotoUrl = sender && sender.photoUrl && !sender.privatePhoto
+    const includePhotoUrl = sender && sender.photoUrl && !sender.privatePhoto && chat && chat.type === constants_1.default.chat_types.tribe;
     return {
         type: type,
         chat: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ uuid: chat.uuid }, chat.name && { name: chat.name }), (chat.type || chat.type === 0) && { type: chat.type }), chat.members && { members: chat.members }), (includeGroupKey && chat.groupKey) && { groupKey: chat.groupKey }), (includeGroupKey && chat.host) && { host: chat.host }),
         message: message,
-        sender: {
+        sender: Object.assign({ pub_key: sender.publicKey, alias: includeAlias ? sender.alias : '', role: sender.role || constants_1.default.chat_roles.reader }, includePhotoUrl && { photo_url: sender.photoUrl })
-            pub_key: sender.publicKey,
-            alias: includeAlias ? sender.alias : '',
-            role: sender.role || constants_1.default.chat_roles.reader,
-        }
     };
 }
 exports.newmsg = newmsg;

dist/src/utils/setup.js

@@ -49,6 +49,7 @@ function setVersion() {
 }
 function migrate() {
     return __awaiter(this, void 0, void 0, function* () {
+        addTableColumn('sphinx_messages', 'sender_pic');
         addTableColumn('sphinx_messages', 'network_type', 'INTEGER');
         addTableColumn('sphinx_chats', 'meta');
         addTableColumn('sphinx_contacts', 'tip_amount', 'BIGINT');

src/controllers/bots.ts

@@ -298,6 +298,7 @@ export async function receiveBotRes(payload) {
   const action = dat.action
   const bot_name = dat.bot_name
   const sender_alias = dat.sender.alias
+  const sender_pic = dat.sender_photo_url
   const date_string = dat.message.date
   const network_type = dat.network_type||0
 	
@@ -341,6 +342,7 @@ export async function receiveBotRes(payload) {
       createdAt: date,
       updatedAt: date,
       senderAlias: sender_alias || 'Bot',
+      senderPic: sender_pic,
       network_type
     }
     const message = await models.Message.create(msg)

src/controllers/chatTribes.ts

@@ -114,7 +114,7 @@ export async function joinTribe(req, res){
 
 export async function receiveMemberRequest(payload) {
 	console.log('=> receiveMemberRequest')
-	const { sender_pub_key, sender_alias, chat_uuid, chat_members, chat_type, isTribeOwner, network_type } = await helpers.parseReceiveParams(payload)
+	const { sender_pub_key, sender_alias, chat_uuid, chat_members, chat_type, isTribeOwner, network_type, sender_photo_url } = await helpers.parseReceiveParams(payload)
 
 	const chat = await models.Chat.findOne({ where: { uuid: chat_uuid } })
 	if (!chat) return console.log('no chat')
@@ -140,6 +140,7 @@ export async function receiveMemberRequest(payload) {
 				alias: senderAlias,
 				status: 1,
 				fromGroup: true,
+				photoUrl: sender_photo_url
 			})
 			theSender = createdContact
 		}
@@ -175,6 +176,7 @@ export async function receiveMemberRequest(payload) {
 	}
 	if(isTribe) {
 		msg.senderAlias = sender_alias
+		msg.senderPic = sender_photo_url
 	}
 	const message = await models.Message.create(msg)
 
@@ -438,6 +440,7 @@ export async function replayChatHistory(chat, contact) {
 				...owner.dataValues,
 				...m.senderAlias && {alias: m.senderAlias},
 				role: constants.chat_roles.reader,
+				...m.senderPic && {photoUrl: m.senderPic}
 			}
 			let content = ''
 			try {content = JSON.parse(m.remoteMessageContent)} catch(e) {}

src/controllers/chats.ts

@@ -324,7 +324,7 @@ export const deleteChat = async (req, res) => {
 
 export async function receiveGroupJoin(payload) {
 	console.log('=> receiveGroupJoin')
-	const { sender_pub_key, sender_alias, chat_uuid, chat_members, chat_type, isTribeOwner, date_string, network_type } = await helpers.parseReceiveParams(payload)
+	const { sender_pub_key, sender_alias, chat_uuid, chat_members, chat_type, isTribeOwner, date_string, network_type, sender_photo_url } = await helpers.parseReceiveParams(payload)
 
 	const chat = await models.Chat.findOne({ where: { uuid: chat_uuid } })
 	if (!chat) return
@@ -359,6 +359,7 @@ export async function receiveGroupJoin(payload) {
 					alias: senderAlias,
 					status: 1,
 					fromGroup: true,
+					photoUrl: sender_photo_url
 				})
 				theSender = createdContact
 				contactIds.push(createdContact.id)
@@ -399,6 +400,7 @@ export async function receiveGroupJoin(payload) {
 	}
 	if(isTribe) {
 		msg.senderAlias = sender_alias
+		msg.senderPic = sender_photo_url
 	}
 	const message = await models.Message.create(msg)
 
@@ -415,7 +417,7 @@ export async function receiveGroupJoin(payload) {
 
 export async function receiveGroupLeave(payload) {
 	console.log('=> receiveGroupLeave')
-	const { sender_pub_key, chat_uuid, chat_type, sender_alias, isTribeOwner, date_string, network_type } = await helpers.parseReceiveParams(payload)
+	const { sender_pub_key, chat_uuid, chat_type, sender_alias, isTribeOwner, date_string, network_type, sender_photo_url } = await helpers.parseReceiveParams(payload)
 
 	const chat = await models.Chat.findOne({ where: { uuid: chat_uuid } })
 	if (!chat) return
@@ -461,6 +463,7 @@ export async function receiveGroupLeave(payload) {
 	}
 	if(isTribe) {
 		msg.senderAlias = sender_alias
+		msg.senderPic = sender_photo_url
 	}
 	const message = await models.Message.create(msg)
 

src/controllers/invoices.ts

@@ -225,7 +225,7 @@ export const receiveInvoice = async (payload) => {
   var date = new Date();
   date.setMilliseconds(0)
 
-  const { owner, sender, chat, msg_id, chat_type, sender_alias, msg_uuid } = await helpers.parseReceiveParams(payload)
+  const { owner, sender, chat, msg_id, chat_type, sender_alias, msg_uuid, sender_photo_url } = await helpers.parseReceiveParams(payload)
   if (!owner || !sender || !chat) {
     return console.log('=> no group chat!')
   }
@@ -252,7 +252,8 @@ export const receiveInvoice = async (payload) => {
   }
   const isTribe = chat_type===constants.chat_types.tribe
 	if(isTribe) {
-		msg.senderAlias = sender_alias
+    msg.senderAlias = sender_alias
+    msg.senderPic = sender_photo_url
 	}
   const message = await models.Message.create(msg)
   console.log('received keysend invoice message', message.id)

src/controllers/media.ts

@@ -429,7 +429,7 @@ export const receiveAttachment = async (payload) => {
   var date = new Date();
   date.setMilliseconds(0)
 
-  const {owner, sender, chat, mediaToken, mediaKey, mediaType, content, msg_id, chat_type, sender_alias, msg_uuid, reply_uuid, network_type} = await helpers.parseReceiveParams(payload)
+  const {owner, sender, chat, mediaToken, mediaKey, mediaType, content, msg_id, chat_type, sender_alias, msg_uuid, reply_uuid, network_type, sender_photo_url} = await helpers.parseReceiveParams(payload)
   if(!owner || !sender || !chat) {
     return console.log('=> no group chat!')
   }
@@ -451,7 +451,8 @@ export const receiveAttachment = async (payload) => {
   if(reply_uuid) msg.replyUuid = reply_uuid
   const isTribe = chat_type===constants.chat_types.tribe
 	if(isTribe) {
-		msg.senderAlias = sender_alias
+    msg.senderAlias = sender_alias
+    msg.senderPic = sender_photo_url
 	}
 
   const message = await models.Message.create(msg)

src/controllers/messages.ts

@@ -244,7 +244,7 @@ export const sendMessage = async (req, res) => {
 export const receiveMessage = async (payload) => {
 	// console.log('received message', { payload })
 
-	const {owner, sender, chat, content, remote_content, msg_id, chat_type, sender_alias, msg_uuid, date_string, reply_uuid, amount, network_type} = await helpers.parseReceiveParams(payload)
+	const {owner, sender, chat, content, remote_content, msg_id, chat_type, sender_alias, msg_uuid, date_string, reply_uuid, amount, network_type, sender_photo_url} = await helpers.parseReceiveParams(payload)
 	if(!owner || !sender || !chat) {
 		return console.log('=> no group chat!')
 	}
@@ -270,6 +270,7 @@ export const receiveMessage = async (payload) => {
 	const isTribe = chat_type===constants.chat_types.tribe
 	if(isTribe) {
 		msg.senderAlias = sender_alias
+		msg.senderPic = sender_photo_url
 		if(remote_content) msg.remoteMessageContent=remote_content
 	}
 	if(reply_uuid) msg.replyUuid = reply_uuid
@@ -287,7 +288,7 @@ export const receiveMessage = async (payload) => {
 }
 
 export const receiveBoost = async (payload) => {
-	const {owner, sender, chat, content, remote_content, chat_type, sender_alias, msg_uuid, date_string, reply_uuid, amount, network_type} = await helpers.parseReceiveParams(payload)
+	const {owner, sender, chat, content, remote_content, chat_type, sender_alias, msg_uuid, date_string, reply_uuid, amount, network_type, sender_photo_url} = await helpers.parseReceiveParams(payload)
 	console.log('=> received boost ' +amount+ ' sats on network:', network_type)
 	if(!owner || !sender || !chat) {
 		return console.log('=> no group chat!')
@@ -314,6 +315,7 @@ export const receiveBoost = async (payload) => {
 	const isTribe = chat_type===constants.chat_types.tribe
 	if(isTribe) {
 		msg.senderAlias = sender_alias
+		msg.senderPic = sender_photo_url
 		if(remote_content) msg.remoteMessageContent=remote_content
 	}
 	if(reply_uuid) msg.replyUuid = reply_uuid

src/controllers/payment.ts

@@ -129,7 +129,7 @@ export const receivePayment = async (payload) => {
   var date = new Date();
   date.setMilliseconds(0)
 
-  const {owner, sender, chat, amount, content, mediaType, mediaToken, chat_type, sender_alias, msg_uuid, reply_uuid, network_type} = await helpers.parseReceiveParams(payload)
+  const {owner, sender, chat, amount, content, mediaType, mediaToken, chat_type, sender_alias, msg_uuid, reply_uuid, network_type, sender_photo_url} = await helpers.parseReceiveParams(payload)
   if(!owner || !sender || !chat) {
     return console.log('=> no group chat!')
   }
@@ -150,7 +150,8 @@ export const receivePayment = async (payload) => {
   if(mediaType) msg.mediaType = mediaType
   if(mediaToken) msg.mediaToken = mediaToken
   if(chat_type===constants.chat_types.tribe) {
-		msg.senderAlias = sender_alias
+    msg.senderAlias = sender_alias
+    msg.senderPic = sender_photo_url
   }
   if(reply_uuid) msg.replyUuid = reply_uuid
   

src/helpers.ts

@@ -134,7 +134,7 @@ export async function parseReceiveParams(payload) {
 	const dat = payload.content || payload
 	const sender_pub_key = dat.sender.pub_key
 	const sender_alias = dat.sender.alias
-	const sender_photo_url = dat.sender.photo_url
+	const sender_photo_url = dat.sender.photo_url || ''
 	const chat_uuid = dat.chat.uuid
 	const chat_type = dat.chat.type
 	const chat_members: { [k: string]: any } = dat.chat.members || {}

src/models/ts/message.ts

@@ -87,6 +87,9 @@ export default class Message extends Model<Message> {
   @Column
   senderAlias: string // for tribes, no "sender" id maybe
 
+  @Column
+  senderPic: string // for tribes, no "sender" id maybe
+
   @Column
   originalMuid: string // for tribe, remember the og muid
 

src/network/receive.ts

@@ -214,6 +214,7 @@ async function forwardMessageToTribe(ogpayload, sender, realSatsContactId, amtTo
 		sender: {
 			...owner.dataValues,
 			...payload.sender&&payload.sender.alias && {alias:payload.sender.alias},
+			...payload.sender&&payload.sender.photo_url && {photoUrl:payload.sender.photo_url}, // camelcase here, this is usually the "sender" from DB
 			role: constants.chat_roles.reader,
 		},
 		amount: amtToForwardToRealSatsContactId||0,

src/network/send.ts

@@ -159,7 +159,7 @@ function checkIfAutoConfirm(data){
 export function newmsg(type, chat, sender, message){
 	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
-	// const includePhotoUrl = sender && sender.photoUrl && !sender.privatePhoto
+	const includePhotoUrl = sender && sender.photoUrl && !sender.privatePhoto && chat && chat.type===constants.chat_types.tribe
 	return {
 		type: type,
 		chat: {
@@ -175,7 +175,7 @@ export function newmsg(type, chat, sender, message){
 			pub_key: sender.publicKey,
 			alias: includeAlias ? sender.alias : '',
 			role: sender.role || constants.chat_roles.reader,
-			// ...includePhotoUrl && {photo_url: sender.photoUrl},
+			...includePhotoUrl && {photo_url: sender.photoUrl},
 			// ...sender.contactKey && {contact_key: sender.contactKey}
 		}
 	}

src/utils/setup.ts

@@ -38,6 +38,8 @@ async function setVersion() {
 
 async function migrate() {
 
+  addTableColumn('sphinx_messages', 'sender_pic')
+
   addTableColumn('sphinx_messages', 'network_type', 'INTEGER')
 
   addTableColumn('sphinx_chats', 'meta')