From 12d09bc896277ad48ce27c6745b36f0280edc652 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 29 Jul 2021 15:29:32 +1000 Subject: [PATCH] preload messages when switching conversation --- js/background.js | 8 +- ts/components/ConversationListItem.tsx | 22 ++--- ts/components/MessageSearchResult.tsx | 86 +++++++++---------- ts/components/SearchResults.tsx | 2 +- ts/components/UserDetailsDialog.tsx | 8 +- ts/components/conversation/Message.tsx | 10 +++ .../session/LeftPaneMessageSection.tsx | 15 ++-- ts/components/session/SessionInboxView.tsx | 22 ++--- .../SessionMessagesListContainer.tsx | 86 ++++--------------- ts/models/message.ts | 2 - ts/receiver/closedGroups.ts | 6 +- ts/receiver/queuedJob.ts | 1 - ts/state/ducks/conversations.ts | 40 +++++++-- ts/state/selectors/conversations.ts | 5 ++ ts/window.d.ts | 5 +- 15 files changed, 141 insertions(+), 177 deletions(-) diff --git a/js/background.js b/js/background.js index 33add739a..c4f747661 100644 --- a/js/background.js +++ b/js/background.js @@ -344,13 +344,7 @@ Whisper.Notifications.on('click', async (id, messageId) => { window.showWindow(); if (id) { - const firstUnreadIdOnOpen = await window.Signal.Data.getFirstUnreadMessageIdInConversation( - id - ); - - window.inboxStore.dispatch( - window.actionsCreators.openConversationExternal({ id, messageId, firstUnreadIdOnOpen }) - ); + await window.openConversationWithMessages({ id, messageId }); } else { appView.openInbox({ initialLoadComplete, diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx index 58938d68c..f6a293de5 100644 --- a/ts/components/ConversationListItem.tsx +++ b/ts/components/ConversationListItem.tsx @@ -17,16 +17,15 @@ import { useTheme } from 'styled-components'; import { PubKey } from '../session/types'; import { LastMessageType, - openConversationExternal, + openConversationWithMessages, ReduxConversationType, } from '../state/ducks/conversations'; import _ from 'underscore'; import { useMembersAvatars } from '../hooks/useMembersAvatar'; import { SessionIcon, SessionIconSize, SessionIconType } from './session/icon'; -import { useDispatch, useSelector } from 'react-redux'; +import { useSelector } from 'react-redux'; import { SectionType } from '../state/ducks/section'; import { getFocusedSection } from '../state/selectors/section'; -import { getFirstUnreadMessageIdInConversation } from '../data/data'; // tslint:disable-next-line: no-empty-interface export interface ConversationListItemProps extends ReduxConversationType {} @@ -238,18 +237,21 @@ const ConversationListItem = (props: Props) => { const membersAvatar = useMembersAvatars(props); - const dispatch = useDispatch(); - - const openConvo = useCallback(async () => { - const firstUnreadIdOnOpen = await getFirstUnreadMessageIdInConversation(conversationId); - dispatch(openConversationExternal({ id: conversationId, firstUnreadIdOnOpen })); - }, [conversationId]); + const openConvo = useCallback( + async (e: any) => { + // mousedown is invoked sooner than onClick, but for both right and left click + if (e.button === 0) { + await openConversationWithMessages({ conversationKey: conversationId }); + } + }, + [conversationId] + ); return (
{ contextMenu.show({ id: triggerId, diff --git a/ts/components/MessageSearchResult.tsx b/ts/components/MessageSearchResult.tsx index 1fb86349a..60c54120f 100644 --- a/ts/components/MessageSearchResult.tsx +++ b/ts/components/MessageSearchResult.tsx @@ -1,17 +1,9 @@ import React from 'react'; -import classNames from 'classnames'; import { Avatar, AvatarSize } from './Avatar'; -import { MessageBodyHighlight } from './MessageBodyHighlight'; -import { Timestamp } from './conversation/Timestamp'; import { ContactName } from './conversation/ContactName'; -import { - FindAndFormatContactType, - openConversationExternal, - PropsForSearchResults, -} from '../state/ducks/conversations'; -import { useDispatch } from 'react-redux'; +import { FindAndFormatContactType, PropsForSearchResults } from '../state/ducks/conversations'; type PropsHousekeeping = { isSelected?: boolean; @@ -81,44 +73,44 @@ const AvatarItem = (props: { from: FindAndFormatContactType }) => { /> ); }; -export const MessageSearchResult = (props: Props) => { - const { from, id: messageId, isSelected, conversationId, receivedAt, snippet, to } = props; +// export const MessageSearchResult = (props: Props) => { +// const { from, id: messageId, isSelected, conversationId, receivedAt, snippet, to } = props; - const dispatch = useDispatch(); +// const dispatch = useDispatch(); - if (!from || !to) { - return null; - } +// if (!from || !to) { +// return null; +// } - return ( -
{ - dispatch( - openConversationExternal({ - id: conversationId, - messageId, - firstUnreadIdOnOpen: undefined, - }) - ); - }} - className={classNames( - 'module-message-search-result', - isSelected ? 'module-message-search-result--is-selected' : null - )} - > - -
-
- -
- -
-
-
- -
-
-
- ); -}; +// return ( +//
{ +// dispatch( +// openConversationExternal({ +// id: conversationId, +// messageId, +// firstUnreadIdOnOpen: undefined, +// }) +// ); +// }} +// className={classNames( +// 'module-message-search-result', +// isSelected ? 'module-message-search-result--is-selected' : null +// )} +// > +// +//
+//
+// +//
+// +//
+//
+//
+// +//
+//
+//
+// ); +// }; diff --git a/ts/components/SearchResults.tsx b/ts/components/SearchResults.tsx index e00531b11..d5647a81f 100644 --- a/ts/components/SearchResults.tsx +++ b/ts/components/SearchResults.tsx @@ -4,7 +4,7 @@ import { ConversationListItemProps, MemoConversationListItemWithDetails, } from './ConversationListItem'; -import { MessageSearchResult } from './MessageSearchResult'; +// import { MessageSearchResult } from './MessageSearchResult'; export type SearchResultsProps = { contacts: Array; diff --git a/ts/components/UserDetailsDialog.tsx b/ts/components/UserDetailsDialog.tsx index 749fdc357..511c66a93 100644 --- a/ts/components/UserDetailsDialog.tsx +++ b/ts/components/UserDetailsDialog.tsx @@ -8,7 +8,7 @@ import { ConversationTypeEnum } from '../models/conversation'; import { SessionWrapperModal } from './session/SessionWrapperModal'; import { SpacerMD } from './basic/Text'; import { updateUserDetailsModal } from '../state/ducks/modalDialog'; -import { openConversationExternal } from '../state/ducks/conversations'; +import { openConversationWithMessages } from '../state/ducks/conversations'; // tslint:disable-next-line: no-submodule-imports import useKey from 'react-use/lib/useKey'; import { getFirstUnreadMessageIdInConversation } from '../data/data'; @@ -34,12 +34,8 @@ export const UserDetailsDialog = (props: Props) => { convo.id, ConversationTypeEnum.PRIVATE ); - const firstUnreadIdOnOpen = await getFirstUnreadMessageIdInConversation(conversation.id); - - window.inboxStore?.dispatch( - openConversationExternal({ id: conversation.id, firstUnreadIdOnOpen }) - ); + await openConversationWithMessages({ conversationKey: conversation.id }); closeDialog(); } diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index 1ecd200e1..c8abbee3f 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -46,6 +46,7 @@ import { getQuotedMessageToAnimate, getSelectedConversationKey, getSelectedMessageIds, + haveDoneFirstScroll, } from '../../state/selectors/conversations'; import { fetchMessagesForConversation, @@ -84,6 +85,7 @@ type Props = MessageRenderingProps & { areMoreMessagesBeingFetched: boolean; loadedMessagesLength: number; selectedConversationKey: string | undefined; + haveDoneFirstScroll: boolean; }; function attachmentIsAttachmentTypeWithPath(attac: any): attac is AttachmentTypeWithPath { @@ -609,6 +611,7 @@ class MessageInner extends React.PureComponent { } // tslint:disable-next-line: cyclomatic-complexity + // tslint:disable-next-line: max-func-body-length public render() { const { direction, @@ -646,6 +649,12 @@ class MessageInner extends React.PureComponent { } const onVisible = async (inView: boolean | Object) => { + // when the view first loads, it needs to scroll to the unread messages. + // we need to disable the inview on the first loading + if (!this.props.haveDoneFirstScroll) { + console.warn('waiting for first scroll'); + return; + } // we are the bottom message if (this.props.mostRecentMessageId === messageId) { if (inView === true) { @@ -933,6 +942,7 @@ const mapStateToProps = (state: StateType) => { areMoreMessagesBeingFetched: areMoreMessagesBeingFetched(state), selectedConversationKey: getSelectedConversationKey(state), loadedMessagesLength: getLoadedMessagesLength(state), + haveDoneFirstScroll: haveDoneFirstScroll(state), }; }; diff --git a/ts/components/session/LeftPaneMessageSection.tsx b/ts/components/session/LeftPaneMessageSection.tsx index c260c704e..6cc274aec 100644 --- a/ts/components/session/LeftPaneMessageSection.tsx +++ b/ts/components/session/LeftPaneMessageSection.tsx @@ -5,7 +5,10 @@ import { ConversationListItemProps, MemoConversationListItemWithDetails, } from '../ConversationListItem'; -import { openConversationExternal, ReduxConversationType } from '../../state/ducks/conversations'; +import { + openConversationWithMessages, + ReduxConversationType, +} from '../../state/ducks/conversations'; import { SearchResults, SearchResultsProps } from '../SearchResults'; import { SessionSearchInput } from './SessionSearchInput'; import _, { debounce } from 'lodash'; @@ -320,11 +323,8 @@ export class LeftPaneMessageSection extends React.Component { pubkeyorOns, ConversationTypeEnum.PRIVATE ); - const firstUnreadIdOnOpen = await getFirstUnreadMessageIdInConversation(pubkeyorOns); - window.inboxStore?.dispatch( - openConversationExternal({ id: pubkeyorOns, firstUnreadIdOnOpen }) - ); + await openConversationWithMessages({ conversationKey: pubkeyorOns }); this.handleToggleOverlay(undefined); } else { // this might be an ONS, validate the regex first @@ -345,11 +345,8 @@ export class LeftPaneMessageSection extends React.Component { ConversationTypeEnum.PRIVATE ); - const firstUnreadIdOnOpen = await getFirstUnreadMessageIdInConversation(resolvedSessionID); + await openConversationWithMessages({ conversationKey: resolvedSessionID }); - window.inboxStore?.dispatch( - openConversationExternal({ id: resolvedSessionID, firstUnreadIdOnOpen }) - ); this.handleToggleOverlay(undefined); } catch (e) { window?.log?.warn('failed to resolve ons name', pubkeyorOns, e); diff --git a/ts/components/session/SessionInboxView.tsx b/ts/components/session/SessionInboxView.tsx index 122ab62ea..dd9305b63 100644 --- a/ts/components/session/SessionInboxView.tsx +++ b/ts/components/session/SessionInboxView.tsx @@ -5,7 +5,11 @@ import { ConversationModel } from '../../models/conversation'; import { getConversationController } from '../../session/conversations'; import { UserUtils } from '../../session/utils'; import { createStore } from '../../state/createStore'; -import { actions as conversationActions } from '../../state/ducks/conversations'; +import { + actions as conversationActions, + getEmptyConversationState, + openConversationWithMessages, +} from '../../state/ducks/conversations'; import { initialDefaultRoomState } from '../../state/ducks/defaultRooms'; import { initialModalState } from '../../state/ducks/modalDialog'; import { initialOnionPathState } from '../../state/ducks/onion'; @@ -99,20 +103,8 @@ export class SessionInboxView extends React.Component { const initialState: StateType = { conversations: { + ...getEmptyConversationState(), conversationLookup: makeLookup(fullFilledConversations, 'id'), - messages: [], - showRightPanel: false, - messageDetailProps: undefined, - selectedMessageIds: [], - selectedConversation: undefined, - areMoreMessagesBeingFetched: false, - showScrollButton: false, - animateQuotedMessageId: undefined, - lightBox: undefined, - nextMessageToPlay: undefined, - quotedMessage: undefined, - mentionMembers: [], - firstUnreadMessageId: undefined, }, user: { ourNumber: UserUtils.getOurPubKeyStrFromCache(), @@ -134,7 +126,7 @@ export class SessionInboxView extends React.Component { // Enables our redux store to be updated by backbone events in the outside world const { messageExpired } = bindActionCreators(conversationActions, this.store.dispatch); - window.actionsCreators = conversationActions; + window.openConversationWithMessages = openConversationWithMessages; // messageExpired is currently inboked fropm js. So we link it to Redux that way window.Whisper.events.on('messageExpired', messageExpired); diff --git a/ts/components/session/conversation/SessionMessagesListContainer.tsx b/ts/components/session/conversation/SessionMessagesListContainer.tsx index 0be22fe64..dd3c3ba0c 100644 --- a/ts/components/session/conversation/SessionMessagesListContainer.tsx +++ b/ts/components/session/conversation/SessionMessagesListContainer.tsx @@ -12,6 +12,7 @@ import { setNextMessageToPlay, showScrollToBottomButton, SortedMessageModelProps, + updateHaveDoneFirstScroll, } from '../../../state/ducks/conversations'; import { ToastUtils } from '../../../session/utils'; import { TypingBubble } from '../../conversation/TypingBubble'; @@ -48,14 +49,11 @@ type Props = SessionMessageListProps & { }; class SessionMessagesListContainerInner extends React.Component { - private ignoreScrollEvents: boolean; private timeoutResetQuotedScroll: NodeJS.Timeout | null = null; public constructor(props: Props) { super(props); autoBind(this); - - this.ignoreScrollEvents = true; } // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -63,8 +61,7 @@ class SessionMessagesListContainerInner extends React.Component { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ public componentDidMount() { - // Pause thread to wait for rendering to complete - setTimeout(this.initialMessageLoadingPosition, 0); + this.initialMessageLoadingPosition(); } public componentWillUnmount() { @@ -87,9 +84,7 @@ class SessionMessagesListContainerInner extends React.Component { this.setupTimeoutResetQuotedHighlightedMessage(this.props.animateQuotedMessageId); // displayed conversation changed. We have a bit of cleaning to do here - this.ignoreScrollEvents = true; this.initialMessageLoadingPosition(); - this.ignoreScrollEvents = false; } else { // if we got new message for this convo, and we are scrolled to bottom if (isSameConvo && messageLengthChanged) { @@ -97,8 +92,6 @@ class SessionMessagesListContainerInner extends React.Component { // Adjust scroll so these new items don't push the old ones out of view. // (snapshot here is the value returned from getSnapshotBeforeUpdate) if (prevProps.messagesProps.length && snapshot !== null) { - this.ignoreScrollEvents = true; - const list = this.props.messageContainerRef.current; // if we added a message at the top, keep position from the bottom. @@ -106,23 +99,28 @@ class SessionMessagesListContainerInner extends React.Component { prevProps.messagesProps[0].propsForMessage.id === this.props.messagesProps[0].propsForMessage.id ) { - // list.scrollTop = list.scrollHeight - (snapshot.scrollHeight - snapshot.scrollTop); + list.scrollTop = list.scrollHeight - (snapshot.scrollHeight - snapshot.scrollTop); } else { // if we added a message at the bottom, keep position from the bottom. - // list.scrollTop = snapshot.scrollTop; + list.scrollTop = snapshot.scrollTop; } - this.ignoreScrollEvents = false; } } } } public getSnapshotBeforeUpdate(prevProps: Props) { + // getSnapshotBeforeUpdate is kind of pain to do in react hooks, so better keep the message list as a + // class component for now + // Are we adding new items to the list? // Capture the scroll position so we can adjust scroll later. if (prevProps.messagesProps.length < this.props.messagesProps.length) { const list = this.props.messageContainerRef.current; - + console.warn('getSnapshotBeforeUpdate ', { + scrollHeight: list.scrollHeight, + scrollTop: list.scrollTop, + }); return { scrollHeight: list.scrollHeight, scrollTop: list.scrollTop }; } return null; @@ -166,33 +164,6 @@ class SessionMessagesListContainerInner extends React.Component { ); } - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - // ~~~~~~~~~~~~~ MESSAGE HANDLING ~~~~~~~~~~~~~ - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - private updateReadMessages(forceIsOnBottom = false) { - const { messagesProps, conversationKey } = this.props; - - if (!messagesProps || messagesProps.length === 0 || !conversationKey) { - return; - } - - const conversation = getConversationController().getOrThrow(conversationKey); - - if (conversation.isBlocked()) { - return; - } - - if (this.ignoreScrollEvents) { - return; - } - - if ((forceIsOnBottom || this.getScrollOffsetBottomPx() === 0) && isElectronWindowFocused()) { - void conversation.markRead(Date.now()).then(() => { - window.inboxStore?.dispatch(markConversationFullyRead(conversationKey)); - }); - } - } - /** * Sets the targeted index for the next * @param index index of message that just completed @@ -246,11 +217,7 @@ class SessionMessagesListContainerInner extends React.Component { this.scrollToMessage(messagesProps[middle].propsForMessage.id); } } - - if (this.ignoreScrollEvents && messagesProps.length > 0) { - this.ignoreScrollEvents = false; - this.updateReadMessages(); - } + // window.inboxStore?.dispatch(updateHaveDoneFirstScroll()); } /** @@ -274,18 +241,12 @@ class SessionMessagesListContainerInner extends React.Component { } } - private scrollToMessage(messageId: string, scrollIsQuote: boolean = false) { - const messageElementDom = document.getElementById(messageId); + private scrollToMessage(messageId: string) { + const messageElementDom = document.getElementById(`inview-${messageId}`); messageElementDom?.scrollIntoView({ behavior: 'auto', block: 'center', }); - - // we consider that a `scrollIsQuote` set to true, means it's a quoted message, so highlight this message on the UI - if (scrollIsQuote) { - window.inboxStore?.dispatch(quotedMessageToAnimate(messageId)); - this.setupTimeoutResetQuotedHighlightedMessage(messageId); - } } private scrollToBottom() { @@ -343,21 +304,10 @@ class SessionMessagesListContainerInner extends React.Component { } const databaseId = targetMessage.propsForMessage.id; - this.scrollToMessage(databaseId, true); - } - - // basically the offset in px from the bottom of the view (most recent message) - private getScrollOffsetBottomPx() { - const messageContainer = this.props.messageContainerRef?.current; - - if (!messageContainer) { - return Number.MAX_VALUE; - } - - const scrollTop = messageContainer.scrollTop; - const scrollHeight = messageContainer.scrollHeight; - const clientHeight = messageContainer.clientHeight; - return scrollHeight - scrollTop - clientHeight; + this.scrollToMessage(databaseId); + // Highlight this message on the UI + window.inboxStore?.dispatch(quotedMessageToAnimate(databaseId)); + this.setupTimeoutResetQuotedHighlightedMessage(databaseId); } } diff --git a/ts/models/message.ts b/ts/models/message.ts index 643e391f0..52b81ee85 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -1180,7 +1180,6 @@ export class MessageModel extends Backbone.Model { } private dispatchMessageUpdate() { trotthledAllMessagesDispatch(); - console.warn('adding dispatch for:', this.id); updatesToDispatch.set(this.id, this.getProps()); } @@ -1190,7 +1189,6 @@ const trotthledAllMessagesDispatch = _.throttle(() => { if (updatesToDispatch.size === 0) { return; } - console.warn('TRIGGERING ALL DISPATCH'); window.inboxStore?.dispatch(messagesChanged([...updatesToDispatch.values()])); updatesToDispatch.clear(); }, 1000); diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index 2f7305f85..8e55bb09a 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -31,7 +31,7 @@ import { forceSyncConfigurationNowIfNeeded } from '../session/utils/syncUtils'; import { getMessageController } from '../session/messages'; import { ClosedGroupEncryptionPairReplyMessage } from '../session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage'; import { queueAllCachedFromSource } from './receiver'; -import { openConversationExternal } from '../state/ducks/conversations'; +import { openConversationWithMessages } from '../state/ducks/conversations'; import { getSwarmPollingInstance } from '../session/snode_api'; import { MessageModel } from '../models/message'; @@ -952,9 +952,7 @@ export async function createClosedGroup(groupName: string, members: Array { if (updatesToDispatch.size === 0) { return; } - console.warn('TRIGGERING ALL ADDED DISPATCH'); window.inboxStore?.dispatch(messagesAdded([...updatesToDispatch.values()])); updatesToDispatch.clear(); }, 1000); diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 21a3d3f69..cf1dda40a 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -3,7 +3,7 @@ import _, { omit } from 'lodash'; import { Constants } from '../../session'; import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit'; import { getConversationController } from '../../session/conversations'; -import { getMessagesByConversation } from '../../data/data'; +import { getFirstUnreadMessageIdInConversation, getMessagesByConversation } from '../../data/data'; import { ConversationNotificationSettingType, ConversationTypeEnum, @@ -255,6 +255,7 @@ export type ConversationsStateType = { lightBox?: LightBoxOptions; quotedMessage?: ReplyingToMessageProps; areMoreMessagesBeingFetched: boolean; + haveDoneFirstScroll: boolean; showScrollButton: boolean; animateQuotedMessageId?: string; @@ -334,7 +335,7 @@ export const fetchMessagesForConversation = createAsyncThunk( // Reducer -function getEmptyState(): ConversationsStateType { +export function getEmptyConversationState(): ConversationsStateType { return { conversationLookup: {}, messages: [], @@ -345,6 +346,7 @@ function getEmptyState(): ConversationsStateType { showScrollButton: false, mentionMembers: [], firstUnreadMessageId: undefined, + haveDoneFirstScroll: false, }; } @@ -464,7 +466,7 @@ function handleConversationReset(state: ConversationsStateType, action: PayloadA const conversationsSlice = createSlice({ name: 'conversations', - initialState: getEmptyState(), + initialState: getEmptyConversationState(), reducers: { showMessageDetailsView( state: ConversationsStateType, @@ -569,7 +571,7 @@ const conversationsSlice = createSlice({ }, removeAllConversations() { - return getEmptyState(); + return getEmptyConversationState(); }, messageAdded( @@ -648,6 +650,7 @@ const conversationsSlice = createSlice({ action: PayloadAction<{ id: string; firstUnreadIdOnOpen: string | undefined; + initialMessages: Array; messageId?: string; }> ) { @@ -659,7 +662,7 @@ const conversationsSlice = createSlice({ conversationLookup: state.conversationLookup, selectedConversation: action.payload.id, areMoreMessagesBeingFetched: false, - messages: [], + messages: action.payload.initialMessages, showRightPanel: false, selectedMessageIds: [], lightBox: undefined, @@ -671,8 +674,14 @@ const conversationsSlice = createSlice({ animateQuotedMessageId: undefined, mentionMembers: [], firstUnreadMessageId: action.payload.firstUnreadIdOnOpen, + + haveDoneFirstScroll: false, }; }, + updateHaveDoneFirstScroll(state: ConversationsStateType) { + state.haveDoneFirstScroll = true; + return state; + }, showLightBox( state: ConversationsStateType, action: PayloadAction @@ -753,7 +762,7 @@ export const { conversationReset, messageChanged, messagesChanged, - openConversationExternal, + updateHaveDoneFirstScroll, markConversationFullyRead, // layout stuff showMessageDetailsView, @@ -770,3 +779,22 @@ export const { setNextMessageToPlay, updateMentionsMembers, } = actions; + +export async function openConversationWithMessages(args: { + conversationKey: string; + messageId?: string; +}) { + const { conversationKey, messageId } = args; + const firstUnreadIdOnOpen = await getFirstUnreadMessageIdInConversation(conversationKey); + + const initialMessages = await getMessages(conversationKey, 30); + + window.inboxStore?.dispatch( + actions.openConversationExternal({ + id: conversationKey, + firstUnreadIdOnOpen, + messageId, + initialMessages, + }) + ); +} diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index e8db5a8df..20792deec 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -320,6 +320,11 @@ export const areMoreMessagesBeingFetched = createSelector( (state: ConversationsStateType): boolean => state.areMoreMessagesBeingFetched || false ); +export const haveDoneFirstScroll = createSelector( + getConversations, + (state: ConversationsStateType): boolean => state.haveDoneFirstScroll +); + export const getShowScrollButton = createSelector( getConversations, (state: ConversationsStateType): boolean => state.showScrollButton || false diff --git a/ts/window.d.ts b/ts/window.d.ts index 2fdc03466..9e25d58d5 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -73,7 +73,10 @@ declare global { autoOrientImage: any; contextMenuShown: boolean; inboxStore?: Store; - actionsCreators: any; + openConversationWithMessages: (args: { + conversationKey: string; + messageId?: string | undefined; + }) => Promise; extension: { expired: (boolean) => void; expiredStatus: () => boolean;