Browse Source

try

feature/dockerfile-arm
Evan Feenstra 4 years ago
parent
commit
73fc1510f0
  1. 2
      api/controllers/media.ts
  2. 6
      api/network/receive.ts
  3. 2
      dist/api/controllers/media.js
  4. 2
      dist/api/controllers/media.js.map
  5. 6
      dist/api/network/receive.js
  6. 2
      dist/api/network/receive.js.map

2
api/controllers/media.ts

@ -254,7 +254,7 @@ const receivePurchase = async (payload) => {
const mediaKey = await models.MediaKey.findOne({where:{
muid, receiver: isTribe?0:sender.id,
}})
console.log('mediaKey found!',mediaKey)
// console.log('mediaKey found!',mediaKey.dataValues)
if(!mediaKey) return // this is from another person (admin is forwarding)
const terms = parseLDAT(mediaToken)

6
api/network/receive.ts

@ -65,9 +65,10 @@ async function onReceive(payload){
mediaToken: mt, sender: 1, type:msgtypes.attachment
} })
if(!myMediaMessage) {
console.log("=> NO MEDIA MESSAGE BY ME, purchaseFromOriginalSender")
const senderContact = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}})
purchaseFromOriginalSender(payload, chat, senderContact)
doAction = false // incoming "purchase" dont save its is a forward
// doAction = false // incoming "purchase" dont save its is a forward
}
}
if(isTribeOwner && payload.type===msgtypes.purchase_accept) {
@ -81,9 +82,10 @@ async function onReceive(payload){
sender: 1,
}})
if(!ogPurchaseMessage) {
console.log("=> NO OG PURCHASE MESSAGE BY ME, sendFinalMemeIfFirstPurchaser")
const senderContact = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}})
sendFinalMemeIfFirstPurchaser(payload, chat, senderContact)
doAction = false // dont store this locally, its for someone else
// doAction = false // dont store this locally, its for someone else
}
}
if(doAction) doTheAction({...payload, ...toAddIn})

2
dist/api/controllers/media.js

@ -225,7 +225,7 @@ const receivePurchase = (payload) => __awaiter(void 0, void 0, void 0, function*
const mediaKey = yield models_1.models.MediaKey.findOne({ where: {
muid, receiver: isTribe ? 0 : sender.id,
} });
console.log('mediaKey found!', mediaKey);
// console.log('mediaKey found!',mediaKey.dataValues)
if (!mediaKey)
return; // this is from another person (admin is forwarding)
const terms = ldat_1.parseLDAT(mediaToken);

2
dist/api/controllers/media.js.map

File diff suppressed because one or more lines are too long

6
dist/api/network/receive.js

@ -80,9 +80,10 @@ function onReceive(payload) {
mediaToken: mt, sender: 1, type: msgtypes.attachment
} });
if (!myMediaMessage) {
console.log("=> NO MEDIA MESSAGE BY ME, purchaseFromOriginalSender");
const senderContact = yield models_1.models.Contact.findOne({ where: { publicKey: payload.sender.pub_key } });
modify_1.purchaseFromOriginalSender(payload, chat, senderContact);
doAction = false; // incoming "purchase" dont save its is a forward
// doAction = false // incoming "purchase" dont save its is a forward
}
}
if (isTribeOwner && payload.type === msgtypes.purchase_accept) {
@ -96,9 +97,10 @@ function onReceive(payload) {
sender: 1,
} });
if (!ogPurchaseMessage) {
console.log("=> NO OG PURCHASE MESSAGE BY ME, sendFinalMemeIfFirstPurchaser");
const senderContact = yield models_1.models.Contact.findOne({ where: { publicKey: payload.sender.pub_key } });
modify_1.sendFinalMemeIfFirstPurchaser(payload, chat, senderContact);
doAction = false; // dont store this locally, its for someone else
// doAction = false // dont store this locally, its for someone else
}
}
if (doAction)

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

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