keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

open convo on last unread, and can scroll up

Browse Source
pull/2142/head
audric 3 years ago committed by Audric Ackermann
parent 12b00720f4
commit a21751c611
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4
21 changed files with 132 additions and 126 deletions
Show Stats Download Patch File Download Diff File

1
.prettierignore
Unescape Escape View File

@ -31,6 +31,7 @@ libtextsecure/libsignal-protocol.js
js/util_worker.js
libtextsecure/test/blanket_mocha.js
mnemonic_languages/**
playwright.config.js
# Managed by package manager (`yarn`/`npm`):
/package.json

18
app/sql.js
Unescape Escape View File

@ -2233,28 +2233,29 @@ function getUnreadCountByConversation(conversationId) {
// be sure to update the sorting order to sort messages on redux too (sortMessages)
const orderByClause =
'ORDER BY serverTimestamp DESC, serverId DESC, sent_at DESC, received_at DESC';
function getMessagesByConversation(conversationId, { messageId = null } = {}) {
const absLimit = 30;
const absLimit = 20;
// If messageId is given it means we are opening the conversation to that specific messageId,
// or that we just scrolled to it by a quote click and needs to load around it.
// If messageId is null, it means we are just opening the convo to the last unread message, or at the bottom
const firstUnread = getFirstUnreadMessageIdInConversation(conversationId);
if (messageId || firstUnread) {
const messageFound = getMessageById(messageId || firstUnread);
if (messageFound && messageFound.conversationId === conversationId) {
console.warn('firstUnread', messageId, firstUnread, messageFound);
const rows = globalInstance
.prepare(
`WITH cte AS (
SELECT id, json, row_number() OVER (${orderByClause}) as row_number
FROM messages
SELECT id, conversationId, json, row_number() OVER (${orderByClause}) as row_number
FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId
), current AS (
SELECT row_number
FROM cte
WHERE id = $messageId
)
SELECT cte.*
FROM cte, current
@ -2267,7 +2268,7 @@ function getMessagesByConversation(conversationId, { messageId = null } = {}) {
messageId: messageId || firstUnread,
limit: absLimit,
});
console.warn('rows', rows);
return map(rows, row => jsonToObject(row.json));
}
console.warn(
@ -2275,6 +2276,8 @@ function getMessagesByConversation(conversationId, { messageId = null } = {}) {
);
}
const limit = 2 * absLimit;
const rows = globalInstance
.prepare(
`
@ -2286,8 +2289,9 @@ function getMessagesByConversation(conversationId, { messageId = null } = {}) {
)
.all({
conversationId,
limit: 2 * absLimit,
limit,
});
return map(rows, row => jsonToObject(row.json));
}

16
stylesheets/_quote.scss
Unescape Escape View File

@ -271,20 +271,6 @@
}
}
// animate when user is scrolling to a quoted message
@keyframes blinker {
0% {
border-color: rgba($session-color-green, 1);
}
80% {
border-color: rgba($session-color-green, 1);
}
100% {
border-color: transparent;
}
}
.flash-green-once {
border-color: $session-color-green;
animation: blinker 2s 1 normal forwards;
box-shadow: 0px 0px 6px 3px $session-color-green;
}

3
stylesheets/_session.scss
Unescape Escape View File

@ -331,9 +331,6 @@ pre {
// To limit messages with things forcing them wider, like long attachment names
max-width: calc(100vw - 380px - 100px);
align-items: center;
border-style: solid;
border-color: transparent;
border-width: 3px;
}
label {
user-select: none;

2
ts/components/calling/DraggableCallContainer.tsx
Unescape Escape View File

@ -100,7 +100,7 @@ export const DraggableCallContainer = () => {
const openCallingConversation = () => {
if (ongoingCallPubkey && ongoingCallPubkey !== selectedConversationKey) {
void openConversationWithMessages({ conversationKey: ongoingCallPubkey });
void openConversationWithMessages({ conversationKey: ongoingCallPubkey, messageId: null });
}
};

7
ts/components/conversation/SessionMessagesList.tsx
Unescape Escape View File

@ -45,14 +45,9 @@ export const SessionMessagesList = (props: {
const newTopMessageId = messagesProps.length
? messagesProps[messagesProps.length - 1].message.props.messageId
: undefined;
console.warn('useLayoutEffect ', {
oldTopMessageId,
newTopMessageId,
length: messagesProps.length,
});
if (oldTopMessageId !== newTopMessageId && oldTopMessageId && newTopMessageId) {
props.scrollAfterLoadMore(oldTopMessageId, 'center');
props.scrollAfterLoadMore(oldTopMessageId, 'start');
}
});

50
ts/components/conversation/SessionMessagesListContainer.tsx
Unescape Escape View File

@ -15,8 +15,10 @@ import { QuoteClickOptions } from '../../models/messageType';
import { getConversationController } from '../../session/conversations';
import { ToastUtils } from '../../session/utils';
import {
openConversationOnQuoteClick,
quotedMessageToAnimate,
ReduxConversationType,
resetOldTopMessageId,
showScrollToBottomButton,
SortedMessageModelProps,
updateHaveDoneFirstScroll,
@ -122,8 +124,12 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
// // currentRef.scrollTop = snapShot.fakeScrollTop;
// // }
// }
if (!isSameConvo) {
console.info('Not same convo, resetting scrolling posiiton');
if (
!isSameConvo &&
this.props.messagesProps.length &&
this.props.messagesProps[0].propsForMessage.convoId === this.props.conversationKey
) {
console.info('Not same convo, resetting scrolling posiiton', this.props.messagesProps.length);
this.setupTimeoutResetQuotedHighlightedMessage(this.props.animateQuotedMessageId);
// displayed conversation changed. We have a bit of cleaning to do here
this.initialMessageLoadingPosition();
@ -183,7 +189,9 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
<SessionMessagesList
scrollToQuoteMessage={this.scrollToQuoteMessage}
scrollAfterLoadMore={this.scrollToMessage}
scrollAfterLoadMore={(...args) => {
this.scrollToMessage(...args, { isLoadMoreTop: true });
}}
onPageDownPressed={this.scrollPgDown}
onPageUpPressed={this.scrollPgUp}
onHomePressed={this.scrollTop}
@ -211,8 +219,6 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
return;
}
console.warn('firstUnreadOnOpen', firstUnreadOnOpen);
if (
(conversation.unreadCount && conversation.unreadCount <= 0) ||
firstUnreadOnOpen === undefined
@ -224,7 +230,6 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
const firstUnreadIndex = messagesProps.findIndex(
m => m.propsForMessage.id === firstUnreadOnOpen
);
console.warn('firstUnreadIndex', firstUnreadIndex);
if (firstUnreadIndex === -1) {
// the first unread message is not in the 30 most recent messages
@ -236,7 +241,7 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
const messageElementDom = document.getElementById('unread-indicator');
messageElementDom?.scrollIntoView({
behavior: 'auto',
block: 'end',
block: 'center',
});
}
}
@ -267,14 +272,22 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
}
}
private scrollToMessage(messageId: string, block: ScrollLogicalPosition | undefined) {
private scrollToMessage(
messageId: string,
block: ScrollLogicalPosition | undefined,
options?: { isLoadMoreTop: boolean | undefined }
) {
const messageElementDom = document.getElementById(`msg-${messageId}`);
console.warn('scrollToMessage', messageElementDom);
debugger;
messageElementDom?.scrollIntoView({
behavior: 'auto',
block,
});
if (options?.isLoadMoreTop) {
// reset the oldTopInRedux so that a refresh/new message does not scroll us back here again
window.inboxStore?.dispatch(resetOldTopMessageId());
}
}
private scrollToBottom() {
@ -328,6 +341,9 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
}
private async scrollToQuoteMessage(options: QuoteClickOptions) {
if (!this.props.conversationKey) {
return;
}
const { quoteAuthor, quoteId, referencedMessageNotFound } = options;
const { messagesProps } = this.props;
@ -356,15 +372,17 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
// some more information then show an informative toast to the user.
if (!targetMessage) {
const collection = await getMessagesBySentAt(quoteId);
const found = Boolean(
collection.find((item: MessageModel) => {
const messageAuthor = item.getSource();
const found = collection.find((item: MessageModel) => {
const messageAuthor = item.getSource();
return Boolean(messageAuthor && quoteAuthor === messageAuthor);
})
);
return Boolean(messageAuthor && quoteAuthor === messageAuthor);
});
if (found) {
void openConversationOnQuoteClick({
conversationKey: this.props.conversationKey,
messageIdToNavigateTo: found.get('id'),
});
ToastUtils.pushFoundButNotLoaded();
} else {
ToastUtils.pushOriginalNoLongerAvailable();

1
ts/components/conversation/SessionRightPanel.tsx
Unescape Escape View File

@ -37,7 +37,6 @@ async function getMediaGalleryProps(
documents: Array<MediaItemType>;
media: Array<MediaItemType>;
}> {
console.warn('getMediaGalleryProps');
// We fetch more documents than media as they don’t require to be loaded
// into memory right away. Revisit this once we have infinite scrolling:
const rawMedia = await getMessagesWithVisualMediaAttachments(conversationId, {

2
ts/components/dialog/UserDetailsDialog.tsx
Unescape Escape View File

@ -39,7 +39,7 @@ export const UserDetailsDialog = (props: Props) => {
ConversationTypeEnum.PRIVATE
);
await openConversationWithMessages({ conversationKey: conversation.id });
await openConversationWithMessages({ conversationKey: conversation.id, messageId: null });
closeDialog();
}

2
ts/components/leftpane/conversation-list-item/ConversationListItem.tsx
Unescape Escape View File

@ -92,7 +92,7 @@ const ConversationListItem = (props: Props) => {
async (e: React.MouseEvent<HTMLDivElement>) => {
// mousedown is invoked sooner than onClick, but for both right and left click
if (e.button === 0) {
await openConversationWithMessages({ conversationKey: conversationId });
await openConversationWithMessages({ conversationKey: conversationId, messageId: null });
}
},
[conversationId]

4
ts/components/leftpane/overlay/OverlayMessage.tsx
Unescape Escape View File

@ -47,7 +47,7 @@ export const OverlayMessage = () => {
ConversationTypeEnum.PRIVATE
);
await openConversationWithMessages({ conversationKey: pubkeyorOnsTrimmed });
await openConversationWithMessages({ conversationKey: pubkeyorOnsTrimmed, messageId: null });
closeOverlay();
} else {
// this might be an ONS, validate the regex first
@ -68,7 +68,7 @@ export const OverlayMessage = () => {
ConversationTypeEnum.PRIVATE
);
await openConversationWithMessages({ conversationKey: resolvedSessionID });
await openConversationWithMessages({ conversationKey: resolvedSessionID, messageId: null });
closeOverlay();
} catch (e) {

7
ts/data/data.ts
Unescape Escape View File

@ -754,10 +754,7 @@ export async function getUnreadCountByConversation(conversationId: string): Prom
export async function getMessagesByConversation(
conversationId: string,
{
skipTimerInit = false,
messageId = null,
}: { limit?: number; skipTimerInit?: false; messageId: string | null }
{ skipTimerInit = false, messageId = null }: { skipTimerInit?: false; messageId: string | null }
): Promise<MessageCollection> {
const messages = await channels.getMessagesByConversation(conversationId, {
messageId,
@ -767,7 +764,7 @@ export async function getMessagesByConversation(
message.skipTimerInit = skipTimerInit;
}
}
console.warn('messages length got: ', messages.length);
console.warn(`messages length got: ${messages.length} for ${conversationId}:${messageId}`);
return new MessageCollection(messages);
}

12
ts/models/conversation.ts
Unescape Escape View File

@ -937,12 +937,12 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
if (setToExpire) {
await model.setToExpire();
}
window.inboxStore?.dispatch(
conversationActions.messageAdded({
conversationKey: this.id,
messageModelProps: model.getMessageModelProps(),
})
);
// window.inboxStore?.dispatch(
// conversationActions.messageAdded({
// conversationKey: this.id,
// messageModelProps: model.getMessageModelProps(),
// })
// );
const unreadCount = await this.getUnreadCount();
this.set({ unreadCount });
this.updateLastMessage();

2
ts/receiver/closedGroups.ts
Unescape Escape View File

@ -949,7 +949,7 @@ export async function createClosedGroup(groupName: string, members: Array<string
await forceSyncConfigurationNowIfNeeded();
await openConversationWithMessages({ conversationKey: groupPublicKey });
await openConversationWithMessages({ conversationKey: groupPublicKey, messageId: null });
}
/**

12
ts/receiver/errors.ts
Unescape Escape View File

@ -34,12 +34,12 @@ export async function onError(ev: any) {
conversation.updateLastMessage();
await conversation.notify(message);
window.inboxStore?.dispatch(
conversationActions.messageAdded({
conversationKey: conversation.id,
messageModelProps: message.getMessageModelProps(),
})
);
// window.inboxStore?.dispatch(
// conversationActions.messageAdded({
// conversationKey: conversation.id,
// messageModelProps: message.getMessageModelProps(),
// })
// );
if (ev.confirm) {
ev.confirm();

2
ts/session/utils/calling/CallManager.ts
Unescape Escape View File

@ -780,7 +780,7 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) {
return;
}
window.inboxStore?.dispatch(answerCall({ pubkey: fromSender }));
await openConversationWithMessages({ conversationKey: fromSender });
await openConversationWithMessages({ conversationKey: fromSender, messageId: null });
if (peerConnection) {
throw new Error('USER_acceptIncomingCallRequest: peerConnection is already set.');
}

76
ts/state/ducks/conversations.ts
Unescape Escape View File

@ -300,7 +300,6 @@ async function getMessages({
window?.log?.error('Failed to get convo on reducer.');
return [];
}
console.warn('getMessages with messageId', messageId);
const messageSet = await getMessagesByConversation(conversationKey, {
messageId,
@ -332,7 +331,6 @@ export const fetchTopMessagesForConversation = createAsyncThunk(
conversationKey: string;
oldTopMessageId: string | null;
}): Promise<FetchedMessageResults> => {
console.warn('fetchTopMessagesForConversation oldTop:', oldTopMessageId);
const beforeTimestamp = Date.now();
perfStart('fetchTopMessagesForConversation');
const messagesProps = await getMessages({
@ -683,20 +681,19 @@ const conversationsSlice = createSlice({
openConversationExternal(
state: ConversationsStateType,
action: PayloadAction<{
id: string;
conversationKey: string;
firstUnreadIdOnOpen: string | undefined;
initialMessages: Array<MessageModelPropsWithoutConvoProps>;
messageId?: string;
}>
) {
if (state.selectedConversation === action.payload.id) {
if (state.selectedConversation === action.payload.conversationKey) {
return state;
}
return {
conversationLookup: state.conversationLookup,
selectedConversation: action.payload.id,
selectedConversation: action.payload.conversationKey,
areMoreTopMessagesBeingFetched: false,
messages: action.payload.initialMessages,
showRightPanel: false,
@ -715,6 +712,31 @@ const conversationsSlice = createSlice({
haveDoneFirstScroll: false,
};
},
navigateInConversationToMessageId(
state: ConversationsStateType,
action: PayloadAction<{
conversationKey: string;
messageIdToNavigateTo: string;
initialMessages: Array<MessageModelPropsWithoutConvoProps>;
}>
) {
if (state.selectedConversation !== action.payload.conversationKey) {
return state;
}
return {
...state,
areMoreTopMessagesBeingFetched: false,
messages: action.payload.initialMessages,
showScrollButton: true,
animateQuotedMessageId: action.payload.messageIdToNavigateTo,
oldTopMessageId: null,
};
},
resetOldTopMessageId(state: ConversationsStateType) {
state.oldTopMessageId = null;
return state;
},
updateHaveDoneFirstScroll(state: ConversationsStateType) {
state.haveDoneFirstScroll = true;
return state;
@ -769,7 +791,6 @@ const conversationsSlice = createSlice({
const { messagesProps, conversationKey, oldTopMessageId } = action.payload;
// double check that this update is for the shown convo
if (conversationKey === state.selectedConversation) {
console.warn('fullfilled', oldTopMessageId);
return {
...state,
oldTopMessageId,
@ -828,6 +849,7 @@ export const {
conversationReset,
messageChanged,
messagesChanged,
resetOldTopMessageId,
updateHaveDoneFirstScroll,
markConversationFullyRead,
// layout stuff
@ -848,28 +870,48 @@ export const {
export async function openConversationWithMessages(args: {
conversationKey: string;
messageId?: string;
messageId: string | null;
}) {
const { conversationKey, messageId } = args;
perfStart('getFirstUnreadMessageIdInConversation');
console.warn('openConversationWithMessages', conversationKey);
const firstUnreadIdOnOpen = await getFirstUnreadMessageIdInConversation(conversationKey);
perfEnd('getFirstUnreadMessageIdInConversation', 'getFirstUnreadMessageIdInConversation');
// preload 30 messages
perfStart('getMessages');
const initialMessages = await getMessages({
conversationKey,
messageId: null,
messageId: messageId || null,
});
perfEnd('getMessages', 'getMessages');
window.inboxStore?.dispatch(
actions.openConversationExternal({
id: conversationKey,
conversationKey,
firstUnreadIdOnOpen,
messageId,
initialMessages,
})
);
}
export async function openConversationOnQuoteClick(args: {
conversationKey: string;
messageIdToNavigateTo: string;
}) {
const { conversationKey, messageIdToNavigateTo } = args;
console.warn('openConversationOnQuoteClick', { conversationKey, messageIdToNavigateTo });
const messagesAroundThisMessage = await getMessages({
conversationKey,
messageId: messageIdToNavigateTo,
});
console.warn(
'position of navigate to message is ',
messagesAroundThisMessage.findIndex(m => m.propsForMessage.id === messageIdToNavigateTo)
);
window.inboxStore?.dispatch(
actions.navigateInConversationToMessageId({
conversationKey,
messageIdToNavigateTo,
initialMessages: messagesAroundThisMessage,
})
);
}

34
ts/state/ducks/search.ts
Unescape Escape View File

@ -298,39 +298,5 @@ export function reducer(state: SearchStateType | undefined, action: SEARCH_TYPES
};
}
// if (action.type === 'CONVERSATIONS_REMOVE_ALL') {
// return getEmptyState();
// }
// if (action.type === openConversationExternal.name) {
// const { payload } = action;
// const { messageId } = payload;
// if (!messageId) {
// return state;
// }
// return {
// ...state,
// selectedMessage: messageId,
// };
// }
// if (action.type === 'MESSAGE_EXPIRED') {
// const { messages, messageLookup } = state;
// if (!messages.length) {
// return state;
// }
// const { payload } = action;
// const { messageId } = payload;
// return {
// ...state,
// messages: reject(messages, message => messageId === message.id),
// messageLookup: omit(messageLookup, ['id']),
// };
// }
return state;
}

4
ts/state/selectors/conversations.ts
Unescape Escape View File

@ -186,9 +186,11 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector(
return sortedMessages.map((msg, index) => {
const isFirstUnread = Boolean(firstUnreadId === msg.propsForMessage.id);
const messageTimestamp = msg.propsForMessage.serverTimestamp || msg.propsForMessage.timestamp;
// do not show the date break if we are the oldest message (no previous)
// this is to smooth a bit the loading of older message (to avoid a jump once new messages are rendered)
const previousMessageTimestamp =
index + 1 >= sortedMessages.length
? 0
? Number.MAX_SAFE_INTEGER
: sortedMessages[index + 1].propsForMessage.serverTimestamp ||
sortedMessages[index + 1].propsForMessage.timestamp;

1
ts/test/automation/open.ts
Unescape Escape View File

@ -34,7 +34,6 @@ test.beforeEach(() => {
throw new Error('parentFolderOfAllDataPath unset');
}
const pathToRemove = path.join(parentFolderOfAllDataPath, folder);
console.warn('Removing old test data left at: ', pathToRemove);
rmdirSync(pathToRemove, { recursive: true });
});
});

2
ts/window.d.ts vendored
Unescape Escape View File

@ -71,7 +71,7 @@ declare global {
inboxStore?: Store;
openConversationWithMessages: (args: {
conversationKey: string;
messageId?: string | undefined;
messageId: string | null;
}) => Promise<void>;
LokiPushNotificationServer: any;
getGlobalOnlineStatus: () => boolean;

Write Preview
Loading…
Cancel
Save