From 68852a9e63ee9c2c5e16374e6ca84e02e6546349 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 19 Jan 2023 14:02:59 +1100 Subject: [PATCH] chore: move syncUtils to its own folder --- ts/components/dialog/DeleteAccountModal.tsx | 2 +- ts/components/leftpane/ActionsPanel.tsx | 2 +- .../overlay/OverlayMessageRequest.tsx | 2 +- ts/interactions/conversationInteractions.ts | 2 +- ts/models/conversation.ts | 2 +- ts/models/message.ts | 2 +- .../opengroupV2/JoinOpenGroupV2.ts | 2 +- ts/session/conversations/createClosedGroup.ts | 2 +- ts/session/sending/MessageQueue.ts | 2 +- ts/session/utils/index.ts | 2 +- ts/session/utils/{ => sync}/syncUtils.ts | 38 +++++++++---------- ts/test/session/unit/utils/Messages_test.ts | 2 +- 12 files changed, 30 insertions(+), 30 deletions(-) rename ts/session/utils/{ => sync}/syncUtils.ts (89%) diff --git a/ts/components/dialog/DeleteAccountModal.tsx b/ts/components/dialog/DeleteAccountModal.tsx index 35809a7d0..6a605ebc3 100644 --- a/ts/components/dialog/DeleteAccountModal.tsx +++ b/ts/components/dialog/DeleteAccountModal.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useState } from 'react'; import { useDispatch } from 'react-redux'; import { ed25519Str } from '../../session/onions/onionPath'; 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 { SpacerLG } from '../basic/Text'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 5950b451d..cd6a639df 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react'; import { getConversationController } from '../../session/conversations'; -import { syncConfigurationIfNeeded } from '../../session/utils/syncUtils'; +import { syncConfigurationIfNeeded } from '../../session/utils/sync/syncUtils'; import { Data, diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx index 64f7138d4..95793b669 100644 --- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx +++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx @@ -12,7 +12,7 @@ import styled from 'styled-components'; import { SessionButton, SessionButtonColor } from '../../basic/SessionButton'; import { resetOverlayMode, SectionType, showLeftPaneSection } from '../../../state/ducks/section'; import { getConversationController } from '../../../session/conversations'; -import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/syncUtils'; +import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/sync/syncUtils'; import { BlockedNumberController } from '../../../util'; import useKey from 'react-use/lib/useKey'; import { diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 6b4cd2898..8715fb5e7 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -29,7 +29,7 @@ import { quoteMessage, resetConversationExternal } from '../state/ducks/conversa import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager'; import { IMAGE_JPEG } from '../types/MIME'; 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 { getCallMediaPermissionsSettings } from '../components/settings/SessionSettings'; import { perfEnd, perfStart } from '../session/utils/Performance'; diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 748a155c7..33d95689e 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -54,7 +54,7 @@ import { perfEnd, perfStart } from '../session/utils/Performance'; import { ed25519Str } from '../session/onions/onionPath'; import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager'; 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 { ReplyingToMessageProps, diff --git a/ts/models/message.ts b/ts/models/message.ts index 3bc5b709a..ff3c90767 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -48,7 +48,7 @@ import { VisibleMessage, VisibleMessageParams, } from '../session/messages/outgoing/visibleMessage/VisibleMessage'; -import { buildSyncMessage } from '../session/utils/syncUtils'; +import { buildSyncMessage } from '../session/utils/sync/syncUtils'; import { uploadAttachmentsV3, uploadLinkPreviewsV3, diff --git a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts index c4d0ad646..9432857dd 100644 --- a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts +++ b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts @@ -4,7 +4,7 @@ import { ConversationModel } from '../../../../models/conversation'; import { getConversationController } from '../../../conversations'; import { PromiseUtils, ToastUtils } from '../../../utils'; -import { forceSyncConfigurationNowIfNeeded } from '../../../utils/syncUtils'; +import { forceSyncConfigurationNowIfNeeded } from '../../../utils/sync/syncUtils'; import { getOpenGroupV2ConversationId, openGroupV2CompleteURLRegex, diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index 51424e481..affce6fb9 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -19,7 +19,7 @@ import { } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { PubKey } from '../types'; import { UserUtils } from '../utils'; -import { forceSyncConfigurationNowIfNeeded } from '../utils/syncUtils'; +import { forceSyncConfigurationNowIfNeeded } from '../utils/sync/syncUtils'; import { getConversationController } from './ConversationController'; export async function createClosedGroup(groupName: string, members: Array, isV3: boolean) { diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index b063b3b99..3ceff61e3 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -15,7 +15,7 @@ import { ClosedGroupEncryptionPairMessage } from '../messages/outgoing/controlMe import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage'; 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 { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; diff --git a/ts/session/utils/index.ts b/ts/session/utils/index.ts index c3e942bca..d946162f0 100644 --- a/ts/session/utils/index.ts +++ b/ts/session/utils/index.ts @@ -4,7 +4,7 @@ import * as StringUtils from './String'; import * as PromiseUtils from './Promise'; import * as ToastUtils from './Toast'; import * as UserUtils from './User'; -import * as SyncUtils from './syncUtils'; +import * as SyncUtils from './sync/syncUtils'; import * as AttachmentsV2Utils from './AttachmentsV2'; import * as AttachmentDownloads from './AttachmentsDownload'; import * as CallManager from './calling/CallManager'; diff --git a/ts/session/utils/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts similarity index 89% rename from ts/session/utils/syncUtils.ts rename to ts/session/utils/sync/syncUtils.ts index cfbf99f62..db057265f 100644 --- a/ts/session/utils/syncUtils.ts +++ b/ts/session/utils/sync/syncUtils.ts @@ -1,33 +1,33 @@ -import { Data } from '../../../ts/data/data'; -import { getMessageQueue } from '..'; -import { getConversationController } from '../conversations'; +import { Data } from '../../../data/data'; +import { getMessageQueue } from '../..'; +import { getConversationController } from '../../conversations'; import { v4 as uuidv4 } from 'uuid'; -import { UserUtils } from '.'; -import { ECKeyPair } from '../../receiver/keypairs'; +import { UserUtils } from '..'; +import { ECKeyPair } from '../../../receiver/keypairs'; import { ConfigurationMessage, ConfigurationMessageClosedGroup, ConfigurationMessageContact, -} from '../messages/outgoing/controlMessage/ConfigurationMessage'; -import { ConversationModel } from '../../models/conversation'; -import { fromBase64ToArray, fromHexToArray } from './String'; -import { SignalService } from '../../protobuf'; +} from '../../messages/outgoing/controlMessage/ConfigurationMessage'; +import { ConversationModel } from '../../../models/conversation'; +import { fromBase64ToArray, fromHexToArray } from '../String'; +import { SignalService } from '../../../protobuf'; import _ from 'lodash'; import { AttachmentPointerWithUrl, PreviewWithAttachmentUrl, Quote, VisibleMessage, -} from '../messages/outgoing/visibleMessage/VisibleMessage'; -import { ExpirationTimerUpdateMessage } from '../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage'; -import { OpenGroupData } from '../../data/opengroups'; -import { getCompleteUrlFromRoom } from '../apis/open_group_api/utils/OpenGroupUtils'; -import { DURATION } from '../constants'; -import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; -import { MessageRequestResponse } from '../messages/outgoing/controlMessage/MessageRequestResponse'; -import { PubKey } from '../types'; -import { SnodeNamespaces } from '../apis/snode_api/namespaces'; -import { SharedConfigMessage } from '../messages/outgoing/controlMessage/SharedConfigMessage'; +} from '../../messages/outgoing/visibleMessage/VisibleMessage'; +import { ExpirationTimerUpdateMessage } from '../../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage'; +import { OpenGroupData } from '../../../data/opengroups'; +import { getCompleteUrlFromRoom } from '../../apis/open_group_api/utils/OpenGroupUtils'; +import { DURATION } from '../../constants'; +import { UnsendMessage } from '../../messages/outgoing/controlMessage/UnsendMessage'; +import { MessageRequestResponse } from '../../messages/outgoing/controlMessage/MessageRequestResponse'; +import { PubKey } from '../../types'; +import { SnodeNamespaces } from '../../apis/snode_api/namespaces'; +import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage'; const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp'; diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts index b6835285e..f33a7b26f 100644 --- a/ts/test/session/unit/utils/Messages_test.ts +++ b/ts/test/session/unit/utils/Messages_test.ts @@ -17,7 +17,7 @@ import { ClosedGroupNameChangeMessage } from '../../../../session/messages/outgo import { ClosedGroupNewMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { ClosedGroupRemovedMembersMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage'; import Sinon from 'sinon'; -import { getCurrentConfigurationMessage } from '../../../../session/utils/syncUtils'; +import { getCurrentConfigurationMessage } from '../../../../session/utils/sync/syncUtils'; import { getConversationController } from '../../../../session/conversations'; import { stubData, stubOpenGroupData } from '../../../test-utils/utils'; import { ConversationCollection } from '../../../../models/conversation';