oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

Adding handling of edge case for messaging clients without request approval update.

Browse source
This commit is contained in:
warrickct 2022-02-14 23:41:08 +11:00
parent 6a02846829
commit c3d9912572
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ts/interactions/conversationInteractions.ts
View file

@ -298,6 +298,7 @@ export async function deleteAllMessagesByConvoIdNoConfirmation(conversationId: s
lastMessage: null,
unreadCount: 0,
mentionedUs: false,
isApproved: false,
});
await conversation.commit();

25
ts/receiver/contentMessage.ts
View file

@ -371,19 +371,38 @@ export async function innerHandleSwarmContentMessage(
);
}
const newConvo = await getConversationController().getOrCreateAndWait(
const convo = await getConversationController().getOrCreateAndWait(
envelope.source,
ConversationTypeEnum.PRIVATE
);
if (
newConvo.isPrivate() &&
!newConvo.isApproved() &&
convo.isPrivate() &&
!convo.isApproved() &&
window.inboxStore?.getState().userConfig.hideMessageRequests
) {
window.inboxStore?.dispatch(showMessageRequestBanner());
}
// For edge case when messaging a client that's unable to explicitly send request approvals
if (!convo.didApproveMe() && convo.isPrivate() && convo.isApproved()) {
convo.setDidApproveMe(true);
// Conversation was not approved before so a sync is needed
convo.addSingleMessage({
conversationId: convo.get('id'),
source: envelope.source,
type: 'outgoing', // mark it as outgoing just so it appears below our sent attachment
sent_at: _.toNumber(envelope.timestamp), // TODO: maybe add timestamp to messageRequestResponse? confirm it doesn't exist first
received_at: Date.now(),
messageRequestResponse: {
isApproved: 1,
},
unread: 1, // 1 means unread
expireTimer: 0,
});
convo.updateLastMessage();
}
if (content.dataMessage) {
if (content.dataMessage.profileKey && content.dataMessage.profileKey.length === 0) {
content.dataMessage.profileKey = null;