From feea8e207b73669af0f5d720cb305fa5b8b16cb0 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Tue, 5 Jan 2021 11:40:28 -0800 Subject: [PATCH 1/2] fix --- dist/public/favicon.ico | Bin 0 -> 2239 bytes dist/src/controllers/contacts.js | 2 +- dist/src/controllers/contacts.js.map | 2 +- dist/src/controllers/queries.js.map | 2 +- dist/src/helpers.js | 13 ++++++++++++- dist/src/helpers.js.map | 2 +- src/controllers/contacts.ts | 2 +- src/controllers/queries.ts | 7 +++++++ src/helpers.ts | 14 +++++++++++++- 9 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 dist/public/favicon.ico diff --git a/dist/public/favicon.ico b/dist/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..a9098435a0c7ddf6e0ad0729c6b4f9dadf64dc46 GIT binary patch literal 2239 zcmaJ@X;c&U9t|MiLjhS-7PT?RVl|me2!sTp2aSVp5EQgP1k2mMc{Fig@{cZQdWcqly>FSv2 zpin4X_Z@VWaz(4&g;36XI2=N|i@1>x3*zz<_S}G+ zP$&&6Av*vGV0uz`un5OhVQ_MhM9D^>oVLp)TwXMUpu?d^p_qz!({T}l7V@bWjvW)v zl+Yl7a7UsP@=Nq$^Ae+ZWIks5HnfwRq7)E82p26E#fW7TITiCsm!jOOt^o}C69kE- zV*XAlfa!y#!BPlqhqK4>Kq3K6BI7`NJefe;iYDMe5`ZTGpe+^;QtDh-%&qK^PZV3`1xplLK!*BsC` z9HE#G$ICW<;xL&Mcd-oNig}Pbor+Pa;Dkax1<#<9T%8$qc)BeK1R2g`dj~rgSE4Jy znL(nF9b6W7P6c(XBl}!;Yor~>~dY`%c zrE?)J$pw_j0IK2s*RU6_lnzpDzgSm!_+oxYtaQ9oX>G96>^cgi3Aodp+46xRPEd@o zzsbj*f+pLJ!HN9P^J@pBzQ%Qi21G-;#xh+kqXW)FQ0)W=nhm9Z+XUe!ZeO*zq&;(^ z%x0T>V}lFJ1)cv?Lkr_lj?HfL=)N=2np9dav@hZvYhZBmGd_VTd$)aIcz$8QvF7y$ z0J1+qrZpyP88)qJ2xWHmZmh08=;6Y_B=|gQ+xRF1F3!T!L8vTR}+h ztjY#Dtb?0vgUfZnvGOP`RSN!(2!QeolZ&=N@ zMP3$W*LqEG!Cm)Fe!MJLe!20@p=zShO=jS-;=BVE#Clf);pNFQ@(~beW;4_p9JG3# zAGvFiS>B;*mSQ1`rFndoiB$BoV2=TZd%0zrf9fHW>!*yo|3Z4 zbJLBSH(T{&-?pH9H~8>e^omI-k@Pf$(`SB(?%OGlvn1L4=S z4q0c77Zhq_*%*{Ae_s(qic5-lyw9W|=w(z0+O+VuvWkB}e?4PgXrJK|?Hd)qokuUv zwoKd$oGF!N6$87`>#kIE=h#$bjmmDsSVgQkq@90%S$gH{hy4#+yVg`EL|Xe-ERUKG z-mLC>{mIB9eDdj^x;WjP9PON)U7wd07?WReJ0_vx>o>BLxIu)=y{q0!N$rZ-l2TB*N z{O%D2=3I${Elf`8jd{BEbhsiu)BSCBVa?kzexBb_Dq>!T_Fyw73eP1%w_Gs! zcGx`Y^ZNHT8L#4`O|LN2Q?o1RyyNwHaMChvY?mfwoZn*!ubltbas0?toyS@%Q+|_t z){YU}a+R(=T3-eRh>6y}D4y0DJ5sWz?D51y#kYA~hCso`i}(U|<-{G^`{ott&tD4u zTyMTZ|45=*%c$jr_HK`)WSxs8KH9$TcleMcH*+;timWobITw5q!&j@T0UD)Wv5QQI zU;n0+hq5yLNpvukc7lqLoE>`g%iMfe7w6uKyy^XK`-;ws8u!;@!^S(Thadb*dk0+W zyE_?NH0f}(m{8^9*BuzFr#G_eVYB>^g6u1Q!L5L+8pX*Wu;YF`^*?r(Yh?<^g literal 0 HcmV?d00001 diff --git a/dist/src/controllers/contacts.js b/dist/src/controllers/contacts.js index 79694d29b..65896ed38 100644 --- a/dist/src/controllers/contacts.js +++ b/dist/src/controllers/contacts.js @@ -233,7 +233,7 @@ exports.receiveContactKey = (payload) => __awaiter(void 0, void 0, void 0, funct else { console.log("DID NOT FIND SENDER"); } - if (msgIncludedContactKey && sender) { + if (msgIncludedContactKey) { helpers.sendContactKeys({ contactIds: [sender.id], sender: owner, diff --git a/dist/src/controllers/contacts.js.map b/dist/src/controllers/contacts.js.map index f6eab6391..3f905d00d 100644 --- a/dist/src/controllers/contacts.js.map +++ b/dist/src/controllers/contacts.js.map @@ -1 +1 @@ -{"version":3,"file":"contacts.js","sourceRoot":"","sources":["../../../src/controllers/contacts.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"contacts.js","sourceRoot":"","sources":["../../../src/controllers/contacts.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/controllers/queries.js.map b/dist/src/controllers/queries.js.map index 5b05492f8..b88ec0501 100644 --- a/dist/src/controllers/queries.js.map +++ b/dist/src/controllers/queries.js.map @@ -1 +1 @@ -{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/controllers/queries.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/controllers/queries.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/helpers.js b/dist/src/helpers.js index 6a548ceee..eac81990c 100644 --- a/dist/src/helpers.js +++ b/dist/src/helpers.js @@ -41,8 +41,19 @@ exports.findOrCreateChat = (params) => __awaiter(void 0, void 0, void 0, functio } return chat; }); -exports.sendContactKeys = ({ type, contactIds, sender, success, failure, dontActuallySendContactKey }) => __awaiter(void 0, void 0, void 0, function* () { +exports.sendContactKeys = ({ type, contactIds, sender, success, failure, dontActuallySendContactKey, contactPubKey }) => __awaiter(void 0, void 0, void 0, function* () { const msg = newkeyexchangemsg(type, sender, dontActuallySendContactKey || false); + if (contactPubKey) { // dont use ids here + exports.performKeysendMessage({ + sender, + destination_key: contactPubKey, + amount: 3, + msg, + success, + failure + }); + return; + } let yes = null; let no = null; let cids = contactIds || []; diff --git a/dist/src/helpers.js.map b/dist/src/helpers.js.map index 3d35de90d..4c7ed8550 100644 --- a/dist/src/helpers.js.map +++ b/dist/src/helpers.js.map @@ -1 +1 @@ -{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/controllers/contacts.ts b/src/controllers/contacts.ts index 736f1d709..eca5dc44e 100644 --- a/src/controllers/contacts.ts +++ b/src/controllers/contacts.ts @@ -253,7 +253,7 @@ export const receiveContactKey = async (payload) => { console.log("DID NOT FIND SENDER") } - if (msgIncludedContactKey && sender) { + if (msgIncludedContactKey) { helpers.sendContactKeys({ contactIds: [sender.id], sender: owner, diff --git a/src/controllers/queries.ts b/src/controllers/queries.ts index af1909980..3547df2d6 100644 --- a/src/controllers/queries.ts +++ b/src/controllers/queries.ts @@ -10,6 +10,13 @@ import { Op } from 'sequelize' import fetch from 'node-fetch' import * as helpers from '../helpers' +/* + make the keysend go over the just-created channel + add columns: txid for the onchain payment + commit_fee, local_reserve, remote_reserve, hardcoded AMT +*/ + + type QueryType = 'onchain_address' export interface Query { type: QueryType diff --git a/src/helpers.ts b/src/helpers.ts index 5c832a96e..7f992a70e 100644 --- a/src/helpers.ts +++ b/src/helpers.ts @@ -34,9 +34,21 @@ export const findOrCreateChat = async (params) => { return chat } -export const sendContactKeys = async ({ type, contactIds, sender, success, failure, dontActuallySendContactKey }:{type:number,contactIds:number[],sender:any,success?:Function,failure?:Function,dontActuallySendContactKey?:boolean}) => { +export const sendContactKeys = async ({ type, contactIds, sender, success, failure, dontActuallySendContactKey, contactPubKey }:{type:number,contactIds:number[],sender:any,success?:Function,failure?:Function,dontActuallySendContactKey?:boolean,contactPubKey?:string}) => { const msg = newkeyexchangemsg(type, sender, dontActuallySendContactKey||false) + if(contactPubKey) { // dont use ids here + performKeysendMessage({ + sender, + destination_key: contactPubKey, + amount: 3, + msg, + success, + failure + }) + return + } + let yes: any = null let no: any = null let cids = contactIds || [] From 18df4c53317d1e344dbedcaaabeca583346da6b6 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Tue, 5 Jan 2021 11:44:25 -0800 Subject: [PATCH 2/2] fix --- dist/src/controllers/contacts.js | 3 ++- dist/src/controllers/contacts.js.map | 2 +- src/controllers/contacts.ts | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dist/src/controllers/contacts.js b/dist/src/controllers/contacts.js index 65896ed38..18a446179 100644 --- a/dist/src/controllers/contacts.js +++ b/dist/src/controllers/contacts.js @@ -235,7 +235,8 @@ exports.receiveContactKey = (payload) => __awaiter(void 0, void 0, void 0, funct } if (msgIncludedContactKey) { helpers.sendContactKeys({ - contactIds: [sender.id], + contactPubKey: sender_contact_key, + contactIds: sender ? [sender.id] : [], sender: owner, type: constants_1.default.message_types.contact_key_confirmation, }); diff --git a/dist/src/controllers/contacts.js.map b/dist/src/controllers/contacts.js.map index 3f905d00d..09eba1c33 100644 --- a/dist/src/controllers/contacts.js.map +++ b/dist/src/controllers/contacts.js.map @@ -1 +1 @@ -{"version":3,"file":"contacts.js","sourceRoot":"","sources":["../../../src/controllers/contacts.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAkC;AAClC,iCAAgC;AAChC,0CAAyC;AACzC,sCAAqC;AACrC,2CAA0C;AAC1C,sCAA+C;AAC/C,gDAAwC;AACxC,yCAA8B;AAC9B,4CAAoC;AAEvB,QAAA,WAAW,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IAC7C,MAAM,QAAQ,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;IACvF,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;IAC1D,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;IACjF,MAAM,aAAa,GAAG,MAAM,eAAM,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;IACtE,MAAM,cAAc,GAAG,MAAM,eAAM,CAAC,UAAU,CAAC,OAAO,CAAC;QACtD,KAAK,EAAE;YACN,MAAM,EAAE,mBAAS,CAAC,aAAa,CAAC,OAAO;SACvC;KACD,CAAC,CAAA;IAEF,MAAM,gBAAgB,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QAC/C,IAAI,WAAW,GAAG,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAClD,IAAI,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,IAAI,OAAO,CAAC,EAAE,CAAC,CAAA;QAEnE,IAAI,MAAM,EAAE;YACX,WAAW,CAAC,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;SACnD;QAED,OAAO,WAAW,CAAA;IACnB,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;IAClF,MAAM,aAAa,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAA;QACvC,IAAI,CAAC,cAAc;YAAE,OAAO,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QACzD,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAA;QACpE,OAAO,CAAC,iBAAiB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QACvD,OAAO,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IACrC,CAAC,CAAC,CAAA;IAEF,aAAO,CAAC,GAAG,EAAE;QACZ,QAAQ,EAAE,gBAAgB;QAC1B,KAAK,EAAE,aAAa;QACpB,aAAa,EAAE,YAAY;KAC3B,CAAC,CAAA;AACH,CAAC,CAAA,CAAA;AAEY,QAAA,aAAa,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IAC/C,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAA;IAEhG,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IAExE,MAAM,GAAG,GAAG,kBAAQ,CAAA;IACpB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,MAAM,EAAE;QACxC,IAAI,GAAG,KAAK,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE;YAC1B,aAAO,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAA;YAC9B,OAAM;SACN;aAAM;YACN,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;SACjC;KACD;IAED,IAAI,KAAK,EAAE;QACV,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC/B,IAAG,CAAC,KAAK,EAAE;YACV,OAAO,aAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;SACvB;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAExE,IAAI,KAAK,CAAC,SAAS,EAAE;YACpB,IAAI,KAAK,CAAC,SAAS,KAAG,IAAI,EAAE;gBAC3B,OAAO,aAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;aACvB;SACD;aAAM;YACN,KAAK,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;SACjC;QAED,aAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;KAChB;SAAM;QACN,aAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;KAChB;AACF,CAAC,CAAA,CAAA;AAEY,QAAA,aAAa,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IAC/C,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAA;IAEhG,IAAI,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAElC,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IAC9E,IAAI,CAAC,OAAO,EAAE;QACb,OAAO,aAAO,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAA;KACvC;IAED,MAAM,iBAAiB,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,UAAU,KAAK,KAAK,CAAC,aAAa,CAAC,CAAA;IAC7F,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,CAAC,OAAO,CAAC,CAAA;IACvE,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,QAAQ,KAAK,KAAK,CAAC,WAAW,CAAC,CAAA;IAElF,iBAAiB;IACjB,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAA;IAClE,aAAO,CAAC,GAAG,EAAE,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAA;IAE5C,IAAI,CAAC,OAAO,CAAC,OAAO;QAAE,OAAM;IAC5B,IAAI,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE;QACpE,OAAM,CAAC,oCAAoC;KAC3C;IACD,IAAI,CAAC,CAAC,iBAAiB,IAAI,YAAY,IAAI,YAAY,CAAC,EAAE;QACzD,OAAM;KACN;IAED,qCAAqC;IACrC,MAAM,UAAU,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC;SAC5E,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IACvD,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC;QAAE,OAAM;IAElC,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAA;IACjD,OAAO,CAAC,eAAe,CAAC;QACvB,UAAU,EAAE,UAAU;QACtB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,WAAW;QACzC,0BAA0B,EAAE,CAAC,iBAAiB;KAC9C,CAAC,CAAA;AACH,CAAC,CAAA,CAAA;AAEY,QAAA,YAAY,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IAC9C,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAA;IAE/F,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IAC9E,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IAExE,aAAO,CAAC,GAAG,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;IAE9C,OAAO,CAAC,eAAe,CAAC;QACvB,UAAU,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QACxB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,WAAW;KACzC,CAAC,CAAA;AACH,CAAC,CAAA,CAAA;AAEY,QAAA,aAAa,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IAC/C,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAA;IAEhG,IAAI,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAElC,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IAExE,MAAM,QAAQ,GAAG,KAAK,CAAC,YAAY,CAAC,KAAI,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAA,CAAA;IACnH,IAAI,QAAQ,EAAE;QACb,MAAM,SAAS,GAAyB,EAAE,SAAS,EAAE,KAAK,EAAE,CAAA;QAC5D,IAAI,KAAK,CAAC,OAAO,CAAC;YAAE,SAAS,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,CAAA;QACpD,MAAM,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAChC,OAAO,aAAO,CAAC,GAAG,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAA;KACtD;IAED,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,EAAE;QAAE,KAAK,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAC/F,MAAM,cAAc,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACzD,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAA;IAE3E,aAAO,CAAC,GAAG,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;IAE9C,OAAO,CAAC,eAAe,CAAC;QACvB,UAAU,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QACxB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,WAAW;KACzC,CAAC,CAAA;AACH,CAAC,CAAA,CAAA;AAEY,QAAA,aAAa,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IAC/C,MAAM,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAA;IACzC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE;QACpB,aAAO,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAA;QAClC,OAAM;KACN;IAED,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;IAC/D,IAAI,CAAC,OAAO;QAAE,OAAM;IAEpB,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IACxE,MAAM,eAAe,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;IAC9F,MAAM,aAAa,GAAG,eAAe,IAAI,eAAe,CAAC,MAAM,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IACjG,IAAI,UAAU,GAAG,IAAI,CAAA;IACrB,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,EAAE;QAC1C,MAAM,kBAAkB,GAAG,MAAM,eAAM,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAA;QAC5H,IAAI,kBAAkB,IAAI,kBAAkB,CAAC,MAAM,EAAE;YACpD,6DAA6D;YAC7D,UAAU,GAAG,KAAK,CAAA;YAClB,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;SACzC;KACD;IAED,IAAI,UAAU,EAAE;QACf,MAAM,OAAO,CAAC,MAAM,CAAC;YACpB,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,EAAE;YACb,QAAQ,EAAE,EAAE;YACZ,KAAK,EAAE,SAAS;YAChB,UAAU,EAAE,EAAE;SACd,CAAC,CAAA;KACF;IAED,mCAAmC;IACnC,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;IACtE,KAAK,CAAC,GAAG,CAAC,CAAM,IAAI,EAAC,EAAE;QACtB,IAAI,IAAI,CAAC,IAAI,KAAK,mBAAS,CAAC,UAAU,CAAC,YAAY,EAAE;YACpD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAC9C,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;gBAC5B,MAAM,IAAI,CAAC,MAAM,CAAC;oBACjB,OAAO,EAAE,IAAI;oBACb,IAAI,EAAE,EAAE;oBACR,UAAU,EAAE,IAAI;oBAChB,IAAI,EAAE,EAAE;iBACR,CAAC,CAAA;gBACF,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;aAC5D;SACD;IACF,CAAC,CAAA,CAAC,CAAA;IACF,MAAM,eAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;IACzD,MAAM,eAAM,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;IAE/D,aAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;AACjB,CAAC,CAAA,CAAA;AAEY,QAAA,iBAAiB,GAAG,CAAO,OAAO,EAAE,EAAE;IAClD,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;IAE/D,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAA;IACtC,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAA;IACzC,MAAM,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,CAAA;IACjD,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,SAAS,CAAA;IAClD,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAA;IAE7C,IAAI,CAAC,cAAc,EAAE;QACpB,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;KAChC;IAED,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IACxE,MAAM,MAAM,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,mBAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;IACnI,IAAI,qBAAqB,GAAG,KAAK,CAAA,CAAC,UAAU;IAC5C,IAAG,kBAAkB,EAAE;QACtB,qBAAqB,GAAG,IAAI,CAAA;KAC5B;IACD,IAAI,kBAAkB,IAAI,MAAM,EAAE;QACjC,MAAM,WAAW,GAAyB,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAA;QAC5E,IAAI,YAAY;YAAE,WAAW,CAAC,KAAK,GAAG,YAAY,CAAA;QAClD,IAAI,gBAAgB;YAAE,WAAW,CAAC,QAAQ,GAAG,gBAAgB,CAAA;QAC7D,MAAM,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAEhC,MAAM,CAAC,QAAQ,CAAC;YACf,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC;SACzC,CAAC,CAAA;KACF;SAAM;QACN,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAA;KAClC;IAED,IAAI,qBAAqB,EAAE;QAC1B,OAAO,CAAC,eAAe,CAAC;YACvB,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;YACvB,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,mBAAS,CAAC,aAAa,CAAC,wBAAwB;SACtD,CAAC,CAAA;KACF;AACF,CAAC,CAAA,CAAA;AAEY,QAAA,wBAAwB,GAAG,CAAO,OAAO,EAAE,EAAE;IACzD,OAAO,CAAC,GAAG,CAAC,8BAA8B,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;IAE9G,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAA;IACtC,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAA;IACzC,MAAM,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,CAAA;IACjD,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,SAAS,CAAA;IAClD,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAA;IAE7C,IAAI,CAAC,cAAc,EAAE;QACpB,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;KAChC;IAED,MAAM,MAAM,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,mBAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;IACnI,IAAI,kBAAkB,IAAI,MAAM,EAAE;QACjC,MAAM,WAAW,GAAyB,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAA;QAC5E,IAAI,YAAY;YAAE,WAAW,CAAC,KAAK,GAAG,YAAY,CAAA;QAClD,IAAI,gBAAgB;YAAE,WAAW,CAAC,QAAQ,GAAG,gBAAgB,CAAA;QAC7D,MAAM,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAEhC,MAAM,CAAC,QAAQ,CAAC;YACf,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC;SACzC,CAAC,CAAA;KACF;AACF,CAAC,CAAA,CAAA;AAED,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE;IAC3B,IAAI,gBAAgB,GAAG,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,oBAAoB,EAAE,YAAY,CAAC,CAAA;IAClL,IAAI,KAAK,GAAG,EAAE,CAAA;IACd,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC/B,IAAI,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACnC,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;SACtB;IACF,CAAC,CAAC,CAAA;IACF,OAAO,KAAK,CAAA;AACb,CAAC,CAAA"} \ No newline at end of file +{"version":3,"file":"contacts.js","sourceRoot":"","sources":["../../../src/controllers/contacts.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/controllers/contacts.ts b/src/controllers/contacts.ts index eca5dc44e..06e13cfc1 100644 --- a/src/controllers/contacts.ts +++ b/src/controllers/contacts.ts @@ -255,7 +255,8 @@ export const receiveContactKey = async (payload) => { if (msgIncludedContactKey) { helpers.sendContactKeys({ - contactIds: [sender.id], + contactPubKey: sender_contact_key, + contactIds: sender ? [sender.id] : [], sender: owner, type: constants.message_types.contact_key_confirmation, })