Browse Source

work work work

push-params
Evan Feenstra 5 years ago
parent
commit
aae61b572b
  1. 4
      api/network/modify.ts
  2. 4
      api/network/receive.ts
  3. 2
      api/network/send.ts
  4. 4
      dist/api/network/modify.js
  5. 2
      dist/api/network/modify.js.map
  6. 4
      dist/api/network/receive.js
  7. 2
      dist/api/network/receive.js.map
  8. 2
      dist/api/network/send.js
  9. 2
      dist/api/network/send.js.map

4
api/network/modify.ts

@ -26,7 +26,6 @@ export async function modifyPayloadAndSaveMediaKey(payload, chat, sender) {
// "purchase" type
export async function purchaseFromOriginalSender(payload, chat, purchaser){
console.log('==> purchaseFromOriginalSender',payload)
if(payload.type!==msgtypes.purchase) return
const mt = payload.message && payload.message.mediaToken
@ -35,7 +34,6 @@ export async function purchaseFromOriginalSender(payload, chat, purchaser){
if(!muid) return
const mediaKey = await models.MediaKey.findOne({where:{originalMuid:muid}})
console.log("==> mediakey vals:",mediaKey&&mediaKey.dataValues)
const terms = parseLDAT(mt)
let price = terms.meta && terms.meta.amt
@ -65,7 +63,6 @@ export async function purchaseFromOriginalSender(payload, chat, purchaser){
failure: ()=>{}
})
// PAY THE OG POSTER HERE!!!
console.log('==> pay to og poster here! amount:', amount)
sendMessage({
chat: {...chat.dataValues, contactIds:[mediaKey.sender]},
sender: owner,
@ -82,7 +79,6 @@ export async function purchaseFromOriginalSender(payload, chat, purchaser){
const ogmsg = await models.Message.findOne({where:{chatId:chat.id,mediaToken:mt}})
if(!ogmsg) return
// purchase it from creator (send "purchase")
console.log('==> purchase from creator! amount:',amount)
const msg={mediaToken:mt,purchaser:purchaser.id}
sendMessage({
chat: {...chat.dataValues, contactIds:[ogmsg.sender]},

4
api/network/receive.ts

@ -34,7 +34,6 @@ export const typesToReplay=[ // should match typesToForward
msgtypes.message, msgtypes.group_join, msgtypes.group_leave
]
async function onReceive(payload){
console.log("==> ON RECEIVE",payload)
// if tribe, owner must forward to MQTT
let doAction = true
const toAddIn:{[k:string]:any} = {}
@ -98,7 +97,6 @@ async function onReceive(payload){
else console.log('=> insufficient payment for this action')
}
if(isTribeOwner && payload.type===msgtypes.purchase) {
console.log('==> is purchase, i am trbie owner')
const mt = payload.message.mediaToken
const host = mt && mt.split('.').length && mt.split('.')[0]
const muid = mt && mt.split('.').length && mt.split('.')[1]
@ -107,7 +105,6 @@ async function onReceive(payload){
type:msgtypes.attachment, sender:1,
}})
if(!myAttachmentMessage) { // someone else's attachment
console.log("==> someone else's attachment, purchase it")
const senderContact = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}})
purchaseFromOriginalSender(payload, chat, senderContact)
doAction = false
@ -228,7 +225,6 @@ export async function parseKeysendInvoice(i){
const buf = recs && recs[SPHINX_CUSTOM_RECORD_KEY]
const data = buf && buf.toString()
const value = i && i.value && parseInt(i.value)
console.log("==> RECEIVED BALUE",value)
if(!data) return
let payload

2
api/network/send.ts

@ -113,8 +113,6 @@ export function signAndSend(opts, mqttTopic?:string, replayingHistory?:boolean){
}
let data = JSON.stringify(opts.data||{})
opts.amt = opts.amt || 0
console.log("==> AMOuNTS TO SEND!",opts.amt)
console.log("==> NETWOrK TYPE:", mqttTopic?'mqtt':'lightning')
const sig = await signer.signAscii(data)
data = data + sig

4
dist/api/network/modify.js

@ -40,7 +40,6 @@ exports.modifyPayloadAndSaveMediaKey = modifyPayloadAndSaveMediaKey;
// "purchase" type
function purchaseFromOriginalSender(payload, chat, purchaser) {
return __awaiter(this, void 0, void 0, function* () {
console.log('==> purchaseFromOriginalSender', payload);
if (payload.type !== msgtypes.purchase)
return;
const mt = payload.message && payload.message.mediaToken;
@ -49,7 +48,6 @@ function purchaseFromOriginalSender(payload, chat, purchaser) {
if (!muid)
return;
const mediaKey = yield models_1.models.MediaKey.findOne({ where: { originalMuid: muid } });
console.log("==> mediakey vals:", mediaKey && mediaKey.dataValues);
const terms = ldat_1.parseLDAT(mt);
let price = terms.meta && terms.meta.amt;
if (amount < price)
@ -77,7 +75,6 @@ function purchaseFromOriginalSender(payload, chat, purchaser) {
failure: () => { }
});
// PAY THE OG POSTER HERE!!!
console.log('==> pay to og poster here! amount:', amount);
send_1.sendMessage({
chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [mediaKey.sender] }),
sender: owner,
@ -96,7 +93,6 @@ function purchaseFromOriginalSender(payload, chat, purchaser) {
if (!ogmsg)
return;
// purchase it from creator (send "purchase")
console.log('==> purchase from creator! amount:', amount);
const msg = { mediaToken: mt, purchaser: purchaser.id };
send_1.sendMessage({
chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [ogmsg.sender] }),

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

File diff suppressed because one or more lines are too long

4
dist/api/network/receive.js

@ -43,7 +43,6 @@ exports.typesToReplay = [
];
function onReceive(payload) {
return __awaiter(this, void 0, void 0, function* () {
console.log("==> ON RECEIVE", payload);
// if tribe, owner must forward to MQTT
let doAction = true;
const toAddIn = {};
@ -115,7 +114,6 @@ function onReceive(payload) {
console.log('=> insufficient payment for this action');
}
if (isTribeOwner && payload.type === msgtypes.purchase) {
console.log('==> is purchase, i am trbie owner');
const mt = payload.message.mediaToken;
const host = mt && mt.split('.').length && mt.split('.')[0];
const muid = mt && mt.split('.').length && mt.split('.')[1];
@ -124,7 +122,6 @@ function onReceive(payload) {
type: msgtypes.attachment, sender: 1,
} });
if (!myAttachmentMessage) { // someone else's attachment
console.log("==> someone else's attachment, purchase it");
const senderContact = yield models_1.models.Contact.findOne({ where: { publicKey: payload.sender.pub_key } });
modify_1.purchaseFromOriginalSender(payload, chat, senderContact);
doAction = false;
@ -258,7 +255,6 @@ function parseKeysendInvoice(i) {
const buf = recs && recs[lightning_2.SPHINX_CUSTOM_RECORD_KEY];
const data = buf && buf.toString();
const value = i && i.value && parseInt(i.value);
console.log("==> RECEIVED BALUE", value);
if (!data)
return;
let payload;

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

File diff suppressed because one or more lines are too long

2
dist/api/network/send.js

@ -120,8 +120,6 @@ function signAndSend(opts, mqttTopic, replayingHistory) {
}
let data = JSON.stringify(opts.data || {});
opts.amt = opts.amt || 0;
console.log("==> AMOuNTS TO SEND!", opts.amt);
console.log("==> NETWOrK TYPE:", mqttTopic ? 'mqtt' : 'lightning');
const sig = yield signer.signAscii(data);
data = data + sig;
// console.log("ACTUALLY SEND", mqttTopic)

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

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