lukechilds
/
sphinx-relay
mirror of https://github.com/lukechilds/sphinx-relay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

save accept and deny msgs

feature/dockerfile-arm
Evan Feenstra 5 years ago
parent
ad659bc0ac
commit
001c123806
9 changed files with 75 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 41
      api/controllers/media.ts
  2. 2
      dist/api/controllers/invites.js
  3. 2
      dist/api/controllers/invites.js.map
  4. 41
      dist/api/controllers/media.js
  5. 2
      dist/api/controllers/media.js.map
  6. 3
      dist/api/grpc/index.js
  7. 2
      dist/api/grpc/index.js.map
  8. 9
      dist/api/hub.js
  9. 2
      dist/api/hub.js.map

41
api/controllers/media.ts
View File

@ -209,7 +209,7 @@ const receivePurchase = async (payload) => {
return console.log('=> group chat not found!')
}
await models.Message.create({
const message = {
chatId: chat.id,
sender: sender.id,
type: constants.message_types.purchase,
@ -217,6 +217,11 @@ const receivePurchase = async (payload) => {
date: date,
createdAt: date,
updatedAt: date
}
await models.Message.create(message)
socket.sendJson({
type: 'purchase',
response: jsonUtils.messageToJson(message, chat, sender)
})
const muid = mediaToken && mediaToken.split('.').length && mediaToken.split('.')[1]
@ -260,31 +265,49 @@ const receivePurchase = async (payload) => {
message: {amount,content:'Payment Denied',mediaToken},
success: async (data) => {
console.log('purchase_deny sent')
const denyMsg = {
chatId: chat.id,
sender: owner.id,
type: constants.message_types.purchase_deny,
mediaToken: mediaToken,
date: date, createdAt: date, updatedAt: date
}
socket.sendJson({
type: 'purchase_deny',
response: jsonUtils.messageToJson(denyMsg, chat, sender)
})
},
failure: error=> console.log('=> couldnt send purcahse deny', error),
})
}
const acceptTerms = {
muid, ttl: TTL,
const theMediaToken = await tokenFromTerms({
muid, ttl: TTL, host:'',
meta: {amt:amount},
}
console.log("SEND THIS!", {
mediaTerms: acceptTerms, // converted to token in utils/msg.ts
mediaKey: mediaKey.key,
mediaType: ogMessage.mediaType,
pubkey: sender.publicKey,
})
helpers.sendMessage({
chat: {...chat.dataValues, contactIds:[sender.id]}, // only to sender
sender: owner,
type: constants.message_types.purchase_accept,
message: {
mediaTerms: acceptTerms, // converted to token in utils/msg.ts
mediaToken: theMediaToken,
mediaKey: mediaKey.key,
mediaType: ogMessage.mediaType,
},
success: async (data) => {
console.log('purchase_accept sent!')
const acceptMsg = {
chatId: chat.id,
sender: owner.id,
type: constants.message_types.purchase_accept,
mediaToken: theMediaToken,
date: date, createdAt: date, updatedAt: date
}
socket.sendJson({
type: 'purchase_accept',
response: jsonUtils.messageToJson(acceptMsg, chat, sender)
})
},
failure: error=> console.log('=> couldnt send purchase accept', error),
})

2
dist/api/controllers/invites.js
View File

@ -81,7 +81,7 @@ const createInvite = (req, res) => __awaiter(void 0, void 0, void 0, function* (
welcomeMessage: inviteCreated.message,
contactId: contact.id,
status: inviteCreated.invite_status,
inviteString: inviteCreated.pin
inviteString: inviteCreated.pin,
});
let contactJson = jsonUtils.contactToJson(contact);
if (invite) {

2
dist/api/controllers/invites.js.map
View File

@ -1 +1 @@
{"version":3,"file":"invites.js","sourceRoot":"","sources":["../../../api/controllers/invites.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"invites.js","sourceRoot":"","sources":["../../../api/controllers/invites.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAgC;AAChC,iCAAgC;AAChC,2CAA0C;AAC1C,gCAA6E;AAE7E,MAAM,YAAY,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IACvC,MAAM,EACL,aAAa,EACX,GAAG,GAAG,CAAC,IAAI,CAAA;IACd,MAAM,MAAM,GAAG;QACd,MAAM,EAAE;YACP,GAAG,EAAE,aAAa;SAClB;KACD,CAAA;IAED,SAAS,SAAS;QACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACf,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;QAC3B,GAAG,CAAC,GAAG,EAAE,CAAA;IACV,CAAC;IACD,SAAS,SAAS;QACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACf,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAA;QAC5B,GAAG,CAAC,GAAG,EAAE,CAAA;IACV,CAAC;IAEE,uBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;AACnD,CAAC,CAAA,CAAA;AAsFA,oCAAY;AApFb,MAAM,SAAS,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IACpC,mBAAmB;IACnB,gCAAgC;IAChC,IAAI;IAEJ,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;IACjD,MAAM,QAAQ,GAAG,MAAM,eAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,aAAa,EAAE,EAAC,CAAC,CAAA;IAEvF,MAAM,SAAS,GAAG,CAAO,QAAQ,EAAE,EAAE;QACpC,iCAAiC;QACjC,kCAAkC;QAClC,iDAAiD;QACjD,qDAAqD;QACrD,IAAI;QACJ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACf,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAA;QACnF,GAAG,CAAC,GAAG,EAAE,CAAA;IACV,CAAC,CAAA,CAAA;IAED,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,EAAE;QAC9B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACf,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAA;QAC5B,GAAG,CAAC,GAAG,EAAE,CAAA;IACV,CAAC,CAAA;IAED,8DAA8D;IAC9D,sBAAgB,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;AACzD,CAAC,CAAA,CAAA;AA0DA,8BAAS;AAxDV,MAAM,YAAY,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IACvC,MAAM,EACL,QAAQ,EACR,eAAe,EACd,GAAG,GAAG,CAAC,IAAI,CAAA;IAEZ,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAC,CAAC,CAAA;IAExE,MAAM,MAAM,GAAG;QACd,MAAM,EAAE;YACP,QAAQ,EAAE,KAAK,CAAC,KAAK;YACrB,MAAM,EAAE,KAAK,CAAC,SAAS;YACvB,gBAAgB,EAAE,QAAQ;YAC1B,OAAO,EAAE,eAAe;YACxB,GAAG,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;SAC3C;KACD,CAAA;IAED,MAAM,SAAS,GAAG,CAAO,QAAQ,EAAE,EAAE;QACpC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAEjC,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAA;QAErC,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC;YAC3C,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,CAAC;SACT,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,MAAM,eAAM,CAAC,MAAM,CAAC,MAAM,CAAC;YACzC,cAAc,EAAE,aAAa,CAAC,OAAO;YACrC,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,MAAM,EAAE,aAAa,CAAC,aAAa;YACnC,YAAY,EAAE,aAAa,CAAC,GAAG;SAE/B,CAAC,CAAA;QACF,IAAI,WAAW,GAAG,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAClD,IAAI,MAAM,EAAE;YACX,WAAW,CAAC,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;SACnD;QAED,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACf,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAA;QACjD,GAAG,CAAC,GAAG,EAAE,CAAA;IACV,CAAC,CAAA,CAAA;IAED,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,EAAE;QAC9B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACf,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAClB,GAAG,CAAC,GAAG,EAAE,CAAA;IACV,CAAC,CAAA;IAEE,uBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;AACnD,CAAC,CAAA,CAAA;AAGA,oCAAY"}

41
dist/api/controllers/media.js
View File

@ -184,7 +184,7 @@ const receivePurchase = (payload) => __awaiter(void 0, void 0, void 0, function*
if (!owner || !sender || !chat) {
return console.log('=> group chat not found!');
}
yield models_1.models.Message.create({
const message = {
chatId: chat.id,
sender: sender.id,
type: constants.message_types.purchase,
@ -192,6 +192,11 @@ const receivePurchase = (payload) => __awaiter(void 0, void 0, void 0, function*
date: date,
createdAt: date,
updatedAt: date
};
yield models_1.models.Message.create(message);
socket.sendJson({
type: 'purchase',
response: jsonUtils.messageToJson(message, chat, sender)
});
const muid = mediaToken && mediaToken.split('.').length && mediaToken.split('.')[1];
if (!muid) {
@ -233,30 +238,48 @@ const receivePurchase = (payload) => __awaiter(void 0, void 0, void 0, function*
message: { amount, content: 'Payment Denied', mediaToken },
success: (data) => __awaiter(void 0, void 0, void 0, function* () {
console.log('purchase_deny sent');
const denyMsg = {
chatId: chat.id,
sender: owner.id,
type: constants.message_types.purchase_deny,
mediaToken: mediaToken,
date: date, createdAt: date, updatedAt: date
};
socket.sendJson({
type: 'purchase_deny',
response: jsonUtils.messageToJson(denyMsg, chat, sender)
});
}),
failure: error => console.log('=> couldnt send purcahse deny', error),
});
}
const acceptTerms = {
muid, ttl: TTL,
const theMediaToken = yield ldat_1.tokenFromTerms({
muid, ttl: TTL, host: '',
meta: { amt: amount },
};
console.log("SEND THIS!", {
mediaTerms: acceptTerms,
mediaKey: mediaKey.key,
mediaType: ogMessage.mediaType,
pubkey: sender.publicKey,
});
helpers.sendMessage({
chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] }),
sender: owner,
type: constants.message_types.purchase_accept,
message: {
mediaTerms: acceptTerms,
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 = {
chatId: chat.id,
sender: owner.id,
type: constants.message_types.purchase_accept,
mediaToken: theMediaToken,
date: date, createdAt: date, updatedAt: date
};
socket.sendJson({
type: 'purchase_accept',
response: jsonUtils.messageToJson(acceptMsg, chat, sender)
});
}),
failure: error => console.log('=> couldnt send purchase accept', error),
});

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

File diff suppressed because one or more lines are too long

3
dist/api/grpc/index.js
View File

@ -88,8 +88,9 @@ function subscribeInvoices(actions) {
if (invoice == null) {
// console.log("ERROR: Invoice " + response['payment_request'] + " not found");
const payReq = response['payment_request'];
const amount = response['amt_paid_sat'];
if (process.env.HOSTING_PROVIDER === 'true') {
hub_1.sendInvoice(payReq);
hub_1.sendInvoice(payReq, amount);
}
socket.sendJson({
type: 'invoice_payment',

2
dist/api/grpc/index.js.map
View File

File diff suppressed because one or more lines are too long

9
dist/api/hub.js
View File

@ -39,13 +39,12 @@ const checkInviteHub = (params = {}) => __awaiter(void 0, void 0, void 0, functi
const invite = object.invite;
const pubkey = object.pubkey;
const price = object.price;
const invoice = object.invoice;
const dbInvite = yield models_1.models.Invite.findOne({ where: { inviteString: invite.pin } });
const contact = yield models_1.models.Contact.findOne({ where: { id: dbInvite.contactId } });
if (dbInvite.status != invite.invite_status) {
const updateObj = { status: invite.invite_status, price: price };
if (invoice)
updateObj.invoice = invoice;
if (invite.invoice)
updateObj.invoice = invite.invoice;
dbInvite.update(updateObj);
socket.sendJson({
type: 'invite',
@ -107,11 +106,11 @@ const checkInvitesHubInterval = (ms) => {
setInterval(checkInviteHub, ms);
};
exports.checkInvitesHubInterval = checkInvitesHubInterval;
function sendInvoice(payReq) {
function sendInvoice(payReq, amount) {
console.log('[hub] sending invoice');
fetch(config.hub_api_url + '/invoices', {
method: 'POST',
body: JSON.stringify({ invoice: payReq }),
body: JSON.stringify({ invoice: payReq, amount }),
headers: { 'Content-Type': 'application/json' }
})
.then(res => res.json())

2
dist/api/hub.js.map
View File

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