RanchiMall/messenger
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix: pipeline creation not working with btc-id

Browse Source
This commit is contained in:
sairajzero 2023-03-21 18:05:09 +05:30
parent 2ff8c0f5d0
commit 3782a69a08
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/messenger.js
View File

@ -952,7 +952,7 @@
if (data.message) if (data.message)
data.message = decrypt(data.message); data.message = decrypt(data.message);
newInbox.messages[vc] = data; newInbox.messages[vc] = data;
if (data.sender !== user.id) if (!floCrypto.isSameAddr(data.sender, user.id))
addMark(data.groupID, "unread"); addMark(data.groupID, "unread");
return infoChange; return infoChange;
} }
@ -1289,7 +1289,7 @@
members.forEach((m, i) => { members.forEach((m, i) => {
if (!floCrypto.validateAddr(m)) if (!floCrypto.validateAddr(m))
imem1.push(m); imem1.push(m);
else if (!(m in floGlobals.pubKeys) && m != user.id) { else if (!(m in floGlobals.pubKeys) && !floCrypto.isSameAddr(user.id, m)) {
if (pubkeys !== null && floCrypto.verifyPubKey(pubkeys[i], m)) if (pubkeys !== null && floCrypto.verifyPubKey(pubkeys[i], m))
floGlobals.pubKeys[m] = pubkeys[i]; floGlobals.pubKeys[m] = pubkeys[i];
else else
@ -1311,7 +1311,7 @@
pipeline.eKey = floCrypto.randString(ekeySize); pipeline.eKey = floCrypto.randString(ekeySize);
//send pipeline info to members //send pipeline info to members
let pipelineInfo = JSON.stringify(pipeline); let pipelineInfo = JSON.stringify(pipeline);
let promises = members.filter(m => m != user.id).map(m => sendRaw(pipelineInfo, m, "CREATE_PIPELINE", true)); let promises = members.filter(m => !floCrypto.isSameAddr(m, user.id)).map(m => sendRaw(pipelineInfo, m, "CREATE_PIPELINE", true));
Promise.allSettled(promises).then(results => { Promise.allSettled(promises).then(results => {
console.debug(results.filter(r => r.status === "rejected").map(r => r.reason)); console.debug(results.filter(r => r.status === "rejected").map(r => r.reason));
_loaded.pipeline[pipeline.id] = Object.assign({}, pipeline); _loaded.pipeline[pipeline.id] = Object.assign({}, pipeline);
@ -1344,7 +1344,7 @@
continue; continue;
try { try {
parseData(dataSet[vc], newInbox); parseData(dataSet[vc], newInbox);
if (dataSet[vc].senderID !== user.id) if (!floCrypto.isSameAddr(dataSet[vc].senderID, user.id))
addMark(pipeID, "unread") addMark(pipeID, "unread")
if (!_loaded.appendix[`lastReceived_${pipeID}`] || if (!_loaded.appendix[`lastReceived_${pipeID}`] ||
_loaded.appendix[`lastReceived_${pipeID}`] < vc) _loaded.appendix[`lastReceived_${pipeID}`] < vc)