From ad117fe4e5b53d7917c600e1903040b0ee1a1c11 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 5 Mar 2021 11:11:53 +1100 Subject: [PATCH] uniformized redux convo type and getProps() of conversation --- ts/components/session/ActionsPanel.tsx | 7 - ts/components/session/SessionInboxView.tsx | 19 +-- ts/models/conversation.ts | 144 ++++++++++++--------- ts/models/message.ts | 54 ++++---- ts/receiver/closedGroups.ts | 5 +- ts/receiver/errors.ts | 11 +- ts/receiver/queuedJob.ts | 11 +- ts/session/conversations/index.ts | 42 +----- ts/state/ducks/conversations.ts | 73 ++++++++++- ts/test/test-utils/utils/message.ts | 2 + ts/util/accountManager.ts | 3 +- ts/window.d.ts | 2 +- 12 files changed, 219 insertions(+), 154 deletions(-) diff --git a/ts/components/session/ActionsPanel.tsx b/ts/components/session/ActionsPanel.tsx index 1223b7116..078002257 100644 --- a/ts/components/session/ActionsPanel.tsx +++ b/ts/components/session/ActionsPanel.tsx @@ -70,13 +70,6 @@ class ActionsPanelPrivate extends React.Component { void OnionPaths.getInstance().buildNewOnionPaths(); } - // This is not ideal, but on the restore from seed, our conversation will be created before the - // redux store is ready. - // If that's the case, the save events on our conversation won't be triggering redux updates. - // So changes to our conversation won't make a change on the UI. - // Calling this makes sure that our own conversation is registered to redux. - ConversationController.getInstance().registerAllConvosToRedux(); - // init the messageQueue. In the constructor, we had all not send messages // this call does nothing except calling the constructor, which will continue sending message in the pipeline void getMessageQueue().processAllPending(); diff --git a/ts/components/session/SessionInboxView.tsx b/ts/components/session/SessionInboxView.tsx index a046ee0fe..3992f4aaa 100644 --- a/ts/components/session/SessionInboxView.tsx +++ b/ts/components/session/SessionInboxView.tsx @@ -144,25 +144,14 @@ export class SessionInboxView extends React.Component { window.inboxStore = this.store; // Enables our redux store to be updated by backbone events in the outside world - const { - messageExpired, - messageAdded, - messageChanged, - messageDeleted, - conversationReset, - } = bindActionCreators(conversationActions, this.store.dispatch); - window.actionsCreators = conversationActions; - const { userChanged } = bindActionCreators( - userActions, + const { messageExpired } = bindActionCreators( + conversationActions, this.store.dispatch ); + window.actionsCreators = conversationActions; + // messageExpired is currently inboked fropm js. So we link it to Redux that way window.Whisper.events.on('messageExpired', messageExpired); - window.Whisper.events.on('messageChanged', messageChanged); - window.Whisper.events.on('messageAdded', messageAdded); - window.Whisper.events.on('messageDeleted', messageDeleted); - window.Whisper.events.on('userChanged', userChanged); - window.Whisper.events.on('conversationReset', conversationReset); this.setState({ isInitialLoadComplete: true }); } diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index c789a0b02..f007a59a6 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -35,6 +35,11 @@ import { fromArrayBufferToBase64, fromBase64ToArrayBuffer, } from '../session/utils/String'; +import { + actions as conversationActions, + ConversationType as ReduxConversationType, + LastMessageStatusType, +} from '../state/ducks/conversations'; export interface ConversationAttributes { profileName?: string; @@ -45,7 +50,9 @@ export interface ConversationAttributes { expireTimer: number; mentionedUs: boolean; unreadCount: number; - lastMessageStatus: string | null; + lastMessageStatus: LastMessageStatusType; + lastMessage: string | null; + active_at: number; lastJoinedTimestamp: number; // ClosedGroup: last time we were added to this group groupAdmins?: Array; @@ -57,7 +64,6 @@ export interface ConversationAttributes { sessionRestoreSeen?: boolean; is_medium_group?: boolean; type: string; - lastMessage?: string | null; avatarPointer?: any; avatar?: any; server?: any; @@ -79,7 +85,8 @@ export interface ConversationAttributesOptionals { expireTimer?: number; mentionedUs?: boolean; unreadCount?: number; - lastMessageStatus?: string | null; + lastMessageStatus?: LastMessageStatusType; + lastMessage: string | null; active_at?: number; timestamp?: number; // timestamp of what? lastJoinedTimestamp?: number; @@ -92,7 +99,6 @@ export interface ConversationAttributesOptionals { sessionRestoreSeen?: boolean; is_medium_group?: boolean; type: string; - lastMessage?: string | null; avatarPointer?: any; avatar?: any; server?: any; @@ -137,16 +143,14 @@ export class ConversationModel extends Backbone.Model { public messageCollection: MessageCollection; public throttledBumpTyping: any; public throttledNotify: any; + public markRead: any; public initialPromise: any; private typingRefreshTimer?: NodeJS.Timeout | null; private typingPauseTimer?: NodeJS.Timeout | null; private typingTimer?: NodeJS.Timeout | null; - private cachedProps: any; - private pending: any; - // storeName: 'conversations', constructor(attributes: ConversationAttributesOptionals) { super(fillConvoAttributesWithDefaults(attributes)); @@ -166,6 +170,7 @@ export class ConversationModel extends Backbone.Model { 1000 ); this.throttledNotify = _.debounce(this.notify, 500, { maxWait: 1000 }); + this.markRead = _.debounce(this.markReadBouncy, 1000); // Listening for out-of-band data updates this.on('expired', this.onExpired); @@ -176,12 +181,9 @@ export class ConversationModel extends Backbone.Model { this.typingRefreshTimer = null; this.typingPauseTimer = null; - // Keep props ready - const generateProps = () => { - this.cachedProps = this.getProps(); - }; - this.on('change', generateProps); - generateProps(); + window.inboxStore?.dispatch( + conversationActions.conversationChanged(this.id, this.getProps()) + ); } public idForLogging() { @@ -412,29 +414,28 @@ export class ConversationModel extends Backbone.Model { await Promise.all(messages.map((m: any) => m.setCalculatingPoW())); } - public format() { - return this.cachedProps; - } public getGroupAdmins() { return this.get('groupAdmins') || this.get('moderators'); } - public getProps() { + public getProps(): ReduxConversationType { const groupAdmins = this.getGroupAdmins(); const members = this.isGroup() && !this.isPublic() ? this.get('members') : undefined; - const result = { + // isSelected is overriden by redux + return { + isSelected: false, id: this.id as string, activeAt: this.get('active_at'), - avatarPath: this.getAvatarPath(), + avatarPath: this.getAvatarPath() || undefined, type: this.isPrivate() ? 'direct' : 'group', isMe: this.isMe(), isPublic: this.isPublic(), isTyping: !!this.typingTimer, name: this.getName(), profileName: this.getProfileName(), - title: this.getTitle(), + // title: this.getTitle(), unreadCount: this.get('unreadCount') || 0, mentionedUs: this.get('mentionedUs') || false, isBlocked: this.isBlocked(), @@ -449,8 +450,8 @@ export class ConversationModel extends Backbone.Model { groupAdmins, members, onClick: () => this.trigger('select', this), - onBlockContact: () => this.block(), - onUnblockContact: () => this.unblock(), + onBlockContact: this.block, + onUnblockContact: this.unblock, onCopyPublicKey: this.copyPublicKey, onDeleteContact: this.deleteContact, onLeaveGroup: () => { @@ -464,8 +465,6 @@ export class ConversationModel extends Backbone.Model { void this.setLokiProfile({ displayName: null }); }, }; - - return result; } public async updateGroupAdmins(groupAdmins: Array) { @@ -495,7 +494,7 @@ export class ConversationModel extends Backbone.Model { // Lastly, we don't send read syncs for any message marked read due to a read // sync. That's a notification explosion we don't need. return this.queueJob(() => - this.markRead(message.get('received_at'), { + this.markReadBouncy(message.get('received_at') as any, { sendReadReceipts: false, readAt, }) @@ -985,8 +984,14 @@ export class ConversationModel extends Backbone.Model { } public async commit() { + // write to DB await updateConversation(this.attributes); - this.trigger('change', this); + window.inboxStore?.dispatch( + conversationActions.conversationChanged(this.id, { + ...this.getProps(), + isSelected: false, + }) + ); } public async addSingleMessage( @@ -1002,11 +1007,12 @@ export class ConversationModel extends Backbone.Model { await model.setToExpire(); } MessageController.getInstance().register(messageId, model); - - window.Whisper.events.trigger('messageAdded', { - conversationKey: this.id, - messageModel: model, - }); + window.inboxStore?.dispatch( + conversationActions.messageAdded({ + conversationKey: this.id, + messageModel: model, + }) + ); return model; } @@ -1035,28 +1041,44 @@ export class ConversationModel extends Backbone.Model { conversationId, }) ); - let unreadMessages = (await this.getUnread()).models; + let allUnreadMessagesInConvo = (await this.getUnread()).models; - const oldUnread = unreadMessages.filter( + const oldUnreadNowRead = allUnreadMessagesInConvo.filter( (message: any) => message.get('received_at') <= newestUnreadDate ); - let read = await Promise.all( - _.map(oldUnread, async providedM => { - const m = MessageController.getInstance().register( - providedM.id, - providedM - ); + let read = []; + console.time('markReadNOCommit'); - await m.markRead(options.readAt); - const errors = m.get('errors'); - return { - sender: m.get('source'), - timestamp: m.get('sent_at'), - hasErrors: Boolean(errors && errors.length), - }; - }) + // Build the list of updated message models so we can mark them all as read on a single sqlite call + for (const nowRead of oldUnreadNowRead) { + const m = MessageController.getInstance().register(nowRead.id, nowRead); + await m.markRead(options.readAt); + + const errors = m.get('errors'); + read.push({ + sender: m.get('source'), + timestamp: m.get('sent_at'), + hasErrors: Boolean(errors && errors.length), + }); + } + console.timeEnd('markReadNOCommit'); + + console.warn('oldUnreadNowRead', oldUnreadNowRead); + + const oldUnreadNowReadAttrs = oldUnreadNowRead.map(m => m.attributes); + console.warn('oldUnreadNowReadAttrs', oldUnreadNowReadAttrs); + + await saveMessages(oldUnreadNowReadAttrs); + + console.time('trigger'); + for (const nowRead of oldUnreadNowRead) { + nowRead.generateProps(false); + } + window.inboxStore?.dispatch( + conversationActions.messagesChanged(oldUnreadNowRead) ); + console.timeEnd('trigger'); // Some messages we're marking read are local notifications with no sender read = _.filter(read, m => Boolean(m.sender)); @@ -1072,12 +1094,15 @@ export class ConversationModel extends Backbone.Model { } return; } - unreadMessages = unreadMessages.filter((m: any) => Boolean(m.isIncoming())); + + allUnreadMessagesInConvo = allUnreadMessagesInConvo.filter((m: any) => + Boolean(m.isIncoming()) + ); this.set({ unreadCount: realUnreadCount }); const mentionRead = (() => { - const stillUnread = unreadMessages.filter( + const stillUnread = allUnreadMessagesInConvo.filter( (m: any) => m.get('received_at') > newestUnreadDate ); const ourNumber = UserUtils.getOurPubKeyStrFromCache(); @@ -1106,7 +1131,6 @@ export class ConversationModel extends Backbone.Model { window.log.debug('public conversation... No need to send read receipt'); return; } - if (this.isPrivate() && read.length && options.sendReadReceipts) { window.log.info(`Sending ${read.length} read receipts`); if (window.storage.get('read-receipt-setting')) { @@ -1444,10 +1468,12 @@ export class ConversationModel extends Backbone.Model { await dataRemoveMessage(messageId); this.updateLastMessage(); - window.Whisper.events.trigger('messageDeleted', { - conversationKey: this.id, - messageId, - }); + window.inboxStore?.dispatch( + conversationActions.messageDeleted({ + conversationKey: this.id, + messageId, + }) + ); } public deleteMessages() { @@ -1469,10 +1495,12 @@ export class ConversationModel extends Backbone.Model { public async destroyMessages() { await removeAllMessagesInConversation(this.id); + window.inboxStore?.dispatch( + conversationActions.conversationReset({ + conversationKey: this.id, + }) + ); - window.Whisper.events.trigger('conversationReset', { - conversationKey: this.id, - }); // destroy message keeps the active timestamp set so the // conversation still appears on the conversation list but is empty this.set({ @@ -1548,7 +1576,7 @@ export class ConversationModel extends Backbone.Model { if (this.isPrivate() && !this.get('name')) { return this.get('profileName'); } - return null; + return undefined; } public getNumber() { diff --git a/ts/models/message.ts b/ts/models/message.ts index 1b83fa83c..a7d78ca32 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -23,6 +23,8 @@ import { import autoBind from 'auto-bind'; import { saveMessage } from '../../ts/data/data'; import { ConversationModel } from './conversation'; +import { actions as conversationActions } from '../state/ducks/conversations'; + export class MessageModel extends Backbone.Model { public propsForTimerNotification: any; public propsForGroupNotification: any; @@ -52,27 +54,31 @@ export class MessageModel extends Backbone.Model { void this.setToExpire(); autoBind(this); - this.markRead = this.markRead.bind(this); - // Keep props ready - const generateProps = (triggerEvent = true) => { - if (this.isExpirationTimerUpdate()) { - this.propsForTimerNotification = this.getPropsForTimerNotification(); - } else if (this.isGroupUpdate()) { - this.propsForGroupNotification = this.getPropsForGroupNotification(); - } else if (this.isGroupInvitation()) { - this.propsForGroupInvitation = this.getPropsForGroupInvitation(); - } else { - this.propsForSearchResult = this.getPropsForSearchResult(); - this.propsForMessage = this.getPropsForMessage(); - } - if (triggerEvent) { - window.Whisper.events.trigger('messageChanged', this); - } - }; - this.on('change', generateProps); window.contextMenuShown = false; - generateProps(false); + this.generateProps(false); + } + + // Keep props ready + public generateProps(triggerEvent = true) { + if (this.isExpirationTimerUpdate()) { + this.propsForTimerNotification = this.getPropsForTimerNotification(); + } else if (this.isGroupUpdate()) { + this.propsForGroupNotification = this.getPropsForGroupNotification(); + } else if (this.isGroupInvitation()) { + this.propsForGroupInvitation = this.getPropsForGroupInvitation(); + } else { + this.propsForSearchResult = this.getPropsForSearchResult(); + this.propsForMessage = this.getPropsForMessage(); + } + + console.time(`messageChanged ${this.id}`); + + if (triggerEvent) { + window.inboxStore?.dispatch(conversationActions.messageChanged(this)); + } + + console.timeEnd(`messageChanged ${this.id}`); } public idForLogging() { @@ -1107,11 +1113,17 @@ export class MessageModel extends Backbone.Model { throw new Error('A message always needs an id'); } const id = await saveMessage(this.attributes); - this.trigger('change'); + this.generateProps(); return id; } public async markRead(readAt: number) { + this.markReadNoCommit(readAt); + + await this.commit(); + } + + public markReadNoCommit(readAt: number) { this.set({ unread: false }); if (this.get('expireTimer') && !this.get('expirationStartTimestamp')) { @@ -1127,8 +1139,6 @@ export class MessageModel extends Backbone.Model { messageId: this.id, }) ); - - await this.commit(); } public isExpiring() { diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index 86450e2e9..731b8f971 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -32,6 +32,7 @@ import { forceSyncConfigurationNowIfNeeded } from '../session/utils/syncUtils'; import { MessageController } from '../session/messages'; import { ClosedGroupEncryptionPairReplyMessage } from '../session/messages/outgoing/content/data/group'; import { queueAllCachedFromSource } from './receiver'; +import { actions as conversationActions } from '../state/ducks/conversations'; export const distributingClosedGroupEncryptionKeyPairs = new Map< string, @@ -981,7 +982,7 @@ export async function createClosedGroup( await forceSyncConfigurationNowIfNeeded(); - window.inboxStore.dispatch( - window.actionsCreators.openConversationExternal(groupPublicKey) + window.inboxStore?.dispatch( + conversationActions.openConversationExternal(groupPublicKey) ); } diff --git a/ts/receiver/errors.ts b/ts/receiver/errors.ts index 63515a689..40f157519 100644 --- a/ts/receiver/errors.ts +++ b/ts/receiver/errors.ts @@ -2,6 +2,7 @@ import { initIncomingMessage } from './dataMessage'; import { toNumber } from 'lodash'; import { ConversationController } from '../session/conversations'; import { MessageController } from '../session/messages'; +import { actions as conversationActions } from '../state/ducks/conversations'; export async function onError(ev: any) { const { error } = ev; @@ -36,10 +37,12 @@ export async function onError(ev: any) { conversation.updateLastMessage(); await conversation.notify(message); MessageController.getInstance().register(message.id, message); - window.Whisper.events.trigger('messageAdded', { - conversationKey: conversation.id, - messageModel: message, - }); + window.inboxStore?.dispatch( + conversationActions.messageAdded({ + conversationKey: conversation.id, + messageModel: message, + }) + ); if (ev.confirm) { ev.confirm(); diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts index 784e28516..3c4c2a8d9 100644 --- a/ts/receiver/queuedJob.ts +++ b/ts/receiver/queuedJob.ts @@ -10,6 +10,7 @@ import { ConversationModel } from '../models/conversation'; import { MessageCollection, MessageModel } from '../models/message'; import { MessageController } from '../session/messages'; import { getMessageById, getMessagesBySentAt } from '../../ts/data/data'; +import { actions as conversationActions } from '../state/ducks/conversations'; async function handleGroups( conversation: ConversationModel, @@ -532,10 +533,12 @@ export async function handleMessageJob( // this updates the redux store. // if the convo on which this message should become visible, // it will be shown to the user, and might as well be read right away - window.Whisper.events.trigger('messageAdded', { - conversationKey: conversation.id, - messageModel: message, - }); + window.inboxStore?.dispatch( + conversationActions.messageAdded({ + conversationKey: conversation.id, + messageModel: message, + }) + ); MessageController.getInstance().register(message.id, message); // Note that this can save the message again, if jobs were queued. We need to diff --git a/ts/session/conversations/index.ts b/ts/session/conversations/index.ts index bb6da853b..39626110f 100644 --- a/ts/session/conversations/index.ts +++ b/ts/session/conversations/index.ts @@ -13,6 +13,7 @@ import { BlockedNumberController } from '../../util'; import { getSnodesFor } from '../snode_api/snodePool'; import { PubKey } from '../types'; import { UserUtils } from '../utils'; +import { actions as conversationActions } from '../../state/ducks/conversations'; export class ConversationController { private static instance: ConversationController | null; @@ -126,9 +127,8 @@ export class ConversationController { conversation.initialPromise = create(); conversation.initialPromise.then(async () => { if (window.inboxStore) { - conversation.on('change', this.updateReduxConvoChanged); - window.inboxStore.dispatch( - window.actionsCreators.conversationAdded( + window.inboxStore?.dispatch( + conversationActions.conversationAdded( conversation.id, conversation.getProps() ) @@ -233,11 +233,10 @@ export class ConversationController { await conversation.destroyMessages(); await removeConversation(id); - conversation.off('change', this.updateReduxConvoChanged); this.conversations.remove(conversation); if (window.inboxStore) { - window.inboxStore.dispatch( - window.actionsCreators.conversationRemoved(conversation.id) + window.inboxStore?.dispatch( + conversationActions.conversationRemoved(conversation.id) ); } } @@ -272,10 +271,7 @@ export class ConversationController { conversation.updateProfileAvatar(), ]); }); - this.conversations.forEach((conversation: ConversationModel) => { - // register for change event on each conversation, and forward to redux - conversation.on('change', this.updateReduxConvoChanged); - }); + await Promise.all(promises); // Remove any unused images @@ -305,32 +301,8 @@ export class ConversationController { this._initialPromise = Promise.resolve(); this._initialFetchComplete = false; if (window.inboxStore) { - this.conversations.forEach((convo: ConversationModel) => - convo.off('change', this.updateReduxConvoChanged) - ); - - window.inboxStore.dispatch( - window.actionsCreators.removeAllConversations() - ); + window.inboxStore?.dispatch(conversationActions.removeAllConversations()); } this.conversations.reset([]); } - - public registerAllConvosToRedux() { - if (window.inboxStore) { - this.conversations.forEach((convo: ConversationModel) => { - // make sure all conversations are registered to forward their commit events to redux - convo.off('change', this.updateReduxConvoChanged); - convo.on('change', this.updateReduxConvoChanged); - }); - } - } - - private updateReduxConvoChanged(convo: ConversationModel) { - if (window.inboxStore) { - window.inboxStore.dispatch( - window.actionsCreators.conversationChanged(convo.id, convo.getProps()) - ); - } - } } diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index de7578dce..d220a4bbd 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -49,6 +49,19 @@ export type MessageTypeInConvo = { getPropsForMessageDetail(): Promise; }; +export type LastMessageStatusType = + | 'error' + | 'sending' + | 'sent' + | 'delivered' + | 'read' + | null; + +export type LastMessageType = { + status: LastMessageStatusType; + text: string | null; +}; + export interface ConversationType { id: string; name?: string; @@ -57,10 +70,7 @@ export interface ConversationType { index?: number; activeAt?: number; - lastMessage?: { - status: 'error' | 'sending' | 'sent' | 'delivered' | 'read'; - text: string; - }; + lastMessage?: LastMessageType; phoneNumber: string; type: 'direct' | 'group'; isMe: boolean; @@ -76,6 +86,16 @@ export interface ConversationType { avatarPath?: string; // absolute filepath to the avatar groupAdmins?: Array; // admins for closed groups and moderators for open groups members?: Array; // members for closed groups only + + onClick?: () => any; + onBlockContact?: () => any; + onUnblockContact?: () => any; + onCopyPublicKey?: () => any; + onDeleteContact?: () => any; + onLeaveGroup?: () => any; + onDeleteMessages?: () => any; + onInviteContacts?: () => any; + onClearNickname?: () => any; } export type ConversationLookupType = { @@ -218,6 +238,10 @@ export type MessageChangedActionType = { type: 'MESSAGE_CHANGED'; payload: MessageModel; }; +export type MessagesChangedActionType = { + type: 'MESSAGES_CHANGED'; + payload: Array; +}; export type MessageAddedActionType = { type: 'MESSAGE_ADDED'; payload: { @@ -264,6 +288,7 @@ export type ConversationActionType = | MessageAddedActionType | MessageDeletedActionType | MessageChangedActionType + | MessagesChangedActionType | SelectedConversationChangedActionType | SelectedConversationChangedActionType | FetchMessagesForConversationType; @@ -280,6 +305,7 @@ export const actions = { messageDeleted, conversationReset, messageChanged, + messagesChanged, fetchMessagesForConversation, openConversationExternal, }; @@ -346,6 +372,15 @@ function messageChanged(messageModel: MessageModel): MessageChangedActionType { }; } +function messagesChanged( + messageModels: Array +): MessagesChangedActionType { + return { + type: 'MESSAGES_CHANGED', + payload: messageModels, + }; +} + function messageAdded({ conversationKey, messageModel, @@ -501,6 +536,8 @@ function handleMessageChanged( action: MessageChangedActionType ) { const { payload } = action; + console.time('handleMessageChanged' + payload.id); + const messageInStoreIndex = state?.messages?.findIndex( m => m.id === payload.id ); @@ -521,14 +558,36 @@ function handleMessageChanged( // reorder the messages depending on the timestamp (we might have an updated serverTimestamp now) const sortedMessage = sortMessages(editedMessages, isPublic); const updatedWithFirstMessageOfSeries = updateFirstMessageOfSeries( - editedMessages + sortedMessage ); + console.timeEnd('handleMessageChanged' + payload.id); return { ...state, messages: updatedWithFirstMessageOfSeries, }; } + console.timeEnd('handleMessageChanged' + payload.id); + + return state; +} + +function handleMessagesChanged( + state: ConversationsStateType, + action: MessagesChangedActionType +) { + const { payload } = action; + console.time('handleMessagesChanged' + payload.length); + + payload.forEach(element => { + // tslint:disable-next-line: no-parameter-reassignment + state = handleMessageChanged(state, { + payload: element, + type: 'MESSAGE_CHANGED', + }); + }); + + console.timeEnd('handleMessagesChanged' + payload.length); return state; } @@ -680,6 +739,10 @@ export function reducer( return handleMessageChanged(state, action); } + if (action.type === 'MESSAGES_CHANGED') { + return handleMessagesChanged(state, action); + } + if (action.type === 'MESSAGE_ADDED') { return handleMessageAdded(state, action); } diff --git a/ts/test/test-utils/utils/message.ts b/ts/test/test-utils/utils/message.ts index 3a4486fd9..c89f773b9 100644 --- a/ts/test/test-utils/utils/message.ts +++ b/ts/test/test-utils/utils/message.ts @@ -72,6 +72,7 @@ export class MockConversation { this.attributes = { id: this.id, name: '', + profileName: undefined, type: params.type === 'public' ? 'group' : params.type, members, left: false, @@ -82,6 +83,7 @@ export class MockConversation { active_at: Date.now(), lastJoinedTimestamp: Date.now(), lastMessageStatus: null, + lastMessage: null, }; } diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts index ec1e2a95a..704ba9e86 100644 --- a/ts/util/accountManager.ts +++ b/ts/util/accountManager.ts @@ -16,6 +16,7 @@ import { removeAllSignedPreKeys, } from '../data/data'; import { forceSyncConfigurationNowIfNeeded } from '../session/utils/syncUtils'; +import { actions as userActions } from '../state/ducks/user'; /** * Might throw @@ -243,7 +244,7 @@ async function registrationDone(ourPubkey: string, displayName: string) { ourNumber: getOurPubKeyStrFromCache(), ourPrimary: window.textsecure.storage.get('primaryDevicePubKey'), }; - trigger('userChanged', user); + window.inboxStore?.dispatch(userActions.userChanged(user)); window.Whisper.Registration.markDone(); window.log.info('dispatching registration event'); trigger('registration_done'); diff --git a/ts/window.d.ts b/ts/window.d.ts index ea0eb1920..17556ca65 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -99,7 +99,7 @@ declare global { contextMenuShown: boolean; setClockParams: any; clientClockSynced: number | undefined; - inboxStore: Store; + inboxStore?: Store; actionsCreators: any; extension: { expired: (boolean) => void;