finished

api/controllers/media.ts

@@ -175,7 +175,6 @@ const purchase = async (req, res) => {
     return resUtils.failure(res, e.message)
   }
 
-  console.log('purchase!')
   const owner = await models.Contact.findOne({ where: { isOwner: true }})
   const chat = await helpers.findOrCreateChat({
     chat_id,
@@ -247,11 +246,7 @@ const receivePurchase = async (payload) => {
   // if sats forwarded from tribe owner, for the >1 time
   // dont need to send back token, because admin already has it
   if(isTribe && skip_payment_processing) {
-    console.log('=========================')
     return console.log('=> skip payment processing')
-  } else {
-    console.log('=========================')
-    console.log("RETURN THE FULL MEDIA KEY")
   }
 
   const muid = mediaToken && mediaToken.split('.').length && mediaToken.split('.')[1]

api/network/modify.ts

@@ -34,7 +34,6 @@ export async function purchaseFromOriginalSender(payload, chat, purchaser){
   if(!muid) return
 
   const mediaKey = await models.MediaKey.findOne({where:{originalMuid:muid}})
-  console.log("MEDIA KEY FOUND",mediaKey&&mediaKey.dataValues)
 
   const terms = parseLDAT(mt)
   let price = terms.meta && terms.meta.amt
@@ -55,7 +54,6 @@ export async function purchaseFromOriginalSender(payload, chat, purchaser){
       originalMuid:mediaKey.originalMuid,
       mediaType:mediaKey.mediaType
     }
-    console.log('send the thingy')
     sendMessage({
       chat: {...chat.dataValues, contactIds:[purchaser.id]}, // the merchant id
       sender: owner,
@@ -65,7 +63,6 @@ export async function purchaseFromOriginalSender(payload, chat, purchaser){
       failure: ()=>{}
     })
     // PAY THE OG POSTER HERE!!!
-    console.log('pay the dude')
     sendMessage({
       chat: {...chat.dataValues, contactIds:[mediaKey.sender]},
       sender: owner,
@@ -80,6 +77,7 @@ export async function purchaseFromOriginalSender(payload, chat, purchaser){
     })
   } else {
     const ogmsg = await models.Message.findOne({where:{chatId:chat.id,mediaToken:mt}})
+    if(!ogmsg) return
     // purchase it from creator (send "purchase")
     const msg={mediaToken:mt,purchaser:purchaser.id}
     sendMessage({
@@ -116,7 +114,6 @@ export async function sendFinalMemeIfFirstPurchaser(payload, chat, sender){
   const ogPurchaser = await models.Contact.findOne({where:{
     id: purchaserID
   }})
-  console.log("OG PURCHASER", ogPurchaser.dataValues)
 
   if(!ogPurchaser) return
 

api/network/receive.ts

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

dist/api/controllers/media.js

@@ -154,7 +154,6 @@ const purchase = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     catch (e) {
         return resUtils.failure(res, e.message);
     }
-    console.log('purchase!');
     const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
     const chat = yield helpers.findOrCreateChat({
         chat_id,
@@ -218,13 +217,8 @@ const receivePurchase = (payload) => __awaiter(void 0, void 0, void 0, function*
     // if sats forwarded from tribe owner, for the >1 time
     // dont need to send back token, because admin already has it
     if (isTribe && skip_payment_processing) {
-        console.log('=========================');
         return console.log('=> skip payment processing');
     }
-    else {
-        console.log('=========================');
-        console.log("RETURN THE FULL MEDIA KEY");
-    }
     const muid = mediaToken && mediaToken.split('.').length && mediaToken.split('.')[1];
     if (!muid) {
         return console.log('no muid');

dist/api/network/modify.js

@@ -48,7 +48,6 @@ function purchaseFromOriginalSender(payload, chat, purchaser) {
         if (!muid)
             return;
         const mediaKey = yield models_1.models.MediaKey.findOne({ where: { originalMuid: muid } });
-        console.log("MEDIA KEY FOUND", mediaKey && mediaKey.dataValues);
         const terms = ldat_1.parseLDAT(mt);
         let price = terms.meta && terms.meta.amt;
         if (amount < price)
@@ -67,7 +66,6 @@ function purchaseFromOriginalSender(payload, chat, purchaser) {
                 originalMuid: mediaKey.originalMuid,
                 mediaType: mediaKey.mediaType
             };
-            console.log('send the thingy');
             send_1.sendMessage({
                 chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [purchaser.id] }),
                 sender: owner,
@@ -77,7 +75,6 @@ function purchaseFromOriginalSender(payload, chat, purchaser) {
                 failure: () => { }
             });
             // PAY THE OG POSTER HERE!!!
-            console.log('pay the dude');
             send_1.sendMessage({
                 chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [mediaKey.sender] }),
                 sender: owner,
@@ -93,6 +90,8 @@ function purchaseFromOriginalSender(payload, chat, purchaser) {
         }
         else {
             const ogmsg = yield models_1.models.Message.findOne({ where: { chatId: chat.id, mediaToken: mt } });
+            if (!ogmsg)
+                return;
             // purchase it from creator (send "purchase")
             const msg = { mediaToken: mt, purchaser: purchaser.id };
             send_1.sendMessage({
@@ -128,7 +127,6 @@ function sendFinalMemeIfFirstPurchaser(payload, chat, sender) {
         const ogPurchaser = yield models_1.models.Contact.findOne({ where: {
                 id: purchaserID
             } });
-        console.log("OG PURCHASER", ogPurchaser.dataValues);
         if (!ogPurchaser)
             return;
         const amt = (terms.meta && terms.meta.amt) || 0;

dist/api/network/receive.js

@@ -38,8 +38,6 @@ 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.type, payload.message);
-        console.log('>>.>>', payload.sender && payload.sender.pub_key);
         let doAction = true;
         const toAddIn = {};
         const isTribe = payload.chat && payload.chat.type === constants.chat_types.tribe;