Remove jshint - move everything over to eslint
Also removed all hints of previous linters
This commit is contained in:
parent
dc11db92f9
commit
43a44793c5
71 changed files with 1837 additions and 2030 deletions
|
@ -1,97 +1,95 @@
|
|||
/* global Backbone: false */
|
||||
/* global Whisper: false */
|
||||
/* global ConversationController: false */
|
||||
/* global _: false */
|
||||
|
||||
/* 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: function(conversation, message) {
|
||||
var recipients;
|
||||
forMessage(conversation, message) {
|
||||
let recipients;
|
||||
if (conversation.isPrivate()) {
|
||||
recipients = [conversation.id];
|
||||
} else {
|
||||
recipients = conversation.get('members') || [];
|
||||
}
|
||||
var receipts = this.filter(function(receipt) {
|
||||
return (
|
||||
const receipts = this.filter(
|
||||
receipt =>
|
||||
receipt.get('timestamp') === message.get('sent_at') &&
|
||||
recipients.indexOf(receipt.get('source')) > -1
|
||||
);
|
||||
});
|
||||
);
|
||||
this.remove(receipts);
|
||||
return receipts;
|
||||
},
|
||||
onReceipt: function(receipt) {
|
||||
var messages = new Whisper.MessageCollection();
|
||||
onReceipt(receipt) {
|
||||
const messages = new Whisper.MessageCollection();
|
||||
return messages
|
||||
.fetchSentAt(receipt.get('timestamp'))
|
||||
.then(function() {
|
||||
.then(() => {
|
||||
if (messages.length === 0) {
|
||||
return;
|
||||
return null;
|
||||
}
|
||||
var message = messages.find(function(message) {
|
||||
return (
|
||||
!message.isIncoming() &&
|
||||
receipt.get('source') === message.get('conversationId')
|
||||
);
|
||||
});
|
||||
const message = messages.find(
|
||||
item =>
|
||||
!item.isIncoming() &&
|
||||
receipt.get('source') === item.get('conversationId')
|
||||
);
|
||||
if (message) {
|
||||
return message;
|
||||
}
|
||||
|
||||
var groups = new Whisper.GroupCollection();
|
||||
return groups.fetchGroups(receipt.get('source')).then(function() {
|
||||
var ids = groups.pluck('id');
|
||||
const groups = new Whisper.GroupCollection();
|
||||
return groups.fetchGroups(receipt.get('source')).then(() => {
|
||||
const ids = groups.pluck('id');
|
||||
ids.push(receipt.get('source'));
|
||||
return messages.find(function(message) {
|
||||
return (
|
||||
!message.isIncoming() &&
|
||||
_.contains(ids, message.get('conversationId'))
|
||||
);
|
||||
});
|
||||
return messages.find(
|
||||
item =>
|
||||
!item.isIncoming() &&
|
||||
_.contains(ids, item.get('conversationId'))
|
||||
);
|
||||
});
|
||||
})
|
||||
.then(
|
||||
function(message) {
|
||||
if (message) {
|
||||
var deliveries = message.get('delivered') || 0;
|
||||
var delivered_to = message.get('delivered_to') || [];
|
||||
return new Promise(
|
||||
function(resolve, reject) {
|
||||
message
|
||||
.save({
|
||||
delivered_to: _.union(delivered_to, [
|
||||
receipt.get('source'),
|
||||
]),
|
||||
delivered: deliveries + 1,
|
||||
})
|
||||
.then(
|
||||
function() {
|
||||
// notify frontend listeners
|
||||
var conversation = ConversationController.get(
|
||||
message.get('conversationId')
|
||||
);
|
||||
if (conversation) {
|
||||
conversation.trigger('delivered', message);
|
||||
}
|
||||
.then(message => {
|
||||
if (message) {
|
||||
const deliveries = message.get('delivered') || 0;
|
||||
const deliveredTo = message.get('delivered_to') || [];
|
||||
return new Promise((resolve, reject) => {
|
||||
message
|
||||
.save({
|
||||
delivered_to: _.union(deliveredTo, [receipt.get('source')]),
|
||||
delivered: deliveries + 1,
|
||||
})
|
||||
.then(() => {
|
||||
// notify frontend listeners
|
||||
const conversation = ConversationController.get(
|
||||
message.get('conversationId')
|
||||
);
|
||||
if (conversation) {
|
||||
conversation.trigger('delivered', message);
|
||||
}
|
||||
|
||||
this.remove(receipt);
|
||||
resolve();
|
||||
}.bind(this),
|
||||
reject
|
||||
);
|
||||
}.bind(this)
|
||||
);
|
||||
// TODO: consider keeping a list of numbers we've
|
||||
// successfully delivered to?
|
||||
} else {
|
||||
console.log(
|
||||
'No message for delivery receipt',
|
||||
receipt.get('source'),
|
||||
receipt.get('timestamp')
|
||||
);
|
||||
}
|
||||
}.bind(this)
|
||||
)
|
||||
.catch(function(error) {
|
||||
this.remove(receipt);
|
||||
resolve();
|
||||
}, reject);
|
||||
});
|
||||
// TODO: consider keeping a list of numbers we've
|
||||
// successfully delivered to?
|
||||
}
|
||||
console.log(
|
||||
'No message for delivery receipt',
|
||||
receipt.get('source'),
|
||||
receipt.get('timestamp')
|
||||
);
|
||||
|
||||
return null;
|
||||
})
|
||||
.catch(error => {
|
||||
console.log(
|
||||
'DeliveryReceipts.onReceipt error:',
|
||||
error && error.stack ? error.stack : error
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue