mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 11:35:04 +01:00
Code Issues Projects Releases Wiki Activity

also look for remote echos based on event_id

Browse Source
This commit is contained in:
Bruno Windels 2020-03-23 23:00:33 +01:00
parent f02641c808
commit 8354c58c07
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/matrix/room/sending/SendQueue.js
View File

@ -64,13 +64,16 @@ export default class SendQueue {
const removed = []; const removed = [];
for (const event of events) { for (const event of events) {
const txnId = event.unsigned && event.unsigned.transaction_id; const txnId = event.unsigned && event.unsigned.transaction_id;
let idx;
if (txnId) { if (txnId) {
const idx = this._pendingEvents.array.findIndex(pe => pe.txnId === txnId); idx = this._pendingEvents.array.findIndex(pe => pe.txnId === txnId);
if (idx !== -1) { } else {
const pendingEvent = this._pendingEvents.get(idx); idx = this._pendingEvents.array.findIndex(pe => pe.remoteId === event.event_id);
txn.pendingEvents.remove(pendingEvent.roomId, pendingEvent.queueIndex); }
removed.push(pendingEvent); if (idx !== -1) {
} const pendingEvent = this._pendingEvents.get(idx);
txn.pendingEvents.remove(pendingEvent.roomId, pendingEvent.queueIndex);
removed.push(pendingEvent);
} }
} }
return removed; return removed;