diff --git a/package.json b/package.json index 5de0ae920..0471f17f1 100644 --- a/package.json +++ b/package.json @@ -271,11 +271,7 @@ "StartupWMClass": "Session" }, "asarUnpack": "node_modules/spellchecker/vendor/hunspell_dictionaries", - "target": [ - "deb", - "rpm", - "freebsd" - ], + "target": ["deb", "rpm", "freebsd"], "icon": "build/icon-linux.icns" }, "asarUnpack": [ diff --git a/ts/components/conversation/message/message-item/InteractionNotification.tsx b/ts/components/conversation/message/message-item/InteractionNotification.tsx index c75dc831e..006c6154e 100644 --- a/ts/components/conversation/message/message-item/InteractionNotification.tsx +++ b/ts/components/conversation/message/message-item/InteractionNotification.tsx @@ -4,7 +4,10 @@ import { useIsPrivate, useIsPublic } from '../../../../hooks/useParamSelector'; import { assertUnreachable } from '../../../../types/sqlSharedTypes'; import { Flex } from '../../../basic/Flex'; import { ReadableMessage } from './ReadableMessage'; -import { ConversationInteractionStatus, ConversationInteractionType } from '../../../../interactions/types'; +import { + ConversationInteractionStatus, + ConversationInteractionType, +} from '../../../../interactions/types'; import { PropsForInteractionNotification } from '../../../../state/ducks/types'; const StyledFailText = styled.div` diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index ff49ca627..f20dcaab2 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -45,7 +45,10 @@ import { PanelButtonGroup, PanelIconButton } from '../../../buttons'; import { MediaItemType } from '../../../lightbox/LightboxGallery'; import { MediaGallery } from '../../media-gallery/MediaGallery'; import { Header, StyledScrollContainer } from './components'; -import { ConversationInteractionStatus, ConversationInteractionType } from '../../../../interactions/types'; +import { + ConversationInteractionStatus, + ConversationInteractionType, +} from '../../../../interactions/types'; async function getMediaGalleryProps(conversationId: string): Promise<{ documents: Array; diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx index 81c8dccfe..4f270fb46 100644 --- a/ts/components/dialog/SessionConfirm.tsx +++ b/ts/components/dialog/SessionConfirm.tsx @@ -5,9 +5,7 @@ import useKey from 'react-use/lib/useKey'; import styled from 'styled-components'; import { useLastMessage } from '../../hooks/useParamSelector'; import { MessageInteraction } from '../../interactions'; -import { - updateConversationInteractionState, -} from '../../interactions/conversationInteractions'; +import { updateConversationInteractionState } from '../../interactions/conversationInteractions'; import { updateConfirmModal } from '../../state/ducks/modalDialog'; import { SessionWrapperModal } from '../SessionWrapperModal'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; diff --git a/ts/components/leftpane/conversation-list-item/InteractionItem.tsx b/ts/components/leftpane/conversation-list-item/InteractionItem.tsx index e3ca09ab3..e5a144a60 100644 --- a/ts/components/leftpane/conversation-list-item/InteractionItem.tsx +++ b/ts/components/leftpane/conversation-list-item/InteractionItem.tsx @@ -6,7 +6,10 @@ import { useIsPrivate, useIsPublic } from '../../../hooks/useParamSelector'; import { getConversationController } from '../../../session/conversations'; import { assertUnreachable } from '../../../types/sqlSharedTypes'; import { MessageBody } from '../../conversation/message/message-content/MessageBody'; -import { ConversationInteractionType, ConversationInteractionStatus } from '../../../interactions/types'; +import { + ConversationInteractionType, + ConversationInteractionStatus, +} from '../../../interactions/types'; import { LastMessageType } from '../../../state/ducks/types'; const StyledInteractionItemText = styled.div<{ isError: boolean }>` diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index 8354b3de3..b7802a94e 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -53,7 +53,10 @@ import { getIsMessageSection } from '../../state/selectors/section'; import { useSelectedConversationKey } from '../../state/selectors/selectedConversation'; import { LocalizerKeys } from '../../types/LocalizerKeys'; import { SessionButtonColor } from '../basic/SessionButton'; -import { ConversationInteractionType, ConversationInteractionStatus } from '../../interactions/types'; +import { + ConversationInteractionType, + ConversationInteractionStatus, +} from '../../interactions/types'; /** Menu items standardized */ diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts index 4b80182d3..3e2054819 100644 --- a/ts/models/conversationAttributes.ts +++ b/ts/models/conversationAttributes.ts @@ -140,8 +140,6 @@ export const fillConvoAttributesWithDefaults = ( }); }; - - export const READ_MESSAGE_STATE = { unread: 1, read: 0, diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts index 85f802b45..5e87194bb 100644 --- a/ts/models/messageType.ts +++ b/ts/models/messageType.ts @@ -4,13 +4,15 @@ import { DisappearingMessageType, ExpirationTimerUpdate, } from '../session/disappearing_messages/types'; -import { - PropsForMessageWithConvoProps, -} from '../state/ducks/conversations'; +import { PropsForMessageWithConvoProps } from '../state/ducks/conversations'; import { AttachmentTypeWithPath } from '../types/Attachment'; import { Reaction, ReactionList, SortedReactionList } from '../types/Reaction'; import { READ_MESSAGE_STATE } from './conversationAttributes'; -import { LastMessageStatusType, CallNotificationType, InteractionNotificationType } from '../state/ducks/types'; +import { + LastMessageStatusType, + CallNotificationType, + InteractionNotificationType, +} from '../state/ducks/types'; export type MessageModelType = 'incoming' | 'outgoing'; diff --git a/ts/node/migration/helpers/v31.ts b/ts/node/migration/helpers/v31.ts index 1f4b8e51d..d939e9fee 100644 --- a/ts/node/migration/helpers/v31.ts +++ b/ts/node/migration/helpers/v31.ts @@ -11,9 +11,7 @@ import { import { isEmpty, isEqual, isFinite, isNumber } from 'lodash'; import { from_hex } from 'libsodium-wrappers-sumo'; import { MESSAGES_TABLE, toSqliteBoolean } from '../../database_utility'; -import { - ConversationAttributes, -} from '../../../models/conversationAttributes'; +import { ConversationAttributes } from '../../../models/conversationAttributes'; import { maybeArrayJSONtoArray } from '../../../types/sqlSharedTypes'; import { checkTargetMigration, hasDebugEnvVariable } from '../utils'; import { sqlNode } from '../../sql'; diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts index 22587787a..7d18460ea 100644 --- a/ts/node/migration/sessionMigrations.ts +++ b/ts/node/migration/sessionMigrations.ts @@ -7,9 +7,7 @@ import { UserGroupsWrapperNode, } from 'libsession_util_nodejs'; import { compact, isArray, isEmpty, isNil, isString, map, pick } from 'lodash'; -import { - ConversationAttributes, -} from '../../models/conversationAttributes'; +import { ConversationAttributes } from '../../models/conversationAttributes'; import { fromHexToArray } from '../../session/utils/String'; import { CONFIG_DUMP_TABLE } from '../../types/sqlSharedTypes'; import { diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts index be363c814..de5e01c2a 100644 --- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts +++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts @@ -12,11 +12,7 @@ import { getAllValidOpenGroupV2ConversationRoomInfos, getOpenGroupV2ConversationId, } from '../utils/OpenGroupUtils'; -import { - ourSogsDomainName, - ourSogsLegacyIp, - ourSogsUrl, -} from './ApiUtil'; +import { ourSogsDomainName, ourSogsLegacyIp, ourSogsUrl } from './ApiUtil'; import { OpenGroupServerPoller } from './OpenGroupServerPoller'; import { SessionUtilUserGroups } from '../../../utils/libsession/libsession_utils_user_groups'; diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts index 5141ca647..f3695c586 100644 --- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts +++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts @@ -1,6 +1,6 @@ import { compact } from 'lodash'; -import { OpenGroupData} from '../../../../data/opengroups'; +import { OpenGroupData } from '../../../../data/opengroups'; import { OpenGroupMessageV2 } from './OpenGroupMessageV2'; import { UserUtils } from '../../../utils'; import { fromHexToArray } from '../../../utils/String'; diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts index 138460020..55f6e59a1 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts @@ -1,9 +1,6 @@ import AbortController, { AbortSignal } from 'abort-controller'; import { isFinite, isUndefined, toNumber } from 'lodash'; -import { - OpenGroupData, - OpenGroupV2RoomWithImageID, -} from '../../../../data/opengroups'; +import { OpenGroupData, OpenGroupV2RoomWithImageID } from '../../../../data/opengroups'; import { MIME } from '../../../../types'; import { processNewAttachment } from '../../../../types/MessageAttachment'; import { roomHasBlindEnabled } from '../../../../types/sqlSharedTypes'; diff --git a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts index 0d9abb826..7505b98b6 100644 --- a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts +++ b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts @@ -1,5 +1,5 @@ import { isEmpty } from 'lodash'; -import { OpenGroupData } from '../../../../data/opengroups'; +import { OpenGroupData } from '../../../../data/opengroups'; import { getOpenGroupManager } from '../opengroupV2/OpenGroupManagerV2'; import { SessionUtilUserGroups } from '../../../utils/libsession/libsession_utils_user_groups'; import { getConversationController } from '../../../conversations'; diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts index d5afbee98..2333c2f70 100644 --- a/ts/session/onions/onionPath.ts +++ b/ts/session/onions/onionPath.ts @@ -6,7 +6,7 @@ import pRetry from 'p-retry'; import { default as insecureNodeFetch } from 'node-fetch'; import semver from 'semver'; -import { Data} from '../../data/data'; +import { Data } from '../../data/data'; import * as SnodePool from '../apis/snode_api/snodePool'; import { UserUtils } from '../utils'; import { allowOnlyOneAtATime } from '../utils/Promise'; diff --git a/ts/session/profile_manager/ProfileManager.ts b/ts/session/profile_manager/ProfileManager.ts index f0aef2151..d0fb517e0 100644 --- a/ts/session/profile_manager/ProfileManager.ts +++ b/ts/session/profile_manager/ProfileManager.ts @@ -5,7 +5,6 @@ import { getConversationController } from '../conversations'; import { SyncUtils, UserUtils } from '../utils'; import { fromHexToArray, sanitizeSessionUsername, toHex } from '../utils/String'; import { AvatarDownload } from '../utils/job_runners/jobs/AvatarDownloadJob'; -import { generateFakeECKeyPair } from '../../test/test-utils/utils'; import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/types'; export type Profile = { @@ -101,8 +100,8 @@ export async function updateOurProfileDisplayName(newName: string, onboarding?: if (onboarding) { try { - const tempKeyPair = generateFakeECKeyPair(); - await UserConfigWrapperActions.init(tempKeyPair.privateKeyData, null); + // const tempKeyPair = generateFakeECKeyPair(); + await UserConfigWrapperActions.init(new Uint8Array(), null); const userInfoName = await UserConfigWrapperActions.setUserInfo( cleanName, CONVERSATION_PRIORITIES.default, diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 03f8f7801..ad5064570 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -4,9 +4,7 @@ import { omit, toNumber } from 'lodash'; import { ReplyingToMessageProps } from '../../components/conversation/composition/CompositionBox'; import { QuotedAttachmentType } from '../../components/conversation/message/message-content/quote/Quote'; import { Data } from '../../data/data'; -import { - ConversationNotificationSettingType, -} from '../../models/conversationAttributes'; +import { ConversationNotificationSettingType } from '../../models/conversationAttributes'; import { MessageModelType, PropsForDataExtractionNotification, @@ -21,8 +19,12 @@ import { import { ReactionList } from '../../types/Reaction'; import { resetRightOverlayMode } from './section'; import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/types'; -import { LastMessageStatusType, LastMessageType, PropsForCallNotification, PropsForInteractionNotification } from './types'; - +import { + LastMessageStatusType, + LastMessageType, + PropsForCallNotification, + PropsForInteractionNotification, +} from './types'; export type MessageModelPropsWithoutConvoProps = { propsForMessage: PropsForMessageWithoutConvoProps; diff --git a/ts/state/ducks/types.ts b/ts/state/ducks/types.ts index 4f852e46f..dc1d1fbe1 100644 --- a/ts/state/ducks/types.ts +++ b/ts/state/ducks/types.ts @@ -1,4 +1,7 @@ -import { ConversationInteractionStatus, ConversationInteractionType } from '../../interactions/types'; +import { + ConversationInteractionStatus, + ConversationInteractionType, +} from '../../interactions/types'; export type CallNotificationType = 'missed-call' | 'started-call' | 'answered-a-call'; @@ -16,7 +19,6 @@ export type LastMessageType = { interactionStatus: ConversationInteractionStatus | null; }; - export type InteractionNotificationType = { interactionType: ConversationInteractionType; interactionStatus: ConversationInteractionStatus; diff --git a/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts b/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts index 84320d36c..3ba76599f 100644 --- a/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts +++ b/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts @@ -2,9 +2,7 @@ import chai, { expect } from 'chai'; import chaiAsPromised from 'chai-as-promised'; import Sinon from 'sinon'; import { Conversation, ConversationModel } from '../../../../models/conversation'; -import { - ConversationAttributes, -} from '../../../../models/conversationAttributes'; +import { ConversationAttributes } from '../../../../models/conversationAttributes'; import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { DisappearingMessages } from '../../../../session/disappearing_messages'; import { diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts index 8666c5091..b86dcfbf1 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts @@ -2,9 +2,7 @@ import { expect } from 'chai'; import Sinon from 'sinon'; import { ConversationModel } from '../../../../models/conversation'; -import { - ConversationAttributes, -} from '../../../../models/conversationAttributes'; +import { ConversationAttributes } from '../../../../models/conversationAttributes'; import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { getConversationController } from '../../../../session/conversations'; import { UserUtils } from '../../../../session/utils'; diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts index 85aa5677f..58c1e0e55 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts @@ -4,9 +4,7 @@ import { LegacyGroupInfo } from 'libsession_util_nodejs'; import { describe } from 'mocha'; import Sinon from 'sinon'; import { ConversationModel } from '../../../../models/conversation'; -import { - ConversationAttributes, -} from '../../../../models/conversationAttributes'; +import { ConversationAttributes } from '../../../../models/conversationAttributes'; import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { getConversationController } from '../../../../session/conversations'; import { UserUtils } from '../../../../session/utils'; diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_profile_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_profile_test.ts index a5b01523b..29d14fd39 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_profile_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_profile_test.ts @@ -3,9 +3,7 @@ import { expect } from 'chai'; import Sinon from 'sinon'; import { ConversationModel } from '../../../../models/conversation'; -import { - ConversationAttributes, -} from '../../../../models/conversationAttributes'; +import { ConversationAttributes } from '../../../../models/conversationAttributes'; import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { getConversationController } from '../../../../session/conversations'; import { UserUtils } from '../../../../session/utils';