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

Added syncing accepting of contact between running instances.

Browse Source
pull/2000/head
Warrick Corfe-Tan 4 years ago
parent 9e0f128fc6
commit 4ad14e4c5b
9 changed files with 62 additions and 56 deletions
Show Stats Download Patch File Download Diff File

7
app/sql.js
Unescape Escape View File

@ -1600,9 +1600,14 @@ function updateConversation(data) {
type,
members,
name,
isApproved,
profileName,
} = data;
console.log({ usrData: data });
console.log({ usrDataTrace: console.trace() });
console.log('usrData@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@');
globalInstance
.prepare(
`UPDATE ${CONVERSATIONS_TABLE} SET
@ -1612,6 +1617,7 @@ function updateConversation(data) {
type = $type,
members = $members,
name = $name,
isApproved = $isApproved,
profileName = $profileName
WHERE id = $id;`
)
@ -1623,6 +1629,7 @@ function updateConversation(data) {
type,
members: members ? members.join(' ') : null,
name,
isApproved,
profileName,
});
}

15
ts/components/ConversationListItem.tsx
Unescape Escape View File

@ -30,7 +30,7 @@ import { ConversationNotificationSettingType } from '../models/conversation';
import { Flex } from './basic/Flex';
import { SessionButton, SessionButtonColor } from './session/SessionButton';
import { getConversationById } from '../data/data';
import { getConversationController } from '../session/conversations';
import { syncConfigurationIfNeeded } from '../session/utils/syncUtils';
// tslint:disable-next-line: no-empty-interface
export interface ConversationListItemProps extends ReduxConversationType {}
@ -287,7 +287,10 @@ const ConversationListItem = (props: Props) => {
* deletes the conversation
*/
const handleConversationDecline = async () => {
await getConversationController().deleteContact(conversationId);
// const convoToDecline = await getConversationById(conversationId);
// convoToDecline?.setIsApproved(false);
// await getConversationController().deleteContact(conversationId); // TODO: might be unnecessary
console.warn('decline');
};
/**
@ -295,12 +298,12 @@ const ConversationListItem = (props: Props) => {
*/
const handleConversationAccept = async () => {
const conversationToApprove = await getConversationById(conversationId);
conversationToApprove?.setIsApproved(true);
console.warn('convo marked as approved');
console.warn({ convo: conversationToApprove });
await conversationToApprove?.setIsApproved(true);
console.warn({ convoAfterSetIsApproved: conversationToApprove });
// TODO: Send sync message to other devices. Using config message
await syncConfigurationIfNeeded(true);
};
return (

40
ts/components/session/LeftPaneMessageSection.tsx
Unescape Escape View File

@ -85,22 +85,26 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
public renderRow = ({ index, key, style }: RowRendererParamsType): JSX.Element | null => {
const { conversations } = this.props;
const approvedConversations = conversations?.filter(c => c.isApproved === true);
const approvedConversations = conversations?.filter(c => Boolean(c.isApproved) === true);
if (!conversations || !approvedConversations) {
throw new Error('renderRow: Tried to render without conversations');
}
// const conversation = conversations[index];
// TODO: make this only filtered when the setting is enabled
const messageRequestsEnabled =
window.inboxStore?.getState().userConfig.messageRequests === true;
let conversation;
if (approvedConversations?.length) {
conversation = approvedConversations[index];
}
// TODO: need to confirm whats best here.
if (
!conversation ||
conversation?.isApproved === undefined ||
conversation.isApproved === false
) {
if (!conversation) {
return null;
}
// TODO: need to confirm what default setting is best here.
if (messageRequestsEnabled && !Boolean(conversation.isApproved)) {
return null;
}
return <MemoConversationListItemWithDetails key={key} style={style} {...conversation} />;
@ -120,21 +124,9 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
// TODO: make selectors for this instead.
// TODO: only filter conversations if setting for requests is applied
const approvedConversations = conversations.filter(c => c.isApproved === true);
const messageRequestsEnabled =
window.inboxStore?.getState().userConfig.messageRequests === true;
const conversationsForList = messageRequestsEnabled ? approvedConversations : conversations;
if (!this.state.approvedConversations.length) {
this.setState({
approvedConversations: conversationsForList,
});
}
console.warn({ conversationsForList });
// const length = conversations.length;
const length = conversationsForList.length;
// TODO: readjust to be approved length as only approved convos will show here.
const length = this.props.conversations ? this.props.conversations.length : 0;
const listKey = 0;
// Note: conversations is not a known prop for List, but it is required to ensure that
@ -146,8 +138,8 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
{({ height, width }) => (
<List
className="module-left-pane__virtual-list"
conversations={this.state.approvedConversations}
// conversations={[]}
// conversations={this.state.approvedConversations}
conversations={this.props.conversations}
height={height}
rowCount={length}
rowHeight={64}

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

@ -522,7 +522,8 @@ export async function getConversationById(id: string): Promise<ConversationModel
}
export async function updateConversation(data: ReduxConversationType): Promise<void> {
await channels.updateConversation(data);
const cleanedData = _cleanData(data);
await channels.updateConversation(cleanedData);
}
export async function removeConversation(id: string): Promise<void> {
@ -601,7 +602,6 @@ export async function cleanLastHashes(): Promise<void> {
await channels.cleanLastHashes();
}
// TODO: Strictly type the following
export async function saveSeenMessageHashes(
data: Array<{
expiresAt: number;

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

@ -176,6 +176,7 @@ export const fillConvoAttributesWithDefaults = (
triggerNotificationsFor: 'all', // if the settings is not set in the db, this is the default
isTrustedForAttachmentDownload: false, // we don't trust a contact until we say so
isPinned: false,
isApproved: false,
});
};
@ -777,7 +778,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
const chatMessagePrivate = new VisibleMessage(chatMessageParams);
await getMessageQueue().sendToPubKey(destinationPubkey, chatMessagePrivate);
// this.setIsApproved(true); // consider the conversation approved even if the message fails to send
return;
}
@ -1389,21 +1389,12 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
}
public async setIsApproved(value: boolean) {
console.warn(`Setting ${this.attributes.nickname} isApproved to:: ${value}`);
if (value !== this.get('isApproved')) {
console.warn(`Setting ${this.attributes.profileName} isApproved to:: ${value}`);
this.set({
isApproved: value,
});
await this.commit();
if (window?.inboxStore) {
window.inboxStore?.dispatch(
conversationChanged({
id: this.id,
data: this.getConversationModelProps(),
})
);
}
}
}

21
ts/receiver/configMessage.ts
Unescape Escape View File

@ -1,5 +1,5 @@
import _ from 'lodash';
import { createOrUpdateItem, getItemById, hasSyncedInitialConfigurationItem } from '../data/data';
import { createOrUpdateItem } from '../data/data';
import { ConversationTypeEnum } from '../models/conversation';
import {
joinOpenGroupV2WithUIEvents,
@ -53,14 +53,16 @@ async function handleGroupsAndContactsFromConfigMessage(
envelope: EnvelopePlus,
configMessage: SignalService.ConfigurationMessage
) {
const didWeHandleAConfigurationMessageAlready =
(await getItemById(hasSyncedInitialConfigurationItem))?.value || false;
if (didWeHandleAConfigurationMessageAlready) {
window?.log?.info(
'Dropping configuration contacts/groups change as we already handled one... '
);
return;
}
// const didWeHandleAConfigurationMessageAlready =
// (await getItemById(hasSyncedInitialConfigurationItem))?.value || false;
// TODO: debug
// if (didWeHandleAConfigurationMessageAlready) {
// window?.log?.info(
// 'Dropping configuration contacts/groups change as we already handled one... '
// );
// return;
// }
await createOrUpdateItem({
id: 'hasSyncedInitialConfigurationItem',
value: true,
@ -125,6 +127,7 @@ async function handleGroupsAndContactsFromConfigMessage(
};
// updateProfile will do a commit for us
contactConvo.set('active_at', _.toNumber(envelope.timestamp));
contactConvo.setIsApproved(Boolean(c.isApproved));
await updateProfileOneAtATime(contactConvo, profile, c.profileKey);
} catch (e) {

1
ts/receiver/contentMessage.ts
Unescape Escape View File

@ -377,6 +377,7 @@ export async function innerHandleContentMessage(
}
if (content.configurationMessage) {
// this one can be quite long (downloads profilePictures and everything, is do not block)
console.warn('@@config message received. contentmessage.ts');
void handleConfigurationMessage(
envelope,
content.configurationMessage as SignalService.ConfigurationMessage

1
ts/session/conversations/ConversationController.ts
Unescape Escape View File

@ -99,7 +99,6 @@ export class ConversationController {
const create = async () => {
try {
debugger;
await saveConversation(conversation.attributes);
} catch (error) {
window?.log?.error(

16
ts/session/utils/syncUtils.ts
Unescape Escape View File

@ -1,5 +1,6 @@
import {
createOrUpdateItem,
getAllConversations,
getItemById,
getLatestClosedGroupEncryptionKeyPair,
} from '../../../ts/data/data';
@ -36,16 +37,24 @@ const getLastSyncTimestampFromDb = async (): Promise<number | undefined> =>
const writeLastSyncTimestampToDb = async (timestamp: number) =>
createOrUpdateItem({ id: ITEM_ID_LAST_SYNC_TIMESTAMP, value: timestamp });
export const syncConfigurationIfNeeded = async () => {
/**
* Syncs usre configuration with other devices linked to this user.
* @param force Bypass duration time limit for sending sync messages
* @returns
*/
export const syncConfigurationIfNeeded = async (force: boolean = false) => {
const lastSyncedTimestamp = (await getLastSyncTimestampFromDb()) || 0;
const now = Date.now();
// if the last sync was less than 2 days before, return early.
if (Math.abs(now - lastSyncedTimestamp) < DURATION.DAYS * 7) {
if (!force && Math.abs(now - lastSyncedTimestamp) < DURATION.DAYS * 7) {
return;
}
const allConvos = getConversationController().getConversations();
const allConvos = await (await getAllConversations()).models;
console.warn({ test: allConvos[0].attributes.isApproved });
// const configMessage = await getCurrentConfigurationMessage(allConvos);
const configMessage = await getCurrentConfigurationMessage(allConvos);
try {
// window?.log?.info('syncConfigurationIfNeeded with', configMessage);
@ -191,6 +200,7 @@ const getValidContacts = (convos: Array<ConversationModel>) => {
displayName: c.getLokiProfile()?.displayName,
profilePictureURL: c.get('avatarPointer'),
profileKey: !profileKeyForContact?.length ? undefined : profileKeyForContact,
isApproved: c.isApproved(),
});
} catch (e) {
window?.log.warn('getValidContacts', e);

Write Preview
Loading…
Cancel
Save