From 2b923863993df56d103cea97999242157bbf4f79 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 27 Jan 2021 18:18:20 +1100 Subject: [PATCH] debounce calls to write to db last message --- js/models/conversations.js | 49 ++++--------------- ts/components/ConversationListItem.tsx | 1 - ts/state/ducks/conversations.ts | 1 - ts/state/selectors/conversations.ts | 2 +- ts/test/state/selectors/conversations_test.ts | 5 -- 5 files changed, 10 insertions(+), 48 deletions(-) diff --git a/js/models/conversations.js b/js/models/conversations.js index 5389bad57..165552d6d 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -22,7 +22,7 @@ window.Whisper = window.Whisper || {}; - const { Contact, Message, PhoneNumber } = window.Signal.Types; + const { Contact, Conversation, Message, PhoneNumber } = window.Signal.Types; const { upgradeMessageSchema, loadAttachmentData, @@ -58,25 +58,21 @@ // our first save to the database. Or first fetch from the database. this.initialPromise = Promise.resolve(); - this.contactCollection = this.getContactCollection(); this.messageCollection = new Whisper.MessageCollection([], { conversation: this, }); this.throttledBumpTyping = _.throttle(this.bumpTyping, 300); - const debouncedUpdateLastMessage = _.debounce( - this.updateLastMessage.bind(this), - 200 + this.updateLastMessage = _.throttle( + this.bouncyUpdateLastMessage.bind(this), + 1000 ); - this.listenTo( - this.messageCollection, - 'add remove destroy', - debouncedUpdateLastMessage - ); - this.on('newmessage', this.onNewMessage); - + // this.listenTo( + // this.messageCollection, + // 'add remove destroy', + // debouncedUpdateLastMessage + // ); // Listening for out-of-band data updates - this.on('updateMessage', this.updateAndMerge); this.on('delivered', this.updateAndMerge); this.on('read', this.updateAndMerge); this.on('expiration-change', this.updateAndMerge); @@ -289,7 +285,6 @@ existing.merge(message.attributes); }; - await this.inProgressFetch; mergeMessage(); }, @@ -311,11 +306,6 @@ existing.trigger('expired'); }; - // If a fetch is in progress, then we need to wait until that's complete to - // do this removal. Otherwise we could remove from messageCollection, then - // the async database fetch could include the removed message. - - await this.inProgressFetch; removeMessage(); }, @@ -348,26 +338,6 @@ await model.setServerTimestamp(serverTimestamp); return undefined; }, - - async onNewMessage(message) { - await this.updateLastMessage(); - - // Clear typing indicator for a given contact if we receive a message from them - const identifier = message.get - ? `${message.get('source')}.${message.get('sourceDevice')}` - : `${message.source}.${message.sourceDevice}`; - this.clearContactTypingTimer(identifier); - - const model = this.addSingleMessage(message); - getMessageController().register(model.id, model); - - window.Whisper.events.trigger('messageAdded', { - conversationKey: this.id, - messageModel: model, - }); - - this.commit(); - }, addSingleMessage(message, setToExpire = true) { const model = this.messageCollection.add(message, { merge: true }); if (setToExpire) { @@ -407,7 +377,6 @@ unreadCount: this.get('unreadCount') || 0, mentionedUs: this.get('mentionedUs') || false, isBlocked: this.isBlocked(), - primaryDevice: this.id, phoneNumber: format(this.id, { ourRegionCode: regionCode, }), diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx index 34fdd5ba1..923989c72 100644 --- a/ts/components/ConversationListItem.tsx +++ b/ts/components/ConversationListItem.tsx @@ -34,7 +34,6 @@ export type ConversationListItemProps = { avatarPath?: string; isMe: boolean; isPublic?: boolean; - primaryDevice?: string; lastUpdated: number; unreadCount: number; diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index e4c453c28..f2173b2af 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -66,7 +66,6 @@ export type ConversationType = { mentionedUs: boolean; isSelected: boolean; isTyping: boolean; - primaryDevice: string; isBlocked: boolean; isKickedFromGroup: boolean; left: boolean; diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index c42866156..a6f9aef7f 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -125,7 +125,7 @@ export const _getLeftPaneLists = ( }; } const isBlocked = - BlockedNumberController.isBlocked(conversation.primaryDevice) || + BlockedNumberController.isBlocked(conversation.id) || BlockedNumberController.isGroupBlocked(conversation.id); if (isBlocked) { diff --git a/ts/test/state/selectors/conversations_test.ts b/ts/test/state/selectors/conversations_test.ts index 1f460b8eb..7b3283a9c 100644 --- a/ts/test/state/selectors/conversations_test.ts +++ b/ts/test/state/selectors/conversations_test.ts @@ -18,7 +18,6 @@ describe('state/selectors/conversations', () => { name: 'No timestamp', timestamp: 0, phoneNumber: 'notused', - primaryDevice: 'id1', type: 'direct', isMe: false, @@ -37,7 +36,6 @@ describe('state/selectors/conversations', () => { name: 'B', timestamp: 20, phoneNumber: 'notused', - primaryDevice: 'id2', type: 'direct', isMe: false, @@ -56,7 +54,6 @@ describe('state/selectors/conversations', () => { name: 'C', timestamp: 20, phoneNumber: 'notused', - primaryDevice: 'id3', type: 'direct', isMe: false, @@ -75,7 +72,6 @@ describe('state/selectors/conversations', () => { name: 'Á', timestamp: 20, phoneNumber: 'notused', - primaryDevice: 'id4', type: 'direct', isMe: false, lastUpdated: Date.now(), @@ -93,7 +89,6 @@ describe('state/selectors/conversations', () => { name: 'First!', timestamp: 30, phoneNumber: 'notused', - primaryDevice: 'id5', type: 'direct', isMe: false, lastUpdated: Date.now(),