diff --git a/dist/src/controllers/messages.js b/dist/src/controllers/messages.js index 6dd0caf..a607964 100644 --- a/dist/src/controllers/messages.js +++ b/dist/src/controllers/messages.js @@ -187,7 +187,7 @@ exports.sendMessage = (req, res) => __awaiter(void 0, void 0, void 0, function* }); exports.receiveMessage = (payload) => __awaiter(void 0, void 0, void 0, function* () { // console.log('received message', { payload }) - const { owner, sender, chat, content, remote_content, msg_id, chat_type, sender_alias, msg_uuid, date_string, reply_uuid, amount } = yield helpers.parseReceiveParams(payload); + const { owner, sender, chat, content, remote_content, msg_id, chat_type, sender_alias, msg_uuid, date_string, reply_uuid } = yield helpers.parseReceiveParams(payload); if (!owner || !sender || !chat) { return console.log('=> no group chat!'); } @@ -202,7 +202,7 @@ exports.receiveMessage = (payload) => __awaiter(void 0, void 0, void 0, function type: constants_1.default.message_types.message, sender: sender.id, date: date, - amount: amount || 0, + // amount: amount||0, messageContent: text, createdAt: date, updatedAt: date, @@ -227,7 +227,7 @@ exports.receiveMessage = (payload) => __awaiter(void 0, void 0, void 0, function }); exports.receiveBoost = (payload) => __awaiter(void 0, void 0, void 0, function* () { console.log('received boost', { payload }); - const { owner, sender, chat, content, remote_content, chat_type, sender_alias, msg_uuid, date_string, reply_uuid, amount } = yield helpers.parseReceiveParams(payload); + const { owner, sender, chat, content, remote_content, chat_type, sender_alias, msg_uuid, date_string, reply_uuid } = yield helpers.parseReceiveParams(payload); if (!owner || !sender || !chat) { return console.log('=> no group chat!'); } @@ -242,7 +242,7 @@ exports.receiveBoost = (payload) => __awaiter(void 0, void 0, void 0, function* type: constants_1.default.message_types.boost, sender: sender.id, date: date, - amount: amount || 0, + // amount: amount||0, messageContent: text, createdAt: date, updatedAt: date, diff --git a/dist/src/controllers/messages.js.map b/dist/src/controllers/messages.js.map index dc69a3a..984c199 100644 --- a/dist/src/controllers/messages.js.map +++ b/dist/src/controllers/messages.js.map @@ -1 +1 @@ -{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../src/controllers/messages.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../src/controllers/messages.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/controllers/payment.js b/dist/src/controllers/payment.js index 4ee77a0..a6620c4 100644 --- a/dist/src/controllers/payment.js +++ b/dist/src/controllers/payment.js @@ -152,7 +152,7 @@ exports.receivePayment = (payload) => __awaiter(void 0, void 0, void 0, function exports.listPayments = (req, res) => __awaiter(void 0, void 0, void 0, function* () { const limit = (req.query.limit && parseInt(req.query.limit)) || 100; const offset = (req.query.offset && parseInt(req.query.offset)) || 0; - const MIN_VAL = constants_1.default.min_sat_amount; + // const MIN_VAL=constants.min_sat_amount try { const msgs = yield models_1.models.Message.findAll({ where: { @@ -164,12 +164,6 @@ exports.listPayments = (req, res) => __awaiter(void 0, void 0, void 0, function* constants_1.default.message_types.keysend, ] } }, - { - type: constants_1.default.message_types.message, - amount: { - [sequelize_1.Op.gt]: MIN_VAL // greater than - } - } ], }, order: [['createdAt', 'desc']], diff --git a/dist/src/controllers/payment.js.map b/dist/src/controllers/payment.js.map index 99cc794..9c4bbb7 100644 --- a/dist/src/controllers/payment.js.map +++ b/dist/src/controllers/payment.js.map @@ -1 +1 @@ -{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../../src/controllers/payment.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAgC;AAChC,gCAAyC;AACzC,0CAAyC;AACzC,2CAA0C;AAC1C,sCAAqC;AACrC,sCAA+C;AAC/C,wCAA4C;AAC5C,sCAAqC;AACrC,oCAAmC;AACnC,4CAAoC;AACpC,yCAA8B;AAC9B,iCAAuC;AAE1B,QAAA,WAAW,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IAC5C,MAAM,EACJ,MAAM,EACN,OAAO,EACP,UAAU,EACV,eAAe,EACf,UAAU,EACV,IAAI,EACJ,IAAI,EACJ,WAAW,EACX,UAAU,EACV,eAAe,EACf,WAAW,EACX,UAAU,GACX,GAAG,GAAG,CAAC,IAAI,CAAA;IAEZ,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAEvC,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAC,CAAC,CAAA;IAEvE,IAAI,eAAe,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,EAAE;QAC9C,uBAAgB,CAAC,KAAK,EAAE,eAAe,EAAE,MAAM,IAAE,EAAE,EAAE,IAAI,IAAE,EAAE,EAC3D,UAAS,IAAI;YACX,aAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACpB,CAAC,EACD,UAAS,KAAK;YACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YACpC,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC,CACF,CAAA;QACD,OAAM;KACP;IAED,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC;QAC1C,OAAO;QACP,QAAQ,EAAE,KAAK,CAAC,EAAE;QAClB,YAAY,EAAE,UAAU;KACzB,CAAC,CAAA;IAEF,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACtB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IAEvB,MAAM,GAAG,GAAqB;QAC5B,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE;QACtB,MAAM,EAAE,KAAK,CAAC,EAAE;QAChB,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,cAAc;QAC5C,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI;QACrC,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,IAAI;KAChB,CAAA;IACD,IAAG,IAAI;QAAE,GAAG,CAAC,cAAc,GAAG,IAAI,CAAA;IAClC,IAAG,WAAW;QAAE,GAAG,CAAC,oBAAoB,GAAG,WAAW,CAAA;IACtD,IAAG,UAAU;QAAE,GAAG,CAAC,SAAS,GAAC,UAAU,CAAA;IAEvC,IAAG,IAAI,EAAC;QACN,MAAM,YAAY,GAAG,MAAM,qBAAc,CAAC;YACxC,IAAI,EAAC,EAAC,GAAG,EAAC,UAAU,EAAC,EAAE,IAAI,EAAC,EAAE;YAC9B,IAAI,EAAE,GAAG,EAAC,IAAI;YACd,MAAM,EAAE,KAAK,CAAC,SAAS;SACxB,CAAC,CAAA;QACF,GAAG,CAAC,UAAU,GAAG,YAAY,CAAA;QAC7B,GAAG,CAAC,SAAS,GAAG,UAAU,IAAI,EAAE,CAAA;KACjC;IAED,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAEhD,MAAM,SAAS,GAAqB;QAClC,EAAE,EAAC,OAAO,CAAC,EAAE;QACb,IAAI,EAAC,OAAO,CAAC,IAAI;QACjB,MAAM;KACP,CAAA;IACD,IAAG,IAAI,EAAE;QACP,SAAS,CAAC,SAAS,GAAG,UAAU,IAAE,YAAY,CAAA;QAC9C,SAAS,CAAC,UAAU,GAAG,EAAC,IAAI,EAAC,IAAI,EAAC,EAAC,GAAG,EAAC,UAAU,EAAC,EAAC,CAAA;KACpD;IACD,IAAG,WAAW;QAAE,SAAS,CAAC,OAAO,GAAG,WAAW,CAAA;IAC/C,IAAG,UAAU;QAAE,SAAS,CAAC,SAAS,GAAC,UAAU,CAAA;IAE7C,+CAA+C;IAC/C,kCAAkC;IAClC,IAAI,OAAO,GAAG,IAAI,CAAA;IAClB,IAAG,WAAW,EAAC;QACb,OAAO,mCAAO,IAAI,CAAC,UAAU,KAAE,UAAU,EAAC,WAAW,GAAC,CAAA;QACtD,IAAG,eAAe;YAAE,SAAS,CAAC,OAAO,GAAG,eAAe,CAAA;KACxD;IACD,OAAO,CAAC,WAAW,CAAC;QAClB,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,cAAc;QAC5C,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,CAAO,IAAI,EAAE,EAAE;YACtB,wCAAwC;YACxC,aAAO,CAAC,GAAG,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAA;QACtD,CAAC,CAAA;QACD,OAAO,EAAE,CAAO,KAAK,EAAE,EAAE;YACvB,MAAM,OAAO,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,mBAAS,CAAC,QAAQ,CAAC,MAAM,EAAC,CAAC,CAAA;YACzD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,GAAG,CAAC,IAAI,CAAC;gBACP,OAAO,EAAE,KAAK;gBACd,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC;aACjD,CAAC,CAAC;YACH,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC,CAAA;KACF,CAAC,CAAA;AACJ,CAAC,CAAA,CAAC;AAEW,QAAA,cAAc,GAAG,CAAO,OAAO,EAAE,EAAE;IAC9C,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;IAE5C,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACtB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IAEvB,MAAM,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAC,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAC9J,IAAG,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE;QAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;KACxC;IAED,MAAM,GAAG,GAAqB;QAC5B,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,cAAc;QAC5C,MAAM,EAAE,MAAM,CAAC,EAAE;QACjB,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI;QACrC,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,IAAI;KAChB,CAAA;IACD,IAAG,OAAO;QAAE,GAAG,CAAC,cAAc,GAAG,OAAO,CAAA;IACxC,IAAG,SAAS;QAAE,GAAG,CAAC,SAAS,GAAG,SAAS,CAAA;IACvC,IAAG,UAAU;QAAE,GAAG,CAAC,UAAU,GAAG,UAAU,CAAA;IAC1C,IAAG,SAAS,KAAG,mBAAS,CAAC,UAAU,CAAC,KAAK,EAAE;QAC3C,GAAG,CAAC,WAAW,GAAG,YAAY,CAAA;KAC7B;IACD,IAAG,UAAU;QAAE,GAAG,CAAC,SAAS,GAAG,UAAU,CAAA;IAEzC,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAEhD,mDAAmD;IAEnD,MAAM,CAAC,QAAQ,CAAC;QACd,IAAI,EAAE,gBAAgB;QACtB,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC;KACzD,CAAC,CAAA;IAEF,sBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,WAAW,IAAE,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AAClE,CAAC,CAAA,CAAA;AAEY,QAAA,YAAY,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IAC7C,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,CAAA;IACnE,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAA;IAEpE,MAAM,OAAO,GAAC,mBAAS,CAAC,cAAc,CAAA;IACtC,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;YACxC,KAAK,EAAC;gBACJ,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE;oBACP;wBACE,IAAI,EAAE,EAAC,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE;gCACd,mBAAS,CAAC,aAAa,CAAC,OAAO;gCAC/B,mBAAS,CAAC,aAAa,CAAC,cAAc;gCACtC,mBAAS,CAAC,aAAa,CAAC,OAAO;6BAChC,EAAC;qBACH;oBACD;wBACE,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,OAAO;wBACrC,MAAM,EAAE;4BACN,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,eAAe;yBACjC;qBACF;iBACF;aACF;YACD,KAAK,EAAE,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC9B,KAAK;YACL,MAAM;SACP,CAAC,CAAA;QACF,MAAM,GAAG,GAAG,IAAI,IAAE,EAAE,CAAA;QACpB,aAAO,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAA,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;KACxE;IAAC,OAAM,CAAC,EAAE;QACT,aAAO,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAA;KACnC;AACH,CAAC,CAAA,CAAC"} \ No newline at end of file +{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../../src/controllers/payment.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAgC;AAChC,gCAAyC;AACzC,0CAAyC;AACzC,2CAA0C;AAC1C,sCAAqC;AACrC,sCAA+C;AAC/C,wCAA4C;AAC5C,sCAAqC;AACrC,oCAAmC;AACnC,4CAAoC;AACpC,yCAA8B;AAC9B,iCAAuC;AAE1B,QAAA,WAAW,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IAC5C,MAAM,EACJ,MAAM,EACN,OAAO,EACP,UAAU,EACV,eAAe,EACf,UAAU,EACV,IAAI,EACJ,IAAI,EACJ,WAAW,EACX,UAAU,EACV,eAAe,EACf,WAAW,EACX,UAAU,GACX,GAAG,GAAG,CAAC,IAAI,CAAA;IAEZ,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAEvC,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAC,CAAC,CAAA;IAEvE,IAAI,eAAe,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,EAAE;QAC9C,uBAAgB,CAAC,KAAK,EAAE,eAAe,EAAE,MAAM,IAAE,EAAE,EAAE,IAAI,IAAE,EAAE,EAC3D,UAAS,IAAI;YACX,aAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACpB,CAAC,EACD,UAAS,KAAK;YACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YACpC,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC,CACF,CAAA;QACD,OAAM;KACP;IAED,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC;QAC1C,OAAO;QACP,QAAQ,EAAE,KAAK,CAAC,EAAE;QAClB,YAAY,EAAE,UAAU;KACzB,CAAC,CAAA;IAEF,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACtB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IAEvB,MAAM,GAAG,GAAqB;QAC5B,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE;QACtB,MAAM,EAAE,KAAK,CAAC,EAAE;QAChB,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,cAAc;QAC5C,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI;QACrC,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,IAAI;KAChB,CAAA;IACD,IAAG,IAAI;QAAE,GAAG,CAAC,cAAc,GAAG,IAAI,CAAA;IAClC,IAAG,WAAW;QAAE,GAAG,CAAC,oBAAoB,GAAG,WAAW,CAAA;IACtD,IAAG,UAAU;QAAE,GAAG,CAAC,SAAS,GAAC,UAAU,CAAA;IAEvC,IAAG,IAAI,EAAC;QACN,MAAM,YAAY,GAAG,MAAM,qBAAc,CAAC;YACxC,IAAI,EAAC,EAAC,GAAG,EAAC,UAAU,EAAC,EAAE,IAAI,EAAC,EAAE;YAC9B,IAAI,EAAE,GAAG,EAAC,IAAI;YACd,MAAM,EAAE,KAAK,CAAC,SAAS;SACxB,CAAC,CAAA;QACF,GAAG,CAAC,UAAU,GAAG,YAAY,CAAA;QAC7B,GAAG,CAAC,SAAS,GAAG,UAAU,IAAI,EAAE,CAAA;KACjC;IAED,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAEhD,MAAM,SAAS,GAAqB;QAClC,EAAE,EAAC,OAAO,CAAC,EAAE;QACb,IAAI,EAAC,OAAO,CAAC,IAAI;QACjB,MAAM;KACP,CAAA;IACD,IAAG,IAAI,EAAE;QACP,SAAS,CAAC,SAAS,GAAG,UAAU,IAAE,YAAY,CAAA;QAC9C,SAAS,CAAC,UAAU,GAAG,EAAC,IAAI,EAAC,IAAI,EAAC,EAAC,GAAG,EAAC,UAAU,EAAC,EAAC,CAAA;KACpD;IACD,IAAG,WAAW;QAAE,SAAS,CAAC,OAAO,GAAG,WAAW,CAAA;IAC/C,IAAG,UAAU;QAAE,SAAS,CAAC,SAAS,GAAC,UAAU,CAAA;IAE7C,+CAA+C;IAC/C,kCAAkC;IAClC,IAAI,OAAO,GAAG,IAAI,CAAA;IAClB,IAAG,WAAW,EAAC;QACb,OAAO,mCAAO,IAAI,CAAC,UAAU,KAAE,UAAU,EAAC,WAAW,GAAC,CAAA;QACtD,IAAG,eAAe;YAAE,SAAS,CAAC,OAAO,GAAG,eAAe,CAAA;KACxD;IACD,OAAO,CAAC,WAAW,CAAC;QAClB,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,cAAc;QAC5C,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,CAAO,IAAI,EAAE,EAAE;YACtB,wCAAwC;YACxC,aAAO,CAAC,GAAG,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAA;QACtD,CAAC,CAAA;QACD,OAAO,EAAE,CAAO,KAAK,EAAE,EAAE;YACvB,MAAM,OAAO,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,mBAAS,CAAC,QAAQ,CAAC,MAAM,EAAC,CAAC,CAAA;YACzD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,GAAG,CAAC,IAAI,CAAC;gBACP,OAAO,EAAE,KAAK;gBACd,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC;aACjD,CAAC,CAAC;YACH,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC,CAAA;KACF,CAAC,CAAA;AACJ,CAAC,CAAA,CAAC;AAEW,QAAA,cAAc,GAAG,CAAO,OAAO,EAAE,EAAE;IAC9C,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;IAE5C,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACtB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IAEvB,MAAM,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAC,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAC9J,IAAG,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE;QAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;KACxC;IAED,MAAM,GAAG,GAAqB;QAC5B,MAAM,EAAE,IAAI,CAAC,EAAE;QACf,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,cAAc;QAC5C,MAAM,EAAE,MAAM,CAAC,EAAE;QACjB,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI;QACrC,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,IAAI;KAChB,CAAA;IACD,IAAG,OAAO;QAAE,GAAG,CAAC,cAAc,GAAG,OAAO,CAAA;IACxC,IAAG,SAAS;QAAE,GAAG,CAAC,SAAS,GAAG,SAAS,CAAA;IACvC,IAAG,UAAU;QAAE,GAAG,CAAC,UAAU,GAAG,UAAU,CAAA;IAC1C,IAAG,SAAS,KAAG,mBAAS,CAAC,UAAU,CAAC,KAAK,EAAE;QAC3C,GAAG,CAAC,WAAW,GAAG,YAAY,CAAA;KAC7B;IACD,IAAG,UAAU;QAAE,GAAG,CAAC,SAAS,GAAG,UAAU,CAAA;IAEzC,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAEhD,mDAAmD;IAEnD,MAAM,CAAC,QAAQ,CAAC;QACd,IAAI,EAAE,gBAAgB;QACtB,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC;KACzD,CAAC,CAAA;IAEF,sBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,WAAW,IAAE,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AAClE,CAAC,CAAA,CAAA;AAEY,QAAA,YAAY,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IAC7C,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,CAAA;IACnE,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAA;IAEpE,yCAAyC;IACzC,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;YACxC,KAAK,EAAC;gBACJ,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE;oBACP;wBACE,IAAI,EAAE,EAAC,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE;gCACd,mBAAS,CAAC,aAAa,CAAC,OAAO;gCAC/B,mBAAS,CAAC,aAAa,CAAC,cAAc;gCACtC,mBAAS,CAAC,aAAa,CAAC,OAAO;6BAChC,EAAC;qBACH;iBAOF;aACF;YACD,KAAK,EAAE,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC9B,KAAK;YACL,MAAM;SACP,CAAC,CAAA;QACF,MAAM,GAAG,GAAG,IAAI,IAAE,EAAE,CAAA;QACpB,aAAO,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAA,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;KACxE;IAAC,OAAM,CAAC,EAAE;QACT,aAAO,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAA;KACnC;AACH,CAAC,CAAA,CAAC"} \ No newline at end of file diff --git a/dist/src/network/receive.js b/dist/src/network/receive.js index 7d30e4c..52ac46b 100644 --- a/dist/src/network/receive.js +++ b/dist/src/network/receive.js @@ -316,14 +316,21 @@ function parseAndVerifyPayload(data) { } }); } -function saveAnonymousKeysend(response, memo) { +function saveAnonymousKeysend(response, memo, sender_pubkey) { return __awaiter(this, void 0, void 0, function* () { + let sender = 0; + if (sender_pubkey) { + const theSender = yield models_1.models.Contact.findOne({ where: { publicKey: sender_pubkey } }); + if (theSender && theSender.id) { + sender = theSender.id; + } + } let settleDate = parseInt(response['settle_date'] + '000'); const amount = response['amt_paid_sat'] || 0; const msg = yield models_1.models.Message.create({ chatId: 0, type: constants_1.default.message_types.keysend, - sender: 0, + sender, amount, amountMsat: response['amt_paid_msat'], paymentHash: '', @@ -347,26 +354,28 @@ function parseKeysendInvoice(i) { const value = i && i.value && parseInt(i.value); // "keysend" type is NOT encrypted // and should be saved even if there is NO content - let isAnonymous = false; + let isKeysendType = false; let memo = ''; + let sender_pubkey; if (data) { try { const payload = parsePayload(data); if (payload && payload.type === constants_1.default.message_types.keysend) { - isAnonymous = true; + isKeysendType = true; memo = payload.message && payload.message.content; + sender_pubkey = payload.sender && payload.sender.pub_key; } } catch (e) { } // err could be a threaded TLV } else { - isAnonymous = true; + isKeysendType = true; } - if (isAnonymous) { + if (isKeysendType) { if (!memo) { hub_1.sendNotification(-1, '', 'keysend', value || 0); } - saveAnonymousKeysend(i, memo); + saveAnonymousKeysend(i, memo, sender_pubkey); return; } let payload; diff --git a/dist/src/network/receive.js.map b/dist/src/network/receive.js.map index a63cbbc..c458539 100644 --- a/dist/src/network/receive.js.map +++ b/dist/src/network/receive.js.map @@ -1 +1 @@ -{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../../src/network/receive.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../../src/network/receive.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/utils/setup.js b/dist/src/utils/setup.js index 8049ec9..682aa3c 100644 --- a/dist/src/utils/setup.js +++ b/dist/src/utils/setup.js @@ -204,9 +204,6 @@ function printGitInfo() { } function printQR() { return __awaiter(this, void 0, void 0, function* () { - const clean = yield nodeinfo_1.isClean(); - if (!clean) - return; // skip it if already setup! let public_ip; const public_url = config.public_url; if (public_url) @@ -230,9 +227,12 @@ function printQR() { let theIP = public_ip; // if(!theIP.includes(":")) theIP = public_ip+':3001' const b64 = Buffer.from(`ip::${theIP}::${password_1.default || ''}`).toString('base64'); - console.log('Scan this QR in Sphinx app:'); - console.log(b64); + console.log('>>', b64); connectionStringFile(b64); + const clean = yield nodeinfo_1.isClean(); + if (!clean) + return; // skip it if already setup! + console.log('Scan this QR in Sphinx app:'); QRCode.toString(b64, { type: 'terminal' }, function (err, url) { console.log(url); }); diff --git a/dist/src/utils/setup.js.map b/dist/src/utils/setup.js.map index abf1647..96d2d27 100644 --- a/dist/src/utils/setup.js.map +++ b/dist/src/utils/setup.js.map @@ -1 +1 @@ -{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/utils/setup.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/utils/setup.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/controllers/messages.ts b/src/controllers/messages.ts index f0ab7e7..902e1b7 100644 --- a/src/controllers/messages.ts +++ b/src/controllers/messages.ts @@ -211,7 +211,7 @@ export const sendMessage = async (req, res) => { export const receiveMessage = async (payload) => { // console.log('received message', { payload }) - const {owner, sender, chat, content, remote_content, msg_id, chat_type, sender_alias, msg_uuid, date_string, reply_uuid, amount} = await helpers.parseReceiveParams(payload) + const {owner, sender, chat, content, remote_content, msg_id, chat_type, sender_alias, msg_uuid, date_string, reply_uuid} = await helpers.parseReceiveParams(payload) if(!owner || !sender || !chat) { return console.log('=> no group chat!') } @@ -227,7 +227,7 @@ export const receiveMessage = async (payload) => { type: constants.message_types.message, sender: sender.id, date: date, - amount: amount||0, + // amount: amount||0, messageContent: text, createdAt: date, updatedAt: date, @@ -255,7 +255,7 @@ export const receiveMessage = async (payload) => { export const receiveBoost = async (payload) => { console.log('received boost', { payload }) - const {owner, sender, chat, content, remote_content, chat_type, sender_alias, msg_uuid, date_string, reply_uuid, amount} = await helpers.parseReceiveParams(payload) + const {owner, sender, chat, content, remote_content, chat_type, sender_alias, msg_uuid, date_string, reply_uuid} = await helpers.parseReceiveParams(payload) if(!owner || !sender || !chat) { return console.log('=> no group chat!') } @@ -271,7 +271,7 @@ export const receiveBoost = async (payload) => { type: constants.message_types.boost, sender: sender.id, date: date, - amount: amount||0, + // amount: amount||0, messageContent: text, createdAt: date, updatedAt: date, diff --git a/src/controllers/payment.ts b/src/controllers/payment.ts index 08d37e2..7944d4d 100644 --- a/src/controllers/payment.ts +++ b/src/controllers/payment.ts @@ -168,7 +168,7 @@ export const listPayments = async (req, res) => { const limit = (req.query.limit && parseInt(req.query.limit)) || 100 const offset = (req.query.offset && parseInt(req.query.offset)) || 0 - const MIN_VAL=constants.min_sat_amount + // const MIN_VAL=constants.min_sat_amount try { const msgs = await models.Message.findAll({ where:{ @@ -180,12 +180,12 @@ export const listPayments = async (req, res) => { constants.message_types.keysend, ]} }, - { - type: constants.message_types.message, // for example /loopout message - amount: { - [Op.gt]: MIN_VAL // greater than - } - } + // { + // type: constants.message_types.message, // for example /loopout message + // amount: { + // [Op.gt]: MIN_VAL // greater than + // } + // } ], }, order: [['createdAt', 'desc']], diff --git a/src/network/receive.ts b/src/network/receive.ts index 69f70c8..d8d5344 100644 --- a/src/network/receive.ts +++ b/src/network/receive.ts @@ -288,13 +288,20 @@ async function parseAndVerifyPayload(data){ } } -async function saveAnonymousKeysend(response, memo) { +async function saveAnonymousKeysend(response, memo, sender_pubkey) { + let sender = 0 + if(sender_pubkey) { + const theSender = await models.Contact.findOne({ where: { publicKey: sender_pubkey }}) + if(theSender && theSender.id) { + sender = theSender.id + } + } let settleDate = parseInt(response['settle_date'] + '000'); const amount = response['amt_paid_sat'] || 0 const msg = await models.Message.create({ chatId: 0, type: constants.message_types.keysend, - sender: 0, + sender, amount, amountMsat: response['amt_paid_msat'], paymentHash: '', @@ -318,24 +325,26 @@ export async function parseKeysendInvoice(i){ // "keysend" type is NOT encrypted // and should be saved even if there is NO content - let isAnonymous = false + let isKeysendType = false let memo = '' + let sender_pubkey; if(data){ try { const payload = parsePayload(data) if(payload && payload.type===constants.message_types.keysend) { - isAnonymous = true + isKeysendType = true memo = payload.message && payload.message.content + sender_pubkey = payload.sender && payload.sender.pub_key } } catch(e) {} // err could be a threaded TLV } else { - isAnonymous = true + isKeysendType = true } - if(isAnonymous) { + if(isKeysendType) { if(!memo) { sendNotification(-1, '', 'keysend', value||0) } - saveAnonymousKeysend(i, memo) + saveAnonymousKeysend(i, memo, sender_pubkey) return } diff --git a/src/utils/setup.ts b/src/utils/setup.ts index 0a68484..f92bab0 100644 --- a/src/utils/setup.ts +++ b/src/utils/setup.ts @@ -203,9 +203,6 @@ async function printGitInfo() { async function printQR() { - const clean = await isClean() - if(!clean) return // skip it if already setup! - let public_ip const public_url = config.public_url @@ -229,9 +226,13 @@ async function printQR() { // if(!theIP.includes(":")) theIP = public_ip+':3001' const b64 = Buffer.from(`ip::${theIP}::${password || ''}`).toString('base64') - console.log('Scan this QR in Sphinx app:') - console.log(b64) + console.log('>>', b64) connectionStringFile(b64) + + const clean = await isClean() + if(!clean) return // skip it if already setup! + + console.log('Scan this QR in Sphinx app:') QRCode.toString(b64, { type: 'terminal' }, function (err, url) { console.log(url) })