chore: move syncUtils to its own folder

pull/2620/head
Audric Ackermann 3 years ago
parent c8e76b17de
commit 68852a9e63

@ -2,7 +2,7 @@ import React, { useCallback, useState } from 'react';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { ed25519Str } from '../../session/onions/onionPath'; import { ed25519Str } from '../../session/onions/onionPath';
import { SnodeAPI } from '../../session/apis/snode_api/SNodeAPI'; import { SnodeAPI } from '../../session/apis/snode_api/SNodeAPI';
import { forceSyncConfigurationNowIfNeeded } from '../../session/utils/syncUtils'; import { forceSyncConfigurationNowIfNeeded } from '../../session/utils/sync/syncUtils';
import { updateConfirmModal, updateDeleteAccountModal } from '../../state/ducks/modalDialog'; import { updateConfirmModal, updateDeleteAccountModal } from '../../state/ducks/modalDialog';
import { SpacerLG } from '../basic/Text'; import { SpacerLG } from '../basic/Text';
import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';

@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { getConversationController } from '../../session/conversations'; import { getConversationController } from '../../session/conversations';
import { syncConfigurationIfNeeded } from '../../session/utils/syncUtils'; import { syncConfigurationIfNeeded } from '../../session/utils/sync/syncUtils';
import { import {
Data, Data,

@ -12,7 +12,7 @@ import styled from 'styled-components';
import { SessionButton, SessionButtonColor } from '../../basic/SessionButton'; import { SessionButton, SessionButtonColor } from '../../basic/SessionButton';
import { resetOverlayMode, SectionType, showLeftPaneSection } from '../../../state/ducks/section'; import { resetOverlayMode, SectionType, showLeftPaneSection } from '../../../state/ducks/section';
import { getConversationController } from '../../../session/conversations'; import { getConversationController } from '../../../session/conversations';
import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/syncUtils'; import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/sync/syncUtils';
import { BlockedNumberController } from '../../../util'; import { BlockedNumberController } from '../../../util';
import useKey from 'react-use/lib/useKey'; import useKey from 'react-use/lib/useKey';
import { import {

@ -29,7 +29,7 @@ import { quoteMessage, resetConversationExternal } from '../state/ducks/conversa
import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager'; import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager';
import { IMAGE_JPEG } from '../types/MIME'; import { IMAGE_JPEG } from '../types/MIME';
import { fromHexToArray, toHex } from '../session/utils/String'; import { fromHexToArray, toHex } from '../session/utils/String';
import { forceSyncConfigurationNowIfNeeded } from '../session/utils/syncUtils'; import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils';
import { SessionButtonColor } from '../components/basic/SessionButton'; import { SessionButtonColor } from '../components/basic/SessionButton';
import { getCallMediaPermissionsSettings } from '../components/settings/SessionSettings'; import { getCallMediaPermissionsSettings } from '../components/settings/SessionSettings';
import { perfEnd, perfStart } from '../session/utils/Performance'; import { perfEnd, perfStart } from '../session/utils/Performance';

@ -54,7 +54,7 @@ import { perfEnd, perfStart } from '../session/utils/Performance';
import { ed25519Str } from '../session/onions/onionPath'; import { ed25519Str } from '../session/onions/onionPath';
import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager'; import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager';
import { IMAGE_JPEG } from '../types/MIME'; import { IMAGE_JPEG } from '../types/MIME';
import { forceSyncConfigurationNowIfNeeded } from '../session/utils/syncUtils'; import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils';
import { createLastMessageUpdate } from '../types/Conversation'; import { createLastMessageUpdate } from '../types/Conversation';
import { import {
ReplyingToMessageProps, ReplyingToMessageProps,

@ -48,7 +48,7 @@ import {
VisibleMessage, VisibleMessage,
VisibleMessageParams, VisibleMessageParams,
} from '../session/messages/outgoing/visibleMessage/VisibleMessage'; } from '../session/messages/outgoing/visibleMessage/VisibleMessage';
import { buildSyncMessage } from '../session/utils/syncUtils'; import { buildSyncMessage } from '../session/utils/sync/syncUtils';
import { import {
uploadAttachmentsV3, uploadAttachmentsV3,
uploadLinkPreviewsV3, uploadLinkPreviewsV3,

@ -4,7 +4,7 @@ import { ConversationModel } from '../../../../models/conversation';
import { getConversationController } from '../../../conversations'; import { getConversationController } from '../../../conversations';
import { PromiseUtils, ToastUtils } from '../../../utils'; import { PromiseUtils, ToastUtils } from '../../../utils';
import { forceSyncConfigurationNowIfNeeded } from '../../../utils/syncUtils'; import { forceSyncConfigurationNowIfNeeded } from '../../../utils/sync/syncUtils';
import { import {
getOpenGroupV2ConversationId, getOpenGroupV2ConversationId,
openGroupV2CompleteURLRegex, openGroupV2CompleteURLRegex,

@ -19,7 +19,7 @@ import {
} from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
import { PubKey } from '../types'; import { PubKey } from '../types';
import { UserUtils } from '../utils'; import { UserUtils } from '../utils';
import { forceSyncConfigurationNowIfNeeded } from '../utils/syncUtils'; import { forceSyncConfigurationNowIfNeeded } from '../utils/sync/syncUtils';
import { getConversationController } from './ConversationController'; import { getConversationController } from './ConversationController';
export async function createClosedGroup(groupName: string, members: Array<string>, isV3: boolean) { export async function createClosedGroup(groupName: string, members: Array<string>, isV3: boolean) {

@ -15,7 +15,7 @@ import { ClosedGroupEncryptionPairMessage } from '../messages/outgoing/controlMe
import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage'; import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage';
import { ClosedGroupVisibleMessage } from '../messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; import { ClosedGroupVisibleMessage } from '../messages/outgoing/visibleMessage/ClosedGroupVisibleMessage';
import { SyncMessageType } from '../utils/syncUtils'; import { SyncMessageType } from '../utils/sync/syncUtils';
import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil'; import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil';
import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage';

@ -4,7 +4,7 @@ import * as StringUtils from './String';
import * as PromiseUtils from './Promise'; import * as PromiseUtils from './Promise';
import * as ToastUtils from './Toast'; import * as ToastUtils from './Toast';
import * as UserUtils from './User'; import * as UserUtils from './User';
import * as SyncUtils from './syncUtils'; import * as SyncUtils from './sync/syncUtils';
import * as AttachmentsV2Utils from './AttachmentsV2'; import * as AttachmentsV2Utils from './AttachmentsV2';
import * as AttachmentDownloads from './AttachmentsDownload'; import * as AttachmentDownloads from './AttachmentsDownload';
import * as CallManager from './calling/CallManager'; import * as CallManager from './calling/CallManager';

@ -1,33 +1,33 @@
import { Data } from '../../../ts/data/data'; import { Data } from '../../../data/data';
import { getMessageQueue } from '..'; import { getMessageQueue } from '../..';
import { getConversationController } from '../conversations'; import { getConversationController } from '../../conversations';
import { v4 as uuidv4 } from 'uuid'; import { v4 as uuidv4 } from 'uuid';
import { UserUtils } from '.'; import { UserUtils } from '..';
import { ECKeyPair } from '../../receiver/keypairs'; import { ECKeyPair } from '../../../receiver/keypairs';
import { import {
ConfigurationMessage, ConfigurationMessage,
ConfigurationMessageClosedGroup, ConfigurationMessageClosedGroup,
ConfigurationMessageContact, ConfigurationMessageContact,
} from '../messages/outgoing/controlMessage/ConfigurationMessage'; } from '../../messages/outgoing/controlMessage/ConfigurationMessage';
import { ConversationModel } from '../../models/conversation'; import { ConversationModel } from '../../../models/conversation';
import { fromBase64ToArray, fromHexToArray } from './String'; import { fromBase64ToArray, fromHexToArray } from '../String';
import { SignalService } from '../../protobuf'; import { SignalService } from '../../../protobuf';
import _ from 'lodash'; import _ from 'lodash';
import { import {
AttachmentPointerWithUrl, AttachmentPointerWithUrl,
PreviewWithAttachmentUrl, PreviewWithAttachmentUrl,
Quote, Quote,
VisibleMessage, VisibleMessage,
} from '../messages/outgoing/visibleMessage/VisibleMessage'; } from '../../messages/outgoing/visibleMessage/VisibleMessage';
import { ExpirationTimerUpdateMessage } from '../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage'; import { ExpirationTimerUpdateMessage } from '../../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage';
import { OpenGroupData } from '../../data/opengroups'; import { OpenGroupData } from '../../../data/opengroups';
import { getCompleteUrlFromRoom } from '../apis/open_group_api/utils/OpenGroupUtils'; import { getCompleteUrlFromRoom } from '../../apis/open_group_api/utils/OpenGroupUtils';
import { DURATION } from '../constants'; import { DURATION } from '../../constants';
import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; import { UnsendMessage } from '../../messages/outgoing/controlMessage/UnsendMessage';
import { MessageRequestResponse } from '../messages/outgoing/controlMessage/MessageRequestResponse'; import { MessageRequestResponse } from '../../messages/outgoing/controlMessage/MessageRequestResponse';
import { PubKey } from '../types'; import { PubKey } from '../../types';
import { SnodeNamespaces } from '../apis/snode_api/namespaces'; import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
import { SharedConfigMessage } from '../messages/outgoing/controlMessage/SharedConfigMessage'; import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage';
const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp'; const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp';

@ -17,7 +17,7 @@ import { ClosedGroupNameChangeMessage } from '../../../../session/messages/outgo
import { ClosedGroupNewMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { ClosedGroupNewMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
import { ClosedGroupRemovedMembersMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage'; import { ClosedGroupRemovedMembersMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage';
import Sinon from 'sinon'; import Sinon from 'sinon';
import { getCurrentConfigurationMessage } from '../../../../session/utils/syncUtils'; import { getCurrentConfigurationMessage } from '../../../../session/utils/sync/syncUtils';
import { getConversationController } from '../../../../session/conversations'; import { getConversationController } from '../../../../session/conversations';
import { stubData, stubOpenGroupData } from '../../../test-utils/utils'; import { stubData, stubOpenGroupData } from '../../../test-utils/utils';
import { ConversationCollection } from '../../../../models/conversation'; import { ConversationCollection } from '../../../../models/conversation';

Loading…
Cancel
Save