add purchaser id into the purchase_accpet msg

api/controllers/media.ts

@@ -218,7 +218,7 @@ const receivePurchase = async (payload) => {
   var date = new Date();
   date.setMilliseconds(0)
 
-  const {owner, sender, chat, amount, mediaToken, msg_uuid, chat_type, skip_payment_processing} = await helpers.parseReceiveParams(payload)
+  const {owner, sender, chat, amount, mediaToken, msg_uuid, chat_type, skip_payment_processing, purchaser_id} = await helpers.parseReceiveParams(payload)
   if(!owner || !sender || !chat) {
     return console.log('=> group chat not found!')
   }
@@ -311,15 +311,17 @@ const receivePurchase = async (payload) => {
     meta: {amt:amount},
     pubkey: sender.publicKey,
   })
+  const msgToSend:{[k:string]:any}={
+    mediaToken: theMediaToken,
+    mediaKey: mediaKey.key,
+    mediaType: ogMessage.mediaType,
+  }
+  if(purchaser_id) msgToSend.purchaser=purchaser_id
   network.sendMessage({
     chat: {...chat.dataValues, contactIds:[sender.id]}, // only to sender
     sender: owner,
     type: constants.message_types.purchase_accept,
-    message: {
+    message: msgToSend,
-      mediaToken: theMediaToken,
-      mediaKey: mediaKey.key,
-      mediaType: ogMessage.mediaType,
-    },
     success: async (data) => {
       console.log('purchase_accept sent!')
       const acceptMsg = await models.Message.create({

api/helpers.ts

@@ -153,6 +153,7 @@ async function parseReceiveParams(payload) {
 	const date_string = dat.message.date
 	const skip_payment_processing = dat.message.skipPaymentProcessing
 	const reply_uuid = dat.message.replyUuid
+	const purchaser_id = dat.message.purchaser
 	const isTribeOwner = dat.isTribeOwner?true:false
 
 	const isConversation = !chat_type || (chat_type && chat_type == constants.chat_types.conversation)
@@ -175,7 +176,7 @@ async function parseReceiveParams(payload) {
 		}
 		chat = await models.Chat.findOne({ where: { uuid: chat_uuid } })
 	}
-	return { owner, sender, chat, sender_pub_key, sender_alias, isTribeOwner, chat_uuid, amount, content, mediaToken, mediaKey, mediaType, originalMuid, chat_type, msg_id, chat_members, chat_name, chat_host, chat_key, remote_content, msg_uuid, date_string, reply_uuid, skip_payment_processing }
+	return { owner, sender, chat, sender_pub_key, sender_alias, isTribeOwner, chat_uuid, amount, content, mediaToken, mediaKey, mediaType, originalMuid, chat_type, msg_id, chat_members, chat_name, chat_host, chat_key, remote_content, msg_uuid, date_string, reply_uuid, skip_payment_processing, purchaser_id }
 }
 
 export {

api/network/modify.ts

@@ -78,7 +78,7 @@ export async function purchaseFromOriginalSender(payload, chat, purchaser){
   } else {
     const ogmsg = await models.Message.findOne({where:{chatId:chat.id,mediaToken:mt}})
     // purchase it from creator (send "purchase")
-    const msg={mediaToken:mt}
+    const msg={mediaToken:mt,purchaser:purchaser.id}
     sendMessage({
       chat: {...chat.dataValues, contactIds:[ogmsg.sender]},
       sender: {
@@ -99,6 +99,7 @@ export async function sendFinalMemeIfFirstPurchaser(payload, chat, sender){
 
   const mt = payload.message && payload.message.mediaToken
   const typ = payload.message && payload.message.mediaType
+  const purchaserID = payload.message && payload.message.purchaser
   if(!mt) return
   const muid = mt && mt.split('.').length && mt.split('.')[1]
   if(!muid) return
@@ -110,7 +111,7 @@ export async function sendFinalMemeIfFirstPurchaser(payload, chat, sender){
 
   const terms = parseLDAT(mt)
   const ogPurchaser = await models.Contact.findOne({where:{
-    publicKey: terms.pubkey
+    id: purchaserID
   }})
   console.log("OG PURCHASER", ogPurchaser.dataValues)
 

api/network/receive.ts

@@ -28,7 +28,7 @@ export const typesToReplay=[ // should match typesToForward
 ]
 async function onReceive(payload){
 	// if tribe, owner must forward to MQTT
-	console.log('======> ON RECEIVE',payload.chat&&payload.chat.type)
+	console.log('======> ON RECEIVE',payload.chat&&payload.chat.type,payload.message)
 	let doAction = true
 	const toAddIn:{[k:string]:any} = {}
 	const isTribe = payload.chat && payload.chat.type===constants.chat_types.tribe

dist/api/controllers/media.js

@@ -193,7 +193,7 @@ const receivePurchase = (payload) => __awaiter(void 0, void 0, void 0, function*
     console.log('=> received purchase', { payload });
     var date = new Date();
     date.setMilliseconds(0);
-    const { owner, sender, chat, amount, mediaToken, msg_uuid, chat_type, skip_payment_processing } = yield helpers.parseReceiveParams(payload);
+    const { owner, sender, chat, amount, mediaToken, msg_uuid, chat_type, skip_payment_processing, purchaser_id } = yield helpers.parseReceiveParams(payload);
     if (!owner || !sender || !chat) {
         return console.log('=> group chat not found!');
     }
@@ -280,15 +280,18 @@ const receivePurchase = (payload) => __awaiter(void 0, void 0, void 0, function*
         meta: { amt: amount },
         pubkey: sender.publicKey,
     });
+    const msgToSend = {
+        mediaToken: theMediaToken,
+        mediaKey: mediaKey.key,
+        mediaType: ogMessage.mediaType,
+    };
+    if (purchaser_id)
+        msgToSend.purchaser = purchaser_id;
     network.sendMessage({
         chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] }),
         sender: owner,
         type: constants.message_types.purchase_accept,
-        message: {
+        message: msgToSend,
-            mediaToken: theMediaToken,
-            mediaKey: mediaKey.key,
-            mediaType: ogMessage.mediaType,
-        },
         success: (data) => __awaiter(void 0, void 0, void 0, function* () {
             console.log('purchase_accept sent!');
             const acceptMsg = yield models_1.models.Message.create({

dist/api/helpers.js

@@ -169,6 +169,7 @@ function parseReceiveParams(payload) {
         const date_string = dat.message.date;
         const skip_payment_processing = dat.message.skipPaymentProcessing;
         const reply_uuid = dat.message.replyUuid;
+        const purchaser_id = dat.message.purchaser;
         const isTribeOwner = dat.isTribeOwner ? true : false;
         const isConversation = !chat_type || (chat_type && chat_type == constants.chat_types.conversation);
         let sender;
@@ -189,7 +190,7 @@ function parseReceiveParams(payload) {
             }
             chat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } });
         }
-        return { owner, sender, chat, sender_pub_key, sender_alias, isTribeOwner, chat_uuid, amount, content, mediaToken, mediaKey, mediaType, originalMuid, chat_type, msg_id, chat_members, chat_name, chat_host, chat_key, remote_content, msg_uuid, date_string, reply_uuid, skip_payment_processing };
+        return { owner, sender, chat, sender_pub_key, sender_alias, isTribeOwner, chat_uuid, amount, content, mediaToken, mediaKey, mediaType, originalMuid, chat_type, msg_id, chat_members, chat_name, chat_host, chat_key, remote_content, msg_uuid, date_string, reply_uuid, skip_payment_processing, purchaser_id };
     });
 }
 exports.parseReceiveParams = parseReceiveParams;

dist/api/network/modify.js

@@ -91,7 +91,7 @@ function purchaseFromOriginalSender(payload, chat, purchaser) {
         else {
             const ogmsg = yield models_1.models.Message.findOne({ where: { chatId: chat.id, mediaToken: mt } });
             // purchase it from creator (send "purchase")
-            const msg = { mediaToken: mt };
+            const msg = { mediaToken: mt, purchaser: purchaser.id };
             send_1.sendMessage({
                 chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [ogmsg.sender] }),
                 sender: Object.assign(Object.assign({}, owner.dataValues), purchaser && purchaser.alias && { alias: purchaser.alias }),
@@ -111,6 +111,7 @@ function sendFinalMemeIfFirstPurchaser(payload, chat, sender) {
             return;
         const mt = payload.message && payload.message.mediaToken;
         const typ = payload.message && payload.message.mediaType;
+        const purchaserID = payload.message && payload.message.purchaser;
         if (!mt)
             return;
         const muid = mt && mt.split('.').length && mt.split('.')[1];
@@ -122,7 +123,7 @@ function sendFinalMemeIfFirstPurchaser(payload, chat, sender) {
         // const host = mt.split('.')[0]
         const terms = ldat_1.parseLDAT(mt);
         const ogPurchaser = yield models_1.models.Contact.findOne({ where: {
-                publicKey: terms.pubkey
+                id: purchaserID
             } });
         console.log("OG PURCHASER", ogPurchaser.dataValues);
         if (!ogPurchaser)

dist/api/network/receive.js

@@ -38,7 +38,7 @@ exports.typesToReplay = [
 function onReceive(payload) {
     return __awaiter(this, void 0, void 0, function* () {
         // if tribe, owner must forward to MQTT
-        console.log('======> ON RECEIVE', payload.chat && payload.chat.type);
+        console.log('======> ON RECEIVE', payload.chat && payload.chat.type, payload.message);
         let doAction = true;
         const toAddIn = {};
         const isTribe = payload.chat && payload.chat.type === constants.chat_types.tribe;