From ebe32a4b44d5117f3bdc0dc07688c649040b54d6 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Thu, 19 Nov 2020 11:11:52 -0800 Subject: [PATCH] force not mqtt for the boost forward --- dist/src/network/send.js | 4 +++- dist/src/network/send.js.map | 2 +- src/network/send.ts | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dist/src/network/send.js b/dist/src/network/send.js index d6410b0..3dadfb3 100644 --- a/dist/src/network/send.js +++ b/dist/src/network/send.js @@ -88,7 +88,9 @@ function sendMessage(params) { console.log('-> sending to ', contact.id, destkey); let mqttTopic = networkType === 'mqtt' ? `${destkey}/${chatUUID}` : ''; // sending a payment to one subscriber, buying a pic from OG poster - if (isTribeOwner && contactIds.length === 1 && amount && amount > constants_1.default.min_sat_amount && msg.type === constants_1.default.message_types.purchase) { + // or keysend such as forwarding boost to og poster + if (isTribeOwner && contactIds.length === 1 && amount && amount > constants_1.default.min_sat_amount && + (msg.type === constants_1.default.message_types.purchase || msg.type === constants_1.default.message_types.keysend)) { mqttTopic = ''; // FORCE KEYSEND!!! } const m = yield msg_1.personalizeMessage(msg, contact, isTribeOwner); diff --git a/dist/src/network/send.js.map b/dist/src/network/send.js.map index 99181c7..55aa68e 100644 --- a/dist/src/network/send.js.map +++ b/dist/src/network/send.js.map @@ -1 +1 @@ -{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/network/send.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAkC;AAClC,0CAAyC;AACzC,0CAAyC;AACzC,sCAA+D;AAC/D,0CAAyC;AACzC,gEAAuE;AACvE,uCAAwC;AACxC,yCAAwC;AACxC,4CAAoC;AAIpC,SAAsB,WAAW,CAAC,MAAM;;QACvC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,MAAM,CAAA;QACjG,IAAG,CAAC,IAAI,IAAI,CAAC,MAAM;YAAE,OAAM;QAE3B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,KAAG,mBAAS,CAAC,UAAU,CAAC,KAAK,CAAA;QACtD,IAAI,YAAY,GAAG,OAAO,IAAI,MAAM,CAAC,SAAS,KAAG,IAAI,CAAC,WAAW,CAAA;QAEjE,IAAI,SAAS,GAAG,CAAC,MAAM,CAAC,UAAU,IAAE,MAAM,CAAC,CAAA;QAC3C,IAAG,YAAY,IAAI,CAAC,WAAW,EAAE;YAChC,SAAS,mCAAO,CAAC,MAAM,CAAC,UAAU,IAAE,MAAM,CAAC,KAAE,IAAI,EAAC,mBAAS,CAAC,UAAU,CAAC,KAAK,GAAC,CAAA;SAC7E;QACD,IAAI,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAEhD,oCAAoC;QAEpC,4BAA4B;QAC5B,IAAG,CAAC,CAAC,MAAM,IAAE,MAAM,CAAC,SAAS,CAAC,EAAE;YAC/B,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;YAC7B,OAAM;SACN;QAED,IAAI,UAAU,GAAG,CAAC,OAAO,IAAI,CAAC,UAAU,KAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;QAC1G,IAAG,UAAU,CAAC,MAAM,KAAG,CAAC,EAAE;YACzB,IAAI,UAAU,CAAC,CAAC,CAAC,KAAG,CAAC,EAAE;gBACtB,IAAG,OAAO;oBAAE,OAAO,CAAC,IAAI,CAAC,CAAA;gBACzB,OAAM,CAAC,uDAAuD;aAC9D;SACD;QAED,IAAI,WAAW,GAAe,SAAS,CAAA;QACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAA;QAC1B,IAAG,OAAO,EAAE;YACX,IAAG,IAAI,KAAG,mBAAS,CAAC,aAAa,CAAC,YAAY,EAAE;gBAC/C,4BAA4B;gBAC5B,IAAG,CAAC,YAAY;oBAAE,OAAM,CAAC,yCAAyC;aAClE;YACD,IAAG,YAAY,EAAC;gBACf,WAAW,GAAG,MAAM,CAAA,CAAC,mBAAmB;gBACxC,0DAA0D;gBAC1D,GAAG,GAAG,MAAM,oBAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;gBACrC,kCAAkC;gBAClC,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;gBACpD,IAAG,QAAQ,KAAG,IAAI,EAAE;oBACnB,+DAA+D;iBAC/D;gBACD,oCAAoC;gBACpC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;aACxC;iBAAM;gBACN,+BAA+B;gBAC/B,MAAM,UAAU,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE,EAAC,SAAS,EAAC,IAAI,CAAC,WAAW,EAAC,EAAC,CAAC,CAAA;gBACtF,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;aAC9C;SACD;QAED,IAAI,GAAG,GAAO,IAAI,CAAA;QAClB,IAAI,EAAE,GAAO,IAAI,CAAA;QACjB,8CAA8C;QAC9C,MAAM,YAAY,CAAC,UAAU,EAAE,CAAM,SAAS,EAAC,EAAE;YAChD,IAAI,SAAS,IAAI,CAAC,EAAE,EAAE,oBAAoB;gBACzC,OAAM;aACN;YAED,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;YAC1E,IAAG,CAAC,OAAO,EAAC;gBACX,OAAM,CAAC,yCAAyC;aAChD;YACD,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAA;YACjC,IAAG,OAAO,KAAG,UAAU,EAAE;gBACxB,OAAM,CAAC,8DAA8D;aACrE;YACD,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;YAElD,IAAI,SAAS,GAAG,WAAW,KAAG,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;YAEpE,mEAAmE;YACnE,IAAG,YAAY,IAAI,UAAU,CAAC,MAAM,KAAG,CAAC,IAAI,MAAM,IAAI,MAAM,GAAC,mBAAS,CAAC,cAAc,IAAI,GAAG,CAAC,IAAI,KAAG,mBAAS,CAAC,aAAa,CAAC,QAAQ,EAAE;gBACrI,SAAS,GAAG,EAAE,CAAA,CAAC,mBAAmB;aAClC;YAED,MAAM,CAAC,GAAG,MAAM,wBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;YAC9D,uCAAuC;YACvC,MAAM,IAAI,GAAG;gBACZ,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,CAAC;gBACP,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,IAAE,CAAC,CAAC,EAAE,mBAAS,CAAC,cAAc,CAAC;aACpD,CAAA;YAED,IAAI;gBACH,MAAM,CAAC,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;gBAC5C,GAAG,GAAG,CAAC,CAAA;aACP;YAAC,OAAO,CAAC,EAAE;gBACX,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC,CAAA;gBAC/B,EAAE,GAAG,CAAC,CAAA;aACN;YACD,MAAM,KAAK,CAAC,CAAC,CAAC,CAAA;QACf,CAAC,CAAA,CAAC,CAAA;QACF,IAAG,EAAE,EAAC;YACL,IAAG,OAAO;gBAAE,OAAO,CAAC,EAAE,CAAC,CAAA;SACvB;aAAM;YACN,IAAG,OAAO;gBAAE,OAAO,CAAC,GAAG,CAAC,CAAA;SACxB;IACF,CAAC;CAAA;AArGD,kCAqGC;AAED,SAAgB,WAAW,CAAC,IAAI,EAAE,SAAiB,EAAE,gBAAyB;IAC7E,qCAAqC;IACrC,OAAO,IAAI,OAAO,CAAC,UAAe,OAAO,EAAE,MAAM;;YAChD,IAAG,CAAC,IAAI,IAAI,OAAO,IAAI,KAAG,QAAQ,EAAE;gBACnC,OAAO,MAAM,CAAC,YAAY,CAAC,CAAA;aAC3B;YACD,IAAG,CAAC,IAAI,CAAC,IAAI,EAAE;gBACd,OAAO,MAAM,CAAC,gBAAgB,CAAC,CAAA;aAC/B;YACD,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAE,EAAE,CAAC,CAAA;YACxC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;YAExB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YACxC,IAAI,GAAG,IAAI,GAAG,GAAG,CAAA;YAEjB,qDAAqD;YACrD,IAAI;gBACH,IAAG,SAAS,EAAE;oBACb,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE;wBACrC,IAAG,CAAC,gBAAgB,EAAC;4BACpB,IAAG,SAAS;gCAAE,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;yBAC3C;oBACF,CAAC,CAAC,CAAA;iBACF;qBAAM;oBACN,MAAM,GAAG,CAAC,cAAc,iCAAK,IAAI,KAAC,IAAI,IAAE,CAAA;iBACxC;gBACD,OAAO,CAAC,IAAI,CAAC,CAAA;aACb;YAAC,OAAM,CAAC,EAAE;gBACV,MAAM,CAAC,CAAC,CAAC,CAAA;aACT;QACF,CAAC;KAAA,CAAC,CAAA;AACH,CAAC;AA/BD,kCA+BC;AAED,SAAS,kBAAkB,CAAC,IAAI;IAC/B,IAAG,wBAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAC;QACrC,IAAG,IAAI,CAAC,IAAI,KAAG,mBAAS,CAAC,aAAa,CAAC,MAAM,EAAC;YAC7C,OAAM,CAAC,+BAA+B;SACtC;QACD,0CAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KAC3D;AACF,CAAC;AAED,SAAgB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO;IACjD,MAAM,eAAe,GAAG,IAAI,KAAG,mBAAS,CAAC,aAAa,CAAC,YAAY,IAAI,IAAI,KAAG,mBAAS,CAAC,aAAa,CAAC,YAAY,CAAA;IAClH,MAAM,YAAY,GAAG,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,KAAG,mBAAS,CAAC,UAAU,CAAC,KAAK,CAAA;IACrF,4EAA4E;IAC5E,OAAO;QACN,IAAI,EAAE,IAAI;QACV,IAAI,0EACH,IAAI,EAAE,IAAI,CAAC,IAAI,IACZ,IAAI,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAChC,CAAC,IAAI,CAAC,IAAI,IAAE,IAAI,CAAC,IAAI,KAAG,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GACjD,IAAI,CAAC,OAAO,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,GACzC,CAAC,eAAe,IAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,GAC/D,CAAC,eAAe,IAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CACtD;QACD,OAAO,EAAE,OAAO;QAChB,MAAM,EAAE;YACP,OAAO,EAAE,MAAM,CAAC,SAAS;YACzB,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;YACvC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,mBAAS,CAAC,UAAU,CAAC,MAAM;SAGhD;KACD,CAAA;AACF,CAAC;AAvBD,wBAuBC;AAED,SAAe,YAAY,CAAC,KAAK,EAAE,QAAQ;;QAC1C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YAChD,MAAM,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SAC7C;IACF,CAAC;CAAA;AACD,SAAe,KAAK,CAAC,EAAE;;QACtB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;IACvD,CAAC;CAAA;AAED,oCAAoC;AACpC,iGAAiG;AACjG,IAAI;AACJ,oCAAoC;AACpC,yFAAyF;AACzF,IAAI"} \ No newline at end of file +{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../src/network/send.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/network/send.ts b/src/network/send.ts index 71875e5..f02f890 100644 --- a/src/network/send.ts +++ b/src/network/send.ts @@ -85,7 +85,10 @@ export async function sendMessage(params) { let mqttTopic = networkType==='mqtt' ? `${destkey}/${chatUUID}` : '' // sending a payment to one subscriber, buying a pic from OG poster - if(isTribeOwner && contactIds.length===1 && amount && amount>constants.min_sat_amount && msg.type===constants.message_types.purchase) { + // or keysend such as forwarding boost to og poster + if(isTribeOwner && contactIds.length===1 && amount && amount>constants.min_sat_amount && + (msg.type===constants.message_types.purchase || msg.type===constants.message_types.keysend) + ) { mqttTopic = '' // FORCE KEYSEND!!! }