Browse Source

Try

feature/dockerfile-arm
Evan Feenstra 5 years ago
parent
commit
4c08cbe531
  1. 9
      api/network/receive.ts
  2. 9
      dist/api/network/receive.js
  3. 2
      dist/api/network/receive.js.map

9
api/network/receive.ts

@ -59,20 +59,17 @@ async function onReceive(payload){
else console.log('=> insufficient payment for this action') else console.log('=> insufficient payment for this action')
} }
if(isTribeOwner && payload.type===msgtypes.purchase) { if(isTribeOwner && payload.type===msgtypes.purchase) {
// if hes purchasing my attachment, just pass thru
const mt = payload.message.mediaToken const mt = payload.message.mediaToken
const myMediaMessage = await models.Message.findOne({ where:{ const myMediaMessage = await models.Message.findOne({ where:{
mediaToken: mt, sender: 1, type:msgtypes.attachment mediaToken: mt, sender: 1, type:msgtypes.attachment
} }) } })
if(!myMediaMessage) { if(!myMediaMessage) { // someone else's attachment
console.log("=> NO MEDIA MESSAGE BY ME, purchaseFromOriginalSender") console.log("=> NO MEDIA MESSAGE BY ME, purchaseFromOriginalSender")
const senderContact = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}}) const senderContact = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}})
purchaseFromOriginalSender(payload, chat, senderContact) purchaseFromOriginalSender(payload, chat, senderContact)
// doAction = false // incoming "purchase" dont save its is a forward
} }
} }
if(isTribeOwner && payload.type===msgtypes.purchase_accept) { if(isTribeOwner && payload.type===msgtypes.purchase_accept) {
// IF I WAS THE PURCHASER, just pass thru
const mt = payload.message.mediaToken const mt = payload.message.mediaToken
const host = mt && mt.split('.').length && mt.split('.')[0] const host = mt && mt.split('.').length && mt.split('.')[0]
const muid = mt && mt.split('.').length && mt.split('.')[1] const muid = mt && mt.split('.').length && mt.split('.')[1]
@ -81,11 +78,11 @@ async function onReceive(payload){
type: msgtypes.purchase, type: msgtypes.purchase,
sender: 1, sender: 1,
}}) }})
if(!ogPurchaseMessage) { if(!ogPurchaseMessage) { // for someone else
console.log("=> NO OG PURCHASE MESSAGE BY ME, sendFinalMemeIfFirstPurchaser") console.log("=> NO OG PURCHASE MESSAGE BY ME, sendFinalMemeIfFirstPurchaser")
const senderContact = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}}) const senderContact = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}})
sendFinalMemeIfFirstPurchaser(payload, chat, senderContact) sendFinalMemeIfFirstPurchaser(payload, chat, senderContact)
// doAction = false // dont store this locally, its for someone else doAction = false
} }
} }
if(doAction) doTheAction({...payload, ...toAddIn}) if(doAction) doTheAction({...payload, ...toAddIn})

9
dist/api/network/receive.js

@ -74,20 +74,17 @@ function onReceive(payload) {
console.log('=> insufficient payment for this action'); console.log('=> insufficient payment for this action');
} }
if (isTribeOwner && payload.type === msgtypes.purchase) { if (isTribeOwner && payload.type === msgtypes.purchase) {
// if hes purchasing my attachment, just pass thru
const mt = payload.message.mediaToken; const mt = payload.message.mediaToken;
const myMediaMessage = yield models_1.models.Message.findOne({ where: { const myMediaMessage = yield models_1.models.Message.findOne({ where: {
mediaToken: mt, sender: 1, type: msgtypes.attachment mediaToken: mt, sender: 1, type: msgtypes.attachment
} }); } });
if (!myMediaMessage) { if (!myMediaMessage) { // someone else's attachment
console.log("=> NO MEDIA MESSAGE BY ME, purchaseFromOriginalSender"); console.log("=> NO MEDIA MESSAGE BY ME, purchaseFromOriginalSender");
const senderContact = yield models_1.models.Contact.findOne({ where: { publicKey: payload.sender.pub_key } }); const senderContact = yield models_1.models.Contact.findOne({ where: { publicKey: payload.sender.pub_key } });
modify_1.purchaseFromOriginalSender(payload, chat, senderContact); modify_1.purchaseFromOriginalSender(payload, chat, senderContact);
// doAction = false // incoming "purchase" dont save its is a forward
} }
} }
if (isTribeOwner && payload.type === msgtypes.purchase_accept) { if (isTribeOwner && payload.type === msgtypes.purchase_accept) {
// IF I WAS THE PURCHASER, just pass thru
const mt = payload.message.mediaToken; const mt = payload.message.mediaToken;
const host = mt && mt.split('.').length && mt.split('.')[0]; const host = mt && mt.split('.').length && mt.split('.')[0];
const muid = mt && mt.split('.').length && mt.split('.')[1]; const muid = mt && mt.split('.').length && mt.split('.')[1];
@ -96,11 +93,11 @@ function onReceive(payload) {
type: msgtypes.purchase, type: msgtypes.purchase,
sender: 1, sender: 1,
} }); } });
if (!ogPurchaseMessage) { if (!ogPurchaseMessage) { // for someone else
console.log("=> NO OG PURCHASE MESSAGE BY ME, sendFinalMemeIfFirstPurchaser"); console.log("=> NO OG PURCHASE MESSAGE BY ME, sendFinalMemeIfFirstPurchaser");
const senderContact = yield models_1.models.Contact.findOne({ where: { publicKey: payload.sender.pub_key } }); const senderContact = yield models_1.models.Contact.findOne({ where: { publicKey: payload.sender.pub_key } });
modify_1.sendFinalMemeIfFirstPurchaser(payload, chat, senderContact); modify_1.sendFinalMemeIfFirstPurchaser(payload, chat, senderContact);
// doAction = false // dont store this locally, its for someone else doAction = false;
} }
} }
if (doAction) if (doAction)

2
dist/api/network/receive.js.map

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save