mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Move to centralized message/cache data layer

Browse source 
Also, ensure that conversation.messageCollection has nothing in it
unless it has an associated ConversationView.
This commit is contained in:
Scott Nonnenberg 2018-07-25 15:02:27 -07:00
parent 34231168a7
commit f39a96bc76
21 changed files with 1119 additions and 993 deletions
Download patch file Download diff file Expand all files Collapse all files

112
js/read_receipts.js
View file

@ -1,4 +1,4 @@
/* global Whisper, Backbone, _, ConversationController */
/* global Whisper, Backbone, _, ConversationController, window */
/* eslint-disable more/no-then */
@ -29,66 +29,74 @@
}
return receipts;
},
onReceipt(receipt) {
const messages = new Whisper.MessageCollection();
return messages
.fetchSentAt(receipt.get('timestamp'))
.then(() => {
if (messages.length === 0) {
return null;
}
const message = messages.find(
item =>
item.isOutgoing() &&
receipt.get('reader') === item.get('conversationId')
);
if (message) {
return message;
}
async getTargetMessage(reader, messages) {
if (messages.length === 0) {
return null;
}
const message = messages.find(
item => item.isOutgoing() && reader === item.get('conversationId')
);
if (message) {
return message;
}
const groups = new Whisper.GroupCollection();
return groups.fetchGroups(receipt.get('reader')).then(() => {
const ids = groups.pluck('id');
ids.push(receipt.get('reader'));
return messages.find(
item =>
item.isOutgoing() && _.contains(ids, item.get('conversationId'))
);
});
})
.then(message => {
if (message) {
const readBy = message.get('read_by') || [];
readBy.push(receipt.get('reader'));
return new Promise((resolve, reject) => {
message.save({ read_by: readBy }).then(() => {
// notify frontend listeners
const conversation = ConversationController.get(
message.get('conversationId')
);
if (conversation) {
conversation.trigger('read', message);
}
this.remove(receipt);
resolve();
}, reject);
});
const groups = new Whisper.GroupCollection();
return groups.fetchGroups(reader).then(() => {
const ids = groups.pluck('id');
ids.push(reader);
return messages.find(
item =>
item.isOutgoing() && _.contains(ids, item.get('conversationId'))
);
});
},
async onReceipt(receipt) {
try {
const messages = await window.Signal.Data.getMessagesBySentAt(
receipt.get('timestamp'),
{
MessageCollection: Whisper.MessageCollection,
}
);
const message = await this.getTargetMessage(
receipt.get('reader'),
messages
);
if (!message) {
window.log.info(
'No message for read receipt',
receipt.get('reader'),
receipt.get('timestamp')
);
return;
}
return null;
})
.catch(error => {
window.log.error(
'ReadReceipts.onReceipt error:',
error && error.stack ? error.stack : error
);
const readBy = message.get('read_by') || [];
readBy.push(receipt.get('reader'));
message.set({ read_by: readBy });
await window.Signal.Data.saveMessage(message.attributes, {
Message: Whisper.Message,
});
// notify frontend listeners
const conversation = ConversationController.get(
message.get('conversationId')
);
if (conversation) {
conversation.trigger('read', message);
}
this.remove(receipt);
} catch (error) {
window.log.error(
'ReadReceipts.onReceipt error:',
error && error.stack ? error.stack : error
);
}
},
}))();
})();