Audric Ackermann
4 years ago
committed by
GitHub
commit
891c5c818f
@ -1,104 +0,0 @@
|
||||
/* global
|
||||
Backbone,
|
||||
Whisper,
|
||||
getMessageController,
|
||||
_,
|
||||
*/
|
||||
|
||||
/* eslint-disable more/no-then */
|
||||
|
||||
// eslint-disable-next-line func-names
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
Whisper.DeliveryReceipts = new (Backbone.Collection.extend({
|
||||
forMessage(conversation, message) {
|
||||
let recipients;
|
||||
if (conversation.isPrivate()) {
|
||||
recipients = [conversation.id];
|
||||
} else {
|
||||
recipients = conversation.get('members') || [];
|
||||
}
|
||||
const receipts = this.filter(
|
||||
receipt =>
|
||||
receipt.get('timestamp') === message.get('sent_at') &&
|
||||
recipients.indexOf(receipt.get('source')) > -1
|
||||
);
|
||||
this.remove(receipts);
|
||||
return receipts;
|
||||
},
|
||||
async getTargetMessage(originalSource, messages) {
|
||||
if (messages.length === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const message = messages.find(
|
||||
item => !item.isIncoming() && originalSource === item.get('conversationId')
|
||||
);
|
||||
if (message) {
|
||||
return message;
|
||||
}
|
||||
|
||||
const groups = await window.Signal.Data.getAllGroupsInvolvingId(originalSource);
|
||||
|
||||
const ids = groups.pluck('id');
|
||||
ids.push(originalSource);
|
||||
|
||||
const target = messages.find(
|
||||
item => !item.isIncoming() && _.contains(ids, item.get('conversationId'))
|
||||
);
|
||||
if (!target) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return getMessageController().register(target.id, target);
|
||||
},
|
||||
async onReceipt(receipt) {
|
||||
try {
|
||||
const messages = await window.Signal.Data.getMessagesBySentAt(receipt.get('timestamp'));
|
||||
|
||||
const message = await this.getTargetMessage(receipt.get('source'), messages);
|
||||
if (!message) {
|
||||
window.log.info(
|
||||
'No message for delivery receipt',
|
||||
receipt.get('source'),
|
||||
receipt.get('timestamp')
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const deliveries = message.get('delivered') || 0;
|
||||
const deliveredTo = message.get('delivered_to') || [];
|
||||
const expirationStartTimestamp = message.get('expirationStartTimestamp');
|
||||
message.set({
|
||||
delivered_to: _.union(deliveredTo, [receipt.get('source')]),
|
||||
delivered: deliveries + 1,
|
||||
expirationStartTimestamp: expirationStartTimestamp || Date.now(),
|
||||
sent: true,
|
||||
});
|
||||
|
||||
if (message.isExpiring() && !expirationStartTimestamp) {
|
||||
// This will save the message for us while starting the timer
|
||||
await message.setToExpire();
|
||||
} else {
|
||||
await message.commit();
|
||||
}
|
||||
|
||||
// notify frontend listeners
|
||||
const conversation = window.getConversationController().get(message.get('conversationId'));
|
||||
if (conversation) {
|
||||
conversation.updateLastMessage();
|
||||
}
|
||||
|
||||
this.remove(receipt);
|
||||
} catch (error) {
|
||||
window.log.error(
|
||||
'DeliveryReceipts.onReceipt error:',
|
||||
error && error.stack ? error.stack : error
|
||||
);
|
||||
}
|
||||
},
|
||||
}))();
|
||||
})();
|
||||
@ -1,8 +0,0 @@
|
||||
import { SignalService } from '../../../../../protobuf';
|
||||
import { ReceiptMessage } from './ReceiptMessage';
|
||||
|
||||
export class DeliveryReceiptMessage extends ReceiptMessage {
|
||||
public getReceiptType(): SignalService.ReceiptMessage.Type {
|
||||
return SignalService.ReceiptMessage.Type.DELIVERY;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue