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

Extract Message.loadWithObjectURL

Browse source
This commit is contained in:
Daniel Gasienica 2018-04-14 20:09:52 -04:00
parent 45d89d1e44
commit 4ce0472b9f
4 changed files with 56 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

29
js/views/conversation_view.js
View file

@ -583,27 +583,14 @@
// - [ ] Fetch file attachments
// - [ ] Add mechanism to fetch more data
const mediaWithoutAttachmentData =
await Signal.Backbone.Conversation.fetchVisualMediaAttachments({
conversationId: this.model.get('id'),
WhisperMessageCollection: Whisper.MessageCollection,
});
const mediaWithAttachmentData =
await Promise.all(mediaWithoutAttachmentData.map(Signal.Migrations.loadMessage));
const withObjectURL = message => {
if (!message.attachments || message.attachments.length === 0) {
throw new TypeError('`message.attachments` cannot be empty');
}
const attachment = message.attachments[0];
const objectURL = Signal.Util.arrayBufferToObjectURL({
data: attachment.data,
type: attachment.contentType,
});
return Object.assign({}, message, {objectURL});
}
const mediaWithObjectURLs = mediaWithAttachmentData.map(withObjectURL);
const media = await Signal.Backbone.Conversation.fetchVisualMediaAttachments({
conversationId: this.model.get('id'),
WhisperMessageCollection: Whisper.MessageCollection,
});
const loadMessages = Signal.Components.PropTypes.Message.loadWithObjectURL(
Signal.Migrations.loadMessage
);
const mediaWithObjectURLs = await loadMessages(media);
const props = {
media: mediaWithObjectURLs,