From fb7e13acb080c787d635148fb9d95a1966dec5a7 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 30 Jun 2020 17:07:32 +1000 Subject: [PATCH] lint --- js/models/messages.js | 1 - js/views/inbox_view.js | 23 ++++++++++++++++------- libtextsecure/outgoing_message.js | 1 - 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/js/models/messages.js b/js/models/messages.js index 01d7bc8cc..0e41b7e26 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -1293,7 +1293,6 @@ }); }, - someRecipientsFailed() { const c = this.getConversation(); if (!c || c.isPrivate()) { diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js index 7ebf4ad8f..fed468cf7 100644 --- a/js/views/inbox_view.js +++ b/js/views/inbox_view.js @@ -244,7 +244,9 @@ // } // } // }); - this.fetchHandleMessageSentData = this.fetchHandleMessageSentData.bind(this); + this.fetchHandleMessageSentData = this.fetchHandleMessageSentData.bind( + this + ); this.handleMessageSentFailure = this.handleMessageSentFailure.bind(this); this.handleMessageSentSuccess = this.handleMessageSentSuccess.bind(this); @@ -262,11 +264,13 @@ }); this.listenTo(convoCollection, 'reset', removeAllConversations); + window.libsession + .getMessageQueue() + .events.addListener('success', this.handleMessageSentSuccess); - window.libsession.getMessageQueue().events.addListener('success', this.handleMessageSentSuccess); - - - window.libsession.getMessageQueue().events.addListener('fail', this.handleMessageSentFailure); + window.libsession + .getMessageQueue() + .events.addListener('fail', this.handleMessageSentFailure); Whisper.events.on('messageExpired', messageExpired); Whisper.events.on('userChanged', userChanged); @@ -286,7 +290,9 @@ } // find the corresponding conversation of this message - const conv = window.ConversationController.get(tmpMsg.get('conversationId')); + const conv = window.ConversationController.get( + tmpMsg.get('conversationId') + ); // then, find in this conversation the very same message const msg = conv.messageCollection.models.find( @@ -353,7 +359,10 @@ // const sentTo = this.get('sent_to') || []; const expirationStartTimestamp = Date.now(); - if (m.device === window.textsecure.storage.user.getNumber() && !msg.get('sync')) { + if ( + m.device === window.textsecure.storage.user.getNumber() && + !msg.get('sync') + ) { msg.set({ sentSync: false }); } msg.set({ diff --git a/libtextsecure/outgoing_message.js b/libtextsecure/outgoing_message.js index 685e2e0c2..3ef1c3799 100644 --- a/libtextsecure/outgoing_message.js +++ b/libtextsecure/outgoing_message.js @@ -305,7 +305,6 @@ OutgoingMessage.prototype = { await lokiMessageAPI.sendMessage(pubKey, data, timestamp, ttl, options); } catch (e) { if (e.name === 'HTTPError' && e.code !== 409 && e.code !== 410) { - throw new textsecure.SendMessageNetworkError(number, '', e, timestamp); } else if (e.name === 'TimedOutError') { throw new textsecure.PoWError(number, e);