From 2e8a93834b8e156d27bacf8e098c147764cabd2f Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Thu, 9 Dec 2021 09:10:23 +0000 Subject: [PATCH] Auto fix Signed-off-by: Aaron Raimist --- src/CallHandler.tsx | 19 +++++++++---------- src/ContentMessages.tsx | 13 ++++++------- src/HtmlUtils.tsx | 2 +- src/Lifecycle.ts | 1 - src/Markdown.ts | 1 + src/Notifier.ts | 5 ++--- src/PosthogAnalytics.ts | 6 +++--- src/SecurityManager.ts | 14 +++++++------- src/SlashCommands.tsx | 7 +++---- .../security/CreateSecretStorageDialog.tsx | 14 +++++++------- src/autocomplete/AutocompleteProvider.tsx | 1 + src/autocomplete/CommandProvider.tsx | 2 +- src/autocomplete/CommunityProvider.tsx | 2 +- src/autocomplete/EmojiProvider.tsx | 8 ++++---- src/autocomplete/QueryMatcher.ts | 1 + .../structures/GroupFilterPanel.tsx | 8 +++----- .../structures/IndicatorScrollbar.tsx | 1 + src/components/structures/LoggedInView.tsx | 5 ++--- src/components/structures/MatrixChat.tsx | 6 +----- src/components/structures/RightPanel.tsx | 2 +- src/components/structures/RoomDirectory.tsx | 3 +-- src/components/structures/RoomView.tsx | 4 ++-- src/components/structures/UploadBar.tsx | 2 +- .../structures/auth/ForgotPassword.tsx | 5 +++-- .../views/auth/PassphraseConfirmField.tsx | 1 + .../views/auth/RegistrationForm.tsx | 3 +-- .../views/context_menus/CallContextMenu.tsx | 3 ++- .../context_menus/DialpadContextMenu.tsx | 3 ++- .../context_menus/MessageContextMenu.tsx | 2 +- .../context_menus/ThreadListContextMenu.tsx | 1 + .../dialogs/AnalyticsLearnMoreDialog.tsx | 3 ++- .../dialogs/ConfirmSpaceUserActionDialog.tsx | 2 +- .../views/dialogs/FeedbackDialog.tsx | 1 + src/components/views/dialogs/LogoutDialog.tsx | 4 ++-- .../views/dialogs/ScrollableBaseModal.tsx | 3 ++- src/components/views/elements/AppTile.tsx | 11 ++++++----- src/components/views/elements/DNDTagTile.js | 4 ++-- .../views/elements/MemberEventListSummary.tsx | 2 +- .../views/elements/PollCreateDialog.tsx | 5 +++-- src/components/views/elements/ReplyChain.tsx | 10 +++++----- .../views/elements/StyledCheckbox.tsx | 2 +- .../views/location/LocationPicker.tsx | 3 +-- src/components/views/messages/IBodyProps.ts | 3 ++- src/components/views/messages/MImageBody.tsx | 9 ++++----- .../views/messages/MLocationBody.tsx | 3 ++- src/components/views/messages/MPollBody.tsx | 7 ++++--- src/components/views/messages/MVideoBody.tsx | 3 +-- .../views/messages/MessageActionBar.tsx | 2 +- .../views/messages/MessageEvent.tsx | 2 +- .../views/messages/MessageTimestamp.tsx | 1 + .../views/right_panel/TimelineCard.tsx | 1 - src/components/views/rooms/MemberList.tsx | 15 ++++++++------- .../views/rooms/MessageComposer.tsx | 11 ++++++----- src/components/views/rooms/ReplyTile.tsx | 8 ++++---- src/components/views/rooms/RoomHeader.tsx | 8 ++++---- src/components/views/rooms/RoomSublist.tsx | 2 +- .../views/settings/CrossSigningPanel.tsx | 5 ++--- .../views/settings/DevicesPanel.tsx | 2 +- .../views/settings/ImageSizePanel.tsx | 1 + .../tabs/room/NotificationSettingsTab.tsx | 4 ++-- .../tabs/room/RolesRoomSettingsTab.tsx | 12 ++++++------ .../tabs/user/SecurityUserSettingsTab.tsx | 5 ++--- .../views/spaces/QuickSettingsButton.tsx | 2 +- .../verification/VerificationCancelled.tsx | 1 + .../verification/VerificationComplete.tsx | 1 + src/components/views/voip/CallPreview.tsx | 7 +++---- .../views/voip/CallView/CallViewHeader.tsx | 3 ++- src/components/views/voip/CallViewForRoom.tsx | 3 ++- src/linkify-matrix.ts | 1 + src/stores/CommunityPrototypeStore.ts | 10 +++++----- src/stores/local-echo/RoomEchoChamber.ts | 5 +++-- src/stores/notifications/NotificationState.ts | 3 ++- .../notifications/ThreadNotificationState.ts | 7 ++++--- .../ThreadsRoomNotificationState.ts | 5 +++-- src/stores/widgets/StopGapWidgetDriver.ts | 10 +++++----- src/utils/EventUtils.ts | 8 ++++---- src/utils/exportUtils/HtmlExport.tsx | 11 ++++++----- src/utils/membership.ts | 2 +- src/utils/permalinks/Permalinks.ts | 3 +-- test/CallHandler-test.ts | 5 +++-- .../structures/auth/Registration-test.js | 3 +-- .../views/elements/PollCreateDialog-test.tsx | 3 ++- .../views/messages/MPollBody-test.tsx | 7 +++---- test/end-to-end-tests/src/rest/creator.ts | 1 + test/end-to-end-tests/src/rest/room.ts | 1 + test/end-to-end-tests/src/rest/session.ts | 1 + .../src/scenarios/e2e-encryption.ts | 4 ++-- .../src/scenarios/lazy-loading.ts | 3 ++- test/end-to-end-tests/src/scenarios/spaces.ts | 3 +-- test/end-to-end-tests/src/session.ts | 1 + .../src/usecases/create-room.ts | 3 ++- test/end-to-end-tests/src/usecases/dialog.ts | 1 + .../src/usecases/memberlist.ts | 3 ++- .../src/usecases/room-settings.ts | 3 ++- .../src/usecases/send-message.ts | 1 + .../end-to-end-tests/src/usecases/settings.ts | 1 + test/end-to-end-tests/src/usecases/signup.ts | 1 + .../end-to-end-tests/src/usecases/timeline.ts | 3 ++- test/end-to-end-tests/src/usecases/toasts.ts | 1 + test/end-to-end-tests/src/usecases/verify.ts | 1 + test/end-to-end-tests/start.ts | 5 +++-- test/stores/RoomViewStore-test.js | 2 -- test/stores/WidgetLayoutStore-test.ts | 3 ++- 103 files changed, 232 insertions(+), 209 deletions(-) diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx index f6cd54e474..e7d6e99129 100644 --- a/src/CallHandler.tsx +++ b/src/CallHandler.tsx @@ -18,6 +18,15 @@ limitations under the License. */ import React from 'react'; +import { base32 } from "rfc4648"; +import { MatrixCall, CallErrorCode, CallState, CallEvent, CallParty, CallType } from "matrix-js-sdk/src/webrtc/call"; +import { CallError } from "matrix-js-sdk/src/webrtc/call"; +import { logger } from 'matrix-js-sdk/src/logger'; +import { randomUppercaseString, randomLowercaseString } from "matrix-js-sdk/src/randomstring"; +import EventEmitter from 'events'; +import { RuleId, TweakName, Tweaks } from "matrix-js-sdk/src/@types/PushRules"; +import { PushProcessor } from 'matrix-js-sdk/src/pushprocessor'; +import { SyncState } from "matrix-js-sdk/src/sync.api"; import { MatrixClientPeg } from './MatrixClientPeg'; import Modal from './Modal'; @@ -28,33 +37,23 @@ import SettingsStore from './settings/SettingsStore'; import { Jitsi } from "./widgets/Jitsi"; import { WidgetType } from "./widgets/WidgetType"; import { SettingLevel } from "./settings/SettingLevel"; -import { base32 } from "rfc4648"; - import QuestionDialog from "./components/views/dialogs/QuestionDialog"; import ErrorDialog from "./components/views/dialogs/ErrorDialog"; import WidgetStore from "./stores/WidgetStore"; import { WidgetMessagingStore } from "./stores/widgets/WidgetMessagingStore"; import { ElementWidgetActions } from "./stores/widgets/ElementWidgetActions"; -import { MatrixCall, CallErrorCode, CallState, CallEvent, CallParty, CallType } from "matrix-js-sdk/src/webrtc/call"; import Analytics from './Analytics'; import CountlyAnalytics from "./CountlyAnalytics"; import { UIFeature } from "./settings/UIFeature"; -import { CallError } from "matrix-js-sdk/src/webrtc/call"; -import { logger } from 'matrix-js-sdk/src/logger'; import { Action } from './dispatcher/actions'; import VoipUserMapper from './VoipUserMapper'; import { addManagedHybridWidget, isManagedHybridWidgetEnabled } from './widgets/ManagedHybrid'; -import { randomUppercaseString, randomLowercaseString } from "matrix-js-sdk/src/randomstring"; -import EventEmitter from 'events'; import SdkConfig from './SdkConfig'; import { ensureDMExists, findDMForUser } from './createRoom'; -import { RuleId, TweakName, Tweaks } from "matrix-js-sdk/src/@types/PushRules"; -import { PushProcessor } from 'matrix-js-sdk/src/pushprocessor'; import { WidgetLayoutStore, Container } from './stores/widgets/WidgetLayoutStore'; import { getIncomingCallToastKey } from './toasts/IncomingCallToast'; import ToastStore from './stores/ToastStore'; import IncomingCallToast from "./toasts/IncomingCallToast"; -import { SyncState } from "matrix-js-sdk/src/sync.api"; export const PROTOCOL_PSTN = 'm.protocol.pstn'; export const PROTOCOL_PSTN_PREFIXED = 'im.vector.protocol.pstn'; diff --git a/src/ContentMessages.tsx b/src/ContentMessages.tsx index a5a34c0099..e3239c5f66 100644 --- a/src/ContentMessages.tsx +++ b/src/ContentMessages.tsx @@ -18,17 +18,20 @@ limitations under the License. import React from "react"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { IEncryptedFile, IMediaEventInfo } from "./customisations/models/IMediaEventContent"; import { IUploadOpts } from "matrix-js-sdk/src/@types/requests"; import { MsgType, RelationType } from "matrix-js-sdk/src/@types/event"; +import encrypt from "browser-encrypt-attachment"; +import extractPngChunks from "png-chunks-extract"; +import { IAbortablePromise, IImageInfo } from "matrix-js-sdk/src/@types/partials"; +import { logger } from "matrix-js-sdk/src/logger"; +import { IEventRelation } from "matrix-js-sdk/src"; +import { IEncryptedFile, IMediaEventInfo } from "./customisations/models/IMediaEventContent"; import dis from './dispatcher/dispatcher'; import * as sdk from './index'; import { _t } from './languageHandler'; import Modal from './Modal'; import RoomViewStore from './stores/RoomViewStore'; -import encrypt from "browser-encrypt-attachment"; -import extractPngChunks from "png-chunks-extract"; import Spinner from "./components/views/elements/Spinner"; import { Action } from "./dispatcher/actions"; import CountlyAnalytics from "./CountlyAnalytics"; @@ -40,14 +43,10 @@ import { UploadStartedPayload, } from "./dispatcher/payloads/UploadPayload"; import { IUpload } from "./models/IUpload"; -import { IAbortablePromise, IImageInfo } from "matrix-js-sdk/src/@types/partials"; import { BlurhashEncoder } from "./BlurhashEncoder"; import SettingsStore from "./settings/SettingsStore"; import { decorateStartSendingTime, sendRoundTripMetric } from "./sendTimePerformanceMetrics"; -import { logger } from "matrix-js-sdk/src/logger"; -import { IEventRelation } from "matrix-js-sdk/src"; - const MAX_WIDTH = 800; const MAX_HEIGHT = 600; diff --git a/src/HtmlUtils.tsx b/src/HtmlUtils.tsx index 9dad17f6ac..f6c045714a 100644 --- a/src/HtmlUtils.tsx +++ b/src/HtmlUtils.tsx @@ -20,13 +20,13 @@ limitations under the License. import React, { ReactNode } from 'react'; import sanitizeHtml from 'sanitize-html'; import cheerio from 'cheerio'; -import { _linkifyElement, _linkifyString } from './linkify-matrix'; import classNames from 'classnames'; import EMOJIBASE_REGEX from 'emojibase-regex'; import katex from 'katex'; import { AllHtmlEntities } from 'html-entities'; import { IContent } from 'matrix-js-sdk/src/models/event'; +import { _linkifyElement, _linkifyString } from './linkify-matrix'; import { IExtendedSanitizeOptions } from './@types/sanitize-html'; import SettingsStore from './settings/SettingsStore'; import { tryTransformPermalinkToLocalHref } from "./utils/permalinks/Permalinks"; diff --git a/src/Lifecycle.ts b/src/Lifecycle.ts index cff3c2c379..2f1c948839 100644 --- a/src/Lifecycle.ts +++ b/src/Lifecycle.ts @@ -58,7 +58,6 @@ import LazyLoadingResyncDialog from "./components/views/dialogs/LazyLoadingResyn import LazyLoadingDisabledDialog from "./components/views/dialogs/LazyLoadingDisabledDialog"; import SessionRestoreErrorDialog from "./components/views/dialogs/SessionRestoreErrorDialog"; import StorageEvictedDialog from "./components/views/dialogs/StorageEvictedDialog"; - import { setSentryUser } from "./sentry"; const HOMESERVER_URL_KEY = "mx_hs_url"; diff --git a/src/Markdown.ts b/src/Markdown.ts index b3e5363eb0..a086e9516e 100644 --- a/src/Markdown.ts +++ b/src/Markdown.ts @@ -18,6 +18,7 @@ limitations under the License. import * as commonmark from 'commonmark'; import { escape } from "lodash"; import { logger } from 'matrix-js-sdk/src/logger'; + import { linkify } from './linkify-matrix'; const ALLOWED_HTML_TAGS = ['sub', 'sup', 'del', 'u']; diff --git a/src/Notifier.ts b/src/Notifier.ts index 3f5c7fe0a6..2fc2ee3643 100644 --- a/src/Notifier.ts +++ b/src/Notifier.ts @@ -19,6 +19,8 @@ limitations under the License. import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { Room } from "matrix-js-sdk/src/models/room"; +import { logger } from "matrix-js-sdk/src/logger"; +import { MsgType } from "matrix-js-sdk/src/@types/event"; import { MatrixClientPeg } from './MatrixClientPeg'; import SdkConfig from './SdkConfig'; @@ -38,9 +40,6 @@ import UserActivity from "./UserActivity"; import { mediaFromMxc } from "./customisations/Media"; import ErrorDialog from "./components/views/dialogs/ErrorDialog"; -import { logger } from "matrix-js-sdk/src/logger"; -import { MsgType } from "matrix-js-sdk/src/@types/event"; - /* * Dispatches: * { diff --git a/src/PosthogAnalytics.ts b/src/PosthogAnalytics.ts index 45d2cd692f..6243a17b55 100644 --- a/src/PosthogAnalytics.ts +++ b/src/PosthogAnalytics.ts @@ -15,12 +15,12 @@ limitations under the License. */ import posthog, { PostHog } from 'posthog-js'; +import { MatrixClient } from "matrix-js-sdk/src/client"; +import { logger } from "matrix-js-sdk/src/logger"; + import PlatformPeg from './PlatformPeg'; import SdkConfig from './SdkConfig'; import { MatrixClientPeg } from "./MatrixClientPeg"; -import { MatrixClient } from "matrix-js-sdk/src/client"; - -import { logger } from "matrix-js-sdk/src/logger"; import SettingsStore from "./settings/SettingsStore"; /* Posthog analytics tracking. diff --git a/src/SecurityManager.ts b/src/SecurityManager.ts index 26649ba416..0383b50fc4 100644 --- a/src/SecurityManager.ts +++ b/src/SecurityManager.ts @@ -17,22 +17,22 @@ limitations under the License. import { ICryptoCallbacks } from 'matrix-js-sdk/src/matrix'; import { ISecretStorageKeyInfo } from 'matrix-js-sdk/src/crypto/api'; import { MatrixClient } from 'matrix-js-sdk/src/client'; +import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase'; +import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey'; +import { encodeBase64 } from "matrix-js-sdk/src/crypto/olmlib"; +import { DeviceTrustLevel } from 'matrix-js-sdk/src/crypto/CrossSigning'; +import { logger } from "matrix-js-sdk/src/logger"; +import { ComponentType } from "react"; + import Modal from './Modal'; import * as sdk from './index'; import { MatrixClientPeg } from './MatrixClientPeg'; -import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase'; -import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey'; import { _t } from './languageHandler'; -import { encodeBase64 } from "matrix-js-sdk/src/crypto/olmlib"; import { isSecureBackupRequired } from './utils/WellKnownUtils'; import AccessSecretStorageDialog from './components/views/dialogs/security/AccessSecretStorageDialog'; import RestoreKeyBackupDialog from './components/views/dialogs/security/RestoreKeyBackupDialog'; import SettingsStore from "./settings/SettingsStore"; import SecurityCustomisations from "./customisations/Security"; -import { DeviceTrustLevel } from 'matrix-js-sdk/src/crypto/CrossSigning'; - -import { logger } from "matrix-js-sdk/src/logger"; -import { ComponentType } from "react"; import QuestionDialog from "./components/views/dialogs/QuestionDialog"; // This stores the secret storage private keys in memory for the JS SDK. This is diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx index baa84f28f5..f7435ddda8 100644 --- a/src/SlashCommands.tsx +++ b/src/SlashCommands.tsx @@ -20,8 +20,10 @@ limitations under the License. import * as React from 'react'; import { User } from "matrix-js-sdk/src/models/user"; import { EventType } from "matrix-js-sdk/src/@types/event"; - import * as ContentHelpers from 'matrix-js-sdk/src/content-helpers'; +import { parseFragment as parseHtml, Element as ChildElement } from "parse5"; +import { logger } from "matrix-js-sdk/src/logger"; + import { MatrixClientPeg } from './MatrixClientPeg'; import dis from './dispatcher/dispatcher'; import { _t, _td } from './languageHandler'; @@ -37,7 +39,6 @@ import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from './utils/I import { isPermalinkHost, parsePermalink } from "./utils/permalinks/Permalinks"; import { WidgetType } from "./widgets/WidgetType"; import { Jitsi } from "./widgets/Jitsi"; -import { parseFragment as parseHtml, Element as ChildElement } from "parse5"; import BugReportDialog from "./components/views/dialogs/BugReportDialog"; import { ensureDMExists } from "./createRoom"; import { ViewUserPayload } from "./dispatcher/payloads/ViewUserPayload"; @@ -55,8 +56,6 @@ import DevtoolsDialog from './components/views/dialogs/DevtoolsDialog'; import RoomUpgradeWarningDialog from "./components/views/dialogs/RoomUpgradeWarningDialog"; import InfoDialog from "./components/views/dialogs/InfoDialog"; import SlashCommandHelpDialog from "./components/views/dialogs/SlashCommandHelpDialog"; - -import { logger } from "matrix-js-sdk/src/logger"; import { shouldShowComponent } from "./customisations/helpers/UIComponents"; import { TimelineRenderingType } from './contexts/RoomContext'; import RoomViewStore from "./stores/RoomViewStore"; diff --git a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx index 245cf84718..3d2115a8f3 100644 --- a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx +++ b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx @@ -16,8 +16,14 @@ limitations under the License. */ import React, { createRef } from 'react'; -import { MatrixClientPeg } from '../../../../MatrixClientPeg'; import FileSaver from 'file-saver'; +import { logger } from "matrix-js-sdk/src/logger"; +import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup"; +import { TrustInfo } from "matrix-js-sdk/src/crypto/backup"; +import { CrossSigningKeys } from "matrix-js-sdk/src"; +import { IRecoveryKey } from "matrix-js-sdk/src/crypto/api"; + +import { MatrixClientPeg } from '../../../../MatrixClientPeg'; import { _t, _td } from '../../../../languageHandler'; import Modal from '../../../../Modal'; import { promptForBackupPassphrase } from '../../../../SecurityManager'; @@ -35,17 +41,11 @@ import { SecureBackupSetupMethod, } from '../../../../utils/WellKnownUtils'; import SecurityCustomisations from "../../../../customisations/Security"; - -import { logger } from "matrix-js-sdk/src/logger"; -import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup"; import { IDialogProps } from "../../../../components/views/dialogs/IDialogProps"; import Field from "../../../../components/views/elements/Field"; import BaseDialog from "../../../../components/views/dialogs/BaseDialog"; import Spinner from "../../../../components/views/elements/Spinner"; -import { TrustInfo } from "matrix-js-sdk/src/crypto/backup"; -import { CrossSigningKeys } from "matrix-js-sdk/src"; import InteractiveAuthDialog from "../../../../components/views/dialogs/InteractiveAuthDialog"; -import { IRecoveryKey } from "matrix-js-sdk/src/crypto/api"; import { IValidationResult } from "../../../../components/views/elements/Validation"; // I made a mistake while converting this and it has to be fixed! diff --git a/src/autocomplete/AutocompleteProvider.tsx b/src/autocomplete/AutocompleteProvider.tsx index 14ade84bf3..f8c3fe973d 100644 --- a/src/autocomplete/AutocompleteProvider.tsx +++ b/src/autocomplete/AutocompleteProvider.tsx @@ -17,6 +17,7 @@ limitations under the License. */ import React from 'react'; + import { TimelineRenderingType } from '../contexts/RoomContext'; import type { ICompletion, ISelectionRange } from './Autocompleter'; diff --git a/src/autocomplete/CommandProvider.tsx b/src/autocomplete/CommandProvider.tsx index 17d17d6e57..23b31407a8 100644 --- a/src/autocomplete/CommandProvider.tsx +++ b/src/autocomplete/CommandProvider.tsx @@ -18,6 +18,7 @@ limitations under the License. */ import React from 'react'; +import { Room } from 'matrix-js-sdk/src/models/room'; import { _t } from '../languageHandler'; import AutocompleteProvider from './AutocompleteProvider'; @@ -25,7 +26,6 @@ import QueryMatcher from './QueryMatcher'; import { TextualCompletion } from './Components'; import { ICompletion, ISelectionRange } from "./Autocompleter"; import { Command, Commands, CommandMap } from '../SlashCommands'; -import { Room } from 'matrix-js-sdk/src/models/room'; import { TimelineRenderingType } from '../contexts/RoomContext'; const COMMAND_RE = /(^\/\w*)(?: .*)?/g; diff --git a/src/autocomplete/CommunityProvider.tsx b/src/autocomplete/CommunityProvider.tsx index 1fcf27d8e5..b3a4079f94 100644 --- a/src/autocomplete/CommunityProvider.tsx +++ b/src/autocomplete/CommunityProvider.tsx @@ -18,6 +18,7 @@ limitations under the License. import React from 'react'; import Group from "matrix-js-sdk/src/models/group"; import { sortBy } from "lodash"; +import { Room } from 'matrix-js-sdk/src/models/room'; import { _t } from '../languageHandler'; import AutocompleteProvider from './AutocompleteProvider'; @@ -29,7 +30,6 @@ import { ICompletion, ISelectionRange } from "./Autocompleter"; import FlairStore from "../stores/FlairStore"; import { mediaFromMxc } from "../customisations/Media"; import BaseAvatar from '../components/views/avatars/BaseAvatar'; -import { Room } from 'matrix-js-sdk/src/models/room'; import { TimelineRenderingType } from '../contexts/RoomContext'; const COMMUNITY_REGEX = /\B\+\S*/g; diff --git a/src/autocomplete/EmojiProvider.tsx b/src/autocomplete/EmojiProvider.tsx index c43eba0bf1..960b0f9475 100644 --- a/src/autocomplete/EmojiProvider.tsx +++ b/src/autocomplete/EmojiProvider.tsx @@ -18,17 +18,17 @@ limitations under the License. */ import React from 'react'; +import { uniq, sortBy } from 'lodash'; +import EMOTICON_REGEX from 'emojibase-regex/emoticon'; +import { Room } from 'matrix-js-sdk/src/models/room'; + import { _t } from '../languageHandler'; import AutocompleteProvider from './AutocompleteProvider'; import QueryMatcher from './QueryMatcher'; import { PillCompletion } from './Components'; import { ICompletion, ISelectionRange } from './Autocompleter'; -import { uniq, sortBy } from 'lodash'; import SettingsStore from "../settings/SettingsStore"; import { EMOJI, IEmoji } from '../emoji'; - -import EMOTICON_REGEX from 'emojibase-regex/emoticon'; -import { Room } from 'matrix-js-sdk/src/models/room'; import { TimelineRenderingType } from '../contexts/RoomContext'; const LIMIT = 20; diff --git a/src/autocomplete/QueryMatcher.ts b/src/autocomplete/QueryMatcher.ts index bdfd94790b..737b0d80ce 100644 --- a/src/autocomplete/QueryMatcher.ts +++ b/src/autocomplete/QueryMatcher.ts @@ -18,6 +18,7 @@ limitations under the License. import { at, uniq } from 'lodash'; import { removeHiddenChars } from "matrix-js-sdk/src/utils"; + import { TimelineRenderingType } from '../contexts/RoomContext'; interface IOptions { diff --git a/src/components/structures/GroupFilterPanel.tsx b/src/components/structures/GroupFilterPanel.tsx index be69b78d3a..8db78f030c 100644 --- a/src/components/structures/GroupFilterPanel.tsx +++ b/src/components/structures/GroupFilterPanel.tsx @@ -15,16 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -import type { EventSubscription } from "fbemitter"; import React from 'react'; +import classNames from 'classnames'; + +import type { EventSubscription } from "fbemitter"; import GroupFilterOrderStore from '../../stores/GroupFilterOrderStore'; - import GroupActions from '../../actions/GroupActions'; - import dis from '../../dispatcher/dispatcher'; import { _t } from '../../languageHandler'; - -import classNames from 'classnames'; import MatrixClientContext from "../../contexts/MatrixClientContext"; import AutoHideScrollbar from "./AutoHideScrollbar"; import SettingsStore from "../../settings/SettingsStore"; diff --git a/src/components/structures/IndicatorScrollbar.tsx b/src/components/structures/IndicatorScrollbar.tsx index f687d9e067..26c6879b04 100644 --- a/src/components/structures/IndicatorScrollbar.tsx +++ b/src/components/structures/IndicatorScrollbar.tsx @@ -15,6 +15,7 @@ limitations under the License. */ import React, { ComponentProps, createRef } from "react"; + import AutoHideScrollbar from "./AutoHideScrollbar"; import { replaceableComponent } from "../../utils/replaceableComponent"; diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx index 9ba642c8a4..70c0346c49 100644 --- a/src/components/structures/LoggedInView.tsx +++ b/src/components/structures/LoggedInView.tsx @@ -17,6 +17,8 @@ limitations under the License. import React, { ClipboardEvent } from 'react'; import { MatrixClient } from 'matrix-js-sdk/src/client'; import { MatrixEvent } from 'matrix-js-sdk/src/models/event'; +import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call'; +import classNames from 'classnames'; import { Key } from '../../Keyboard'; import PageTypes from '../../PageTypes'; @@ -25,7 +27,6 @@ import { fixupColorFonts } from '../../utils/FontManager'; import dis from '../../dispatcher/dispatcher'; import { IMatrixClientCreds } from '../../MatrixClientPeg'; import SettingsStore from "../../settings/SettingsStore"; - import ResizeHandle from '../views/elements/ResizeHandle'; import { CollapseDistributor, Resizer } from '../../resizer'; import MatrixClientContext from "../../contexts/MatrixClientContext"; @@ -51,7 +52,6 @@ import { IOpts } from "../../createRoom"; import SpacePanel from "../views/spaces/SpacePanel"; import { replaceableComponent } from "../../utils/replaceableComponent"; import CallHandler, { CallHandlerEvent } from '../../CallHandler'; -import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call'; import AudioFeedArrayForCall from '../views/voip/AudioFeedArrayForCall'; import { OwnProfileStore } from '../../stores/OwnProfileStore'; import { UPDATE_EVENT } from "../../stores/AsyncStore"; @@ -62,7 +62,6 @@ import UserView from "./UserView"; import GroupView from "./GroupView"; import BackdropPanel from "./BackdropPanel"; import SpaceStore from "../../stores/spaces/SpaceStore"; -import classNames from 'classnames'; import GroupFilterPanel from './GroupFilterPanel'; import CustomRoomTagPanel from './CustomRoomTagPanel'; import { mediaFromMxc } from "../../customisations/Media"; diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx index 8912837f0c..bfdbacef7a 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx @@ -21,6 +21,7 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { Error as ErrorEvent } from "matrix-analytics-events/types/typescript/Error"; import { Screen as ScreenEvent } from "matrix-analytics-events/types/typescript/Screen"; import { defer, IDeferred, QueryDict } from "matrix-js-sdk/src/utils"; +import { logger } from "matrix-js-sdk/src/logger"; // focus-visible is a Polyfill for the :focus-visible CSS pseudo-attribute used by _AccessibleButton.scss import 'focus-visible'; @@ -35,7 +36,6 @@ import PlatformPeg from "../../PlatformPeg"; import SdkConfig from "../../SdkConfig"; import dis from "../../dispatcher/dispatcher"; import Notifier from '../../Notifier'; - import Modal from "../../Modal"; import { showRoomInviteDialog, showStartChatInviteDialog } from '../../RoomInvite'; import * as Rooms from '../../Rooms'; @@ -43,7 +43,6 @@ import * as Lifecycle from '../../Lifecycle'; // LifecycleStore is not used but does listen to and dispatch actions import '../../stores/LifecycleStore'; import PageType from '../../PageTypes'; - import createRoom, { IOpts } from "../../createRoom"; import { _t, _td, getCurrentLanguage } from '../../languageHandler'; import SettingsStore from "../../settings/SettingsStore"; @@ -100,7 +99,6 @@ import Registration from './auth/Registration'; import Login from "./auth/Login"; import ErrorBoundary from '../views/elements/ErrorBoundary'; import VerificationRequestToast from '../views/toasts/VerificationRequestToast'; - import PerformanceMonitor, { PerformanceEntryNames } from "../../performance"; import UIStore, { UI_EVENTS } from "../../stores/UIStore"; import SoftLogout from './auth/SoftLogout'; @@ -109,8 +107,6 @@ import { copyPlaintext } from "../../utils/strings"; import { PosthogAnalytics } from '../../PosthogAnalytics'; import { initSentry } from "../../sentry"; import CallHandler from "../../CallHandler"; - -import { logger } from "matrix-js-sdk/src/logger"; import { showSpaceInvite } from "../../utils/space"; import GenericToast from "../views/toasts/GenericToast"; import InfoDialog from "../views/dialogs/InfoDialog"; diff --git a/src/components/structures/RightPanel.tsx b/src/components/structures/RightPanel.tsx index 63084e589c..5431b848ba 100644 --- a/src/components/structures/RightPanel.tsx +++ b/src/components/structures/RightPanel.tsx @@ -21,6 +21,7 @@ import { RoomState } from "matrix-js-sdk/src/models/room-state"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest"; +import { throttle } from 'lodash'; import dis from '../../dispatcher/dispatcher'; import GroupStore from '../../stores/GroupStore'; @@ -49,7 +50,6 @@ import ThreadPanel from "./ThreadPanel"; import NotificationPanel from "./NotificationPanel"; import ResizeNotifier from "../../utils/ResizeNotifier"; import PinnedMessagesCard from "../views/right_panel/PinnedMessagesCard"; -import { throttle } from 'lodash'; import SpaceStore from "../../stores/spaces/SpaceStore"; import { RoomPermalinkCreator } from '../../utils/permalinks/Permalinks'; import { E2EStatus } from '../../utils/ShieldUtils'; diff --git a/src/components/structures/RoomDirectory.tsx b/src/components/structures/RoomDirectory.tsx index 2f82e81ae0..a60ee5f805 100644 --- a/src/components/structures/RoomDirectory.tsx +++ b/src/components/structures/RoomDirectory.tsx @@ -19,6 +19,7 @@ import React from "react"; import { IFieldType, IInstance, IProtocol, IPublicRoomsChunkRoom } from "matrix-js-sdk/src/client"; import { Visibility } from "matrix-js-sdk/src/@types/partials"; import { IRoomDirectoryOptions } from "matrix-js-sdk/src/@types/requests"; +import { logger } from "matrix-js-sdk/src/logger"; import { MatrixClientPeg } from "../../MatrixClientPeg"; import dis from "../../dispatcher/dispatcher"; @@ -47,8 +48,6 @@ import ScrollPanel from "./ScrollPanel"; import Spinner from "../views/elements/Spinner"; import { ActionPayload } from "../../dispatcher/payloads"; import { getDisplayAliasForAliasSet } from "../../Rooms"; - -import { logger } from "matrix-js-sdk/src/logger"; import { Action } from "../../dispatcher/actions"; const MAX_NAME_LENGTH = 80; diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 5f3f3413a0..979893cc3d 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -31,6 +31,8 @@ import { logger } from "matrix-js-sdk/src/logger"; import { EventTimeline } from 'matrix-js-sdk/src/models/event-timeline'; import { EventType } from 'matrix-js-sdk/src/@types/event'; import { RoomState } from 'matrix-js-sdk/src/models/room-state'; +import { CallState, CallType, MatrixCall } from "matrix-js-sdk/src/webrtc/call"; +import { throttle } from "lodash"; import shouldHideEvent from '../../shouldHideEvent'; import { _t } from '../../languageHandler'; @@ -70,7 +72,6 @@ import { IOOBData, IThreepidInvite } from "../../stores/ThreepidInviteStore"; import EffectsOverlay from "../views/elements/EffectsOverlay"; import { containsEmoji } from '../../effects/utils'; import { CHAT_EFFECTS } from '../../effects'; -import { CallState, CallType, MatrixCall } from "matrix-js-sdk/src/webrtc/call"; import WidgetStore from "../../stores/WidgetStore"; import { UPDATE_EVENT } from "../../stores/AsyncStore"; import Notifier from "../../Notifier"; @@ -83,7 +84,6 @@ import SpaceRoomView from "./SpaceRoomView"; import { IOpts } from "../../createRoom"; import { replaceableComponent } from "../../utils/replaceableComponent"; import EditorStateTransfer from "../../utils/EditorStateTransfer"; -import { throttle } from "lodash"; import ErrorDialog from '../views/dialogs/ErrorDialog'; import SearchResultTile from '../views/rooms/SearchResultTile'; import Spinner from "../views/elements/Spinner"; diff --git a/src/components/structures/UploadBar.tsx b/src/components/structures/UploadBar.tsx index 55537be25f..b488870840 100644 --- a/src/components/structures/UploadBar.tsx +++ b/src/components/structures/UploadBar.tsx @@ -17,6 +17,7 @@ limitations under the License. import React from 'react'; import { Room } from "matrix-js-sdk/src/models/room"; import filesize from "filesize"; +import { IEventRelation } from 'matrix-js-sdk/src'; import ContentMessages from '../../ContentMessages'; import dis from "../../dispatcher/dispatcher"; @@ -28,7 +29,6 @@ import AccessibleButton from "../views/elements/AccessibleButton"; import { IUpload } from "../../models/IUpload"; import { replaceableComponent } from "../../utils/replaceableComponent"; import MatrixClientContext from "../../contexts/MatrixClientContext"; -import { IEventRelation } from 'matrix-js-sdk/src'; interface IProps { room: Room; diff --git a/src/components/structures/auth/ForgotPassword.tsx b/src/components/structures/auth/ForgotPassword.tsx index 257f8559f1..dee6f2dec6 100644 --- a/src/components/structures/auth/ForgotPassword.tsx +++ b/src/components/structures/auth/ForgotPassword.tsx @@ -17,11 +17,13 @@ limitations under the License. */ import React from 'react'; +import classNames from 'classnames'; +import { logger } from "matrix-js-sdk/src/logger"; + import { _t, _td } from '../../../languageHandler'; import Modal from "../../../Modal"; import PasswordReset from "../../../PasswordReset"; import AutoDiscoveryUtils, { ValidatedServerConfig } from "../../../utils/AutoDiscoveryUtils"; -import classNames from 'classnames'; import AuthPage from "../../views/auth/AuthPage"; import CountlyAnalytics from "../../../CountlyAnalytics"; import ServerPicker from "../../views/elements/ServerPicker"; @@ -30,7 +32,6 @@ import PassphraseField from '../../views/auth/PassphraseField'; import { replaceableComponent } from "../../../utils/replaceableComponent"; import { PASSWORD_MIN_SCORE } from '../../views/auth/RegistrationForm'; import InlineSpinner from '../../views/elements/InlineSpinner'; -import { logger } from "matrix-js-sdk/src/logger"; import Spinner from "../../views/elements/Spinner"; import QuestionDialog from "../../views/dialogs/QuestionDialog"; import ErrorDialog from "../../views/dialogs/ErrorDialog"; diff --git a/src/components/views/auth/PassphraseConfirmField.tsx b/src/components/views/auth/PassphraseConfirmField.tsx index 74ce711470..3a2b6f89b7 100644 --- a/src/components/views/auth/PassphraseConfirmField.tsx +++ b/src/components/views/auth/PassphraseConfirmField.tsx @@ -15,6 +15,7 @@ limitations under the License. */ import React, { PureComponent, RefCallback, RefObject } from "react"; + import { replaceableComponent } from "../../../utils/replaceableComponent"; import Field, { IInputProps } from "../elements/Field"; import withValidation, { IFieldState, IValidationResult } from "../elements/Validation"; diff --git a/src/components/views/auth/RegistrationForm.tsx b/src/components/views/auth/RegistrationForm.tsx index 81084a48a3..0b41f06400 100644 --- a/src/components/views/auth/RegistrationForm.tsx +++ b/src/components/views/auth/RegistrationForm.tsx @@ -17,6 +17,7 @@ limitations under the License. import React from 'react'; import { MatrixClient } from 'matrix-js-sdk/src/client'; +import { logger } from "matrix-js-sdk/src/logger"; import * as Email from '../../../email'; import { looksValid as phoneNumberLooksValid } from '../../../phonenumber'; @@ -33,8 +34,6 @@ import Field from '../elements/Field'; import RegistrationEmailPromptDialog from '../dialogs/RegistrationEmailPromptDialog'; import { replaceableComponent } from "../../../utils/replaceableComponent"; import CountryDropdown from "./CountryDropdown"; - -import { logger } from "matrix-js-sdk/src/logger"; import PassphraseConfirmField from "./PassphraseConfirmField"; enum RegistrationField { diff --git a/src/components/views/context_menus/CallContextMenu.tsx b/src/components/views/context_menus/CallContextMenu.tsx index 7fcf1fa50c..931bddf335 100644 --- a/src/components/views/context_menus/CallContextMenu.tsx +++ b/src/components/views/context_menus/CallContextMenu.tsx @@ -16,9 +16,10 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; +import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call'; + import { _t } from '../../../languageHandler'; import ContextMenu, { IProps as IContextMenuProps, MenuItem } from '../../structures/ContextMenu'; -import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call'; import CallHandler from '../../../CallHandler'; import InviteDialog, { KIND_CALL_TRANSFER } from '../dialogs/InviteDialog'; import Modal from '../../../Modal'; diff --git a/src/components/views/context_menus/DialpadContextMenu.tsx b/src/components/views/context_menus/DialpadContextMenu.tsx index cb1b877e66..70a5aae2e8 100644 --- a/src/components/views/context_menus/DialpadContextMenu.tsx +++ b/src/components/views/context_menus/DialpadContextMenu.tsx @@ -16,9 +16,10 @@ limitations under the License. import * as React from "react"; import { createRef } from "react"; +import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call'; + import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton"; import ContextMenu, { IProps as IContextMenuProps } from '../../structures/ContextMenu'; -import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call'; import Field from "../elements/Field"; import DialPad from '../voip/DialPad'; import { replaceableComponent } from "../../../utils/replaceableComponent"; diff --git a/src/components/views/context_menus/MessageContextMenu.tsx b/src/components/views/context_menus/MessageContextMenu.tsx index dc33120a76..84c61a716d 100644 --- a/src/components/views/context_menus/MessageContextMenu.tsx +++ b/src/components/views/context_menus/MessageContextMenu.tsx @@ -18,6 +18,7 @@ limitations under the License. import React from 'react'; import { EventStatus, MatrixEvent } from 'matrix-js-sdk/src/models/event'; import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; +import { Relations } from 'matrix-js-sdk/src/models/relations'; import { MatrixClientPeg } from '../../../MatrixClientPeg'; import dis from '../../../dispatcher/dispatcher'; @@ -43,7 +44,6 @@ import { ComposerInsertPayload } from "../../../dispatcher/payloads/ComposerInse import { WidgetLayoutStore } from '../../../stores/widgets/WidgetLayoutStore'; import { POLL_START_EVENT_TYPE } from '../../../polls/consts'; import EndPollDialog from '../dialogs/EndPollDialog'; -import { Relations } from 'matrix-js-sdk/src/models/relations'; import { isPollEnded } from '../messages/MPollBody'; export function canCancel(eventStatus: EventStatus): boolean { diff --git a/src/components/views/context_menus/ThreadListContextMenu.tsx b/src/components/views/context_menus/ThreadListContextMenu.tsx index b97b1b80bb..f9aa7a4b9f 100644 --- a/src/components/views/context_menus/ThreadListContextMenu.tsx +++ b/src/components/views/context_menus/ThreadListContextMenu.tsx @@ -16,6 +16,7 @@ limitations under the License. import React, { useCallback, useEffect, useState } from "react"; import { MatrixEvent } from "matrix-js-sdk/src"; + import { ButtonEvent } from "../elements/AccessibleButton"; import dis from '../../../dispatcher/dispatcher'; import { Action } from "../../../dispatcher/actions"; diff --git a/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx b/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx index 6c60c46175..04573252b5 100644 --- a/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx +++ b/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx @@ -14,10 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. */ +import React from "react"; + import BaseDialog from "./BaseDialog"; import { _t } from "../../../languageHandler"; import DialogButtons from "../elements/DialogButtons"; -import React from "react"; import Modal from "../../../Modal"; import SdkConfig from "../../../SdkConfig"; diff --git a/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx b/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx index 2c3d570eae..02ad94302c 100644 --- a/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx +++ b/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx @@ -15,10 +15,10 @@ limitations under the License. */ import React, { ComponentProps, useMemo, useState } from 'react'; +import { Room } from "matrix-js-sdk/src/models/room"; import ConfirmUserActionDialog from "./ConfirmUserActionDialog"; import SpaceStore from "../../../stores/spaces/SpaceStore"; -import { Room } from "matrix-js-sdk/src/models/room"; import SpaceChildrenPicker from "../spaces/SpaceChildrenPicker"; type BaseProps = ComponentProps; diff --git a/src/components/views/dialogs/FeedbackDialog.tsx b/src/components/views/dialogs/FeedbackDialog.tsx index 4914b26210..a25b328fd3 100644 --- a/src/components/views/dialogs/FeedbackDialog.tsx +++ b/src/components/views/dialogs/FeedbackDialog.tsx @@ -15,6 +15,7 @@ limitations under the License. */ import React, { useEffect, useRef, useState } from 'react'; + import QuestionDialog from './QuestionDialog'; import { _t } from '../../../languageHandler'; import Field from "../elements/Field"; diff --git a/src/components/views/dialogs/LogoutDialog.tsx b/src/components/views/dialogs/LogoutDialog.tsx index f18e72bd7f..11868f3820 100644 --- a/src/components/views/dialogs/LogoutDialog.tsx +++ b/src/components/views/dialogs/LogoutDialog.tsx @@ -17,14 +17,14 @@ limitations under the License. import React, { ComponentType } from 'react'; import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup"; +import { logger } from "matrix-js-sdk/src/logger"; + import Modal from '../../../Modal'; import dis from '../../../dispatcher/dispatcher'; import { _t } from '../../../languageHandler'; import { MatrixClientPeg } from '../../../MatrixClientPeg'; import RestoreKeyBackupDialog from './security/RestoreKeyBackupDialog'; import { replaceableComponent } from "../../../utils/replaceableComponent"; - -import { logger } from "matrix-js-sdk/src/logger"; import QuestionDialog from "./QuestionDialog"; import BaseDialog from "./BaseDialog"; import Spinner from "../elements/Spinner"; diff --git a/src/components/views/dialogs/ScrollableBaseModal.tsx b/src/components/views/dialogs/ScrollableBaseModal.tsx index 82cd392c4f..294229219b 100644 --- a/src/components/views/dialogs/ScrollableBaseModal.tsx +++ b/src/components/views/dialogs/ScrollableBaseModal.tsx @@ -16,11 +16,12 @@ limitations under the License. import React, { FormEvent } from "react"; import { MatrixClient } from "matrix-js-sdk/src/client"; +import FocusLock from "react-focus-lock"; + import { MatrixClientPeg } from "../../../MatrixClientPeg"; import { Key } from "../../../Keyboard"; import { IDialogProps } from "./IDialogProps"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; -import FocusLock from "react-focus-lock"; import { _t } from "../../../languageHandler"; import AccessibleButton from "../elements/AccessibleButton"; diff --git a/src/components/views/elements/AppTile.tsx b/src/components/views/elements/AppTile.tsx index be710d7260..a8e2308976 100644 --- a/src/components/views/elements/AppTile.tsx +++ b/src/components/views/elements/AppTile.tsx @@ -19,6 +19,11 @@ limitations under the License. import url from 'url'; import React, { createRef } from 'react'; +import classNames from 'classnames'; +import { MatrixCapabilities } from "matrix-widget-api"; +import { Room } from "matrix-js-sdk/src/models/room"; +import { logger } from "matrix-js-sdk/src/logger"; + import { MatrixClientPeg } from '../../../MatrixClientPeg'; import AccessibleButton from './AccessibleButton'; import { _t } from '../../../languageHandler'; @@ -27,21 +32,19 @@ import AppWarning from './AppWarning'; import Spinner from './Spinner'; import dis from '../../../dispatcher/dispatcher'; import ActiveWidgetStore from '../../../stores/ActiveWidgetStore'; -import classNames from 'classnames'; import SettingsStore from "../../../settings/SettingsStore"; import { aboveLeftOf, ContextMenuButton } from "../../structures/ContextMenu"; import PersistedElement, { getPersistKey } from "./PersistedElement"; import { WidgetType } from "../../../widgets/WidgetType"; import { StopGapWidget } from "../../../stores/widgets/StopGapWidget"; import { ElementWidgetActions } from "../../../stores/widgets/ElementWidgetActions"; -import { MatrixCapabilities } from "matrix-widget-api"; import RoomWidgetContextMenu from "../context_menus/WidgetContextMenu"; import WidgetAvatar from "../avatars/WidgetAvatar"; import { replaceableComponent } from "../../../utils/replaceableComponent"; import CallHandler from '../../../CallHandler'; -import { Room } from "matrix-js-sdk/src/models/room"; import { IApp } from "../../../stores/WidgetStore"; import { WidgetLayoutStore, Container } from "../../../stores/widgets/WidgetLayoutStore"; + interface IProps { app: IApp; // If room is not specified then it is an account level widget @@ -89,8 +92,6 @@ interface IState { requiresClient: boolean; } -import { logger } from "matrix-js-sdk/src/logger"; - @replaceableComponent("views.elements.AppTile") export default class AppTile extends React.Component { public static defaultProps: Partial = { diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js index ed74246cb2..e35e9ca906 100644 --- a/src/components/views/elements/DNDTagTile.js +++ b/src/components/views/elements/DNDTagTile.js @@ -15,9 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -import TagTile from './TagTile'; - import React from 'react'; + +import TagTile from './TagTile'; import ContextMenu, { toRightOf, useContextMenu } from "../../structures/ContextMenu"; import * as sdk from '../../../index'; diff --git a/src/components/views/elements/MemberEventListSummary.tsx b/src/components/views/elements/MemberEventListSummary.tsx index 13dcb114f9..be39ceb6e5 100644 --- a/src/components/views/elements/MemberEventListSummary.tsx +++ b/src/components/views/elements/MemberEventListSummary.tsx @@ -19,6 +19,7 @@ limitations under the License. import React, { ComponentProps } from 'react'; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { EventType } from 'matrix-js-sdk/src/@types/event'; import { _t } from '../../../languageHandler'; import { formatCommaSeparatedList } from '../../../utils/FormattingUtils'; @@ -30,7 +31,6 @@ import { RightPanelPhases } from '../../../stores/RightPanelStorePhases'; import { Action } from '../../../dispatcher/actions'; import { SetRightPanelPhasePayload } from '../../../dispatcher/payloads/SetRightPanelPhasePayload'; import { jsxJoin } from '../../../utils/ReactUtils'; -import { EventType } from 'matrix-js-sdk/src/@types/event'; import { Layout } from '../../../settings/enums/Layout'; const onPinnedMessagesClick = (): void => { diff --git a/src/components/views/elements/PollCreateDialog.tsx b/src/components/views/elements/PollCreateDialog.tsx index d015347d66..4e1e76d23f 100644 --- a/src/components/views/elements/PollCreateDialog.tsx +++ b/src/components/views/elements/PollCreateDialog.tsx @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. */ +import React, { ChangeEvent, createRef } from "react"; +import { Room } from "matrix-js-sdk/src/models/room"; + import ScrollableBaseModal, { IScrollableBaseState } from "../dialogs/ScrollableBaseModal"; import { IDialogProps } from "../dialogs/IDialogProps"; import QuestionDialog from "../dialogs/QuestionDialog"; -import React, { ChangeEvent, createRef } from "react"; import Modal from '../../../Modal'; import { _t } from "../../../languageHandler"; -import { Room } from "matrix-js-sdk/src/models/room"; import { arrayFastClone, arraySeed } from "../../../utils/arrays"; import Field from "./Field"; import AccessibleButton from "./AccessibleButton"; diff --git a/src/components/views/elements/ReplyChain.tsx b/src/components/views/elements/ReplyChain.tsx index 64a8ff6701..07b3db5929 100644 --- a/src/components/views/elements/ReplyChain.tsx +++ b/src/components/views/elements/ReplyChain.tsx @@ -17,25 +17,25 @@ limitations under the License. import React from 'react'; import classNames from 'classnames'; +import { MatrixEvent } from 'matrix-js-sdk/src/models/event'; +import escapeHtml from "escape-html"; +import sanitizeHtml from "sanitize-html"; +import { Room } from 'matrix-js-sdk/src/models/room'; +import { RelationType } from 'matrix-js-sdk/src/@types/event'; import { _t } from '../../../languageHandler'; import dis from '../../../dispatcher/dispatcher'; -import { MatrixEvent } from 'matrix-js-sdk/src/models/event'; import { makeUserPermalink, RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks"; import SettingsStore from "../../../settings/SettingsStore"; import { Layout } from "../../../settings/enums/Layout"; -import escapeHtml from "escape-html"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import { getUserNameColorClass } from "../../../utils/FormattingUtils"; import { Action } from "../../../dispatcher/actions"; -import sanitizeHtml from "sanitize-html"; import { PERMITTED_URL_SCHEMES } from "../../../HtmlUtils"; import { replaceableComponent } from "../../../utils/replaceableComponent"; import Spinner from './Spinner'; import ReplyTile from "../rooms/ReplyTile"; import Pill from './Pill'; -import { Room } from 'matrix-js-sdk/src/models/room'; -import { RelationType } from 'matrix-js-sdk/src/@types/event'; /** * This number is based on the previous behavior - if we have message of height diff --git a/src/components/views/elements/StyledCheckbox.tsx b/src/components/views/elements/StyledCheckbox.tsx index de68494041..868791151b 100644 --- a/src/components/views/elements/StyledCheckbox.tsx +++ b/src/components/views/elements/StyledCheckbox.tsx @@ -16,9 +16,9 @@ limitations under the License. import React from "react"; import { randomString } from "matrix-js-sdk/src/randomstring"; +import classnames from 'classnames'; import { replaceableComponent } from "../../../utils/replaceableComponent"; -import classnames from 'classnames'; export enum CheckboxStyle { Solid = "solid", diff --git a/src/components/views/location/LocationPicker.tsx b/src/components/views/location/LocationPicker.tsx index c3a18876da..b5ed928dd3 100644 --- a/src/components/views/location/LocationPicker.tsx +++ b/src/components/views/location/LocationPicker.tsx @@ -16,16 +16,15 @@ limitations under the License. import React from 'react'; import maplibregl from 'maplibre-gl'; +import { logger } from "matrix-js-sdk/src/logger"; import SdkConfig from '../../../SdkConfig'; import Field from "../elements/Field"; import DialogButtons from "../elements/DialogButtons"; import Dropdown from "../elements/Dropdown"; import LocationShareType from "./LocationShareType"; - import { _t } from '../../../languageHandler'; import { replaceableComponent } from "../../../utils/replaceableComponent"; -import { logger } from "matrix-js-sdk/src/logger"; interface IDropdownProps { value: LocationShareType; diff --git a/src/components/views/messages/IBodyProps.ts b/src/components/views/messages/IBodyProps.ts index 9b077e6e50..4e424fcc3e 100644 --- a/src/components/views/messages/IBodyProps.ts +++ b/src/components/views/messages/IBodyProps.ts @@ -15,11 +15,12 @@ limitations under the License. */ import { MatrixEvent } from "matrix-js-sdk/src/models/event"; +import { Relations } from "matrix-js-sdk/src/models/relations"; + import { TileShape } from "../rooms/EventTile"; import { MediaEventHelper } from "../../../utils/MediaEventHelper"; import EditorStateTransfer from "../../../utils/EditorStateTransfer"; import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks"; -import { Relations } from "matrix-js-sdk/src/models/relations"; export interface IBodyProps { mxEvent: MatrixEvent; diff --git a/src/components/views/messages/MImageBody.tsx b/src/components/views/messages/MImageBody.tsx index bff6654d19..e05aee6a25 100644 --- a/src/components/views/messages/MImageBody.tsx +++ b/src/components/views/messages/MImageBody.tsx @@ -17,6 +17,10 @@ limitations under the License. import React, { ComponentProps, createRef } from 'react'; import { Blurhash } from "react-blurhash"; +import { SyncState } from 'matrix-js-sdk/src/sync.api'; +import classNames from 'classnames'; +import { CSSTransition, SwitchTransition } from 'react-transition-group'; +import { logger } from "matrix-js-sdk/src/logger"; import MFileBody from './MFileBody'; import Modal from '../../../Modal'; @@ -29,12 +33,7 @@ import { Media, mediaFromContent } from "../../../customisations/Media"; import { BLURHASH_FIELD } from "../../../ContentMessages"; import { IMediaEventContent } from '../../../customisations/models/IMediaEventContent'; import ImageView from '../elements/ImageView'; -import { SyncState } from 'matrix-js-sdk/src/sync.api'; import { IBodyProps } from "./IBodyProps"; -import classNames from 'classnames'; -import { CSSTransition, SwitchTransition } from 'react-transition-group'; - -import { logger } from "matrix-js-sdk/src/logger"; import { TileShape } from '../rooms/EventTile'; import { ImageSize, suggestedSize as suggestedImageSize } from "../../../settings/enums/ImageSize"; diff --git a/src/components/views/messages/MLocationBody.tsx b/src/components/views/messages/MLocationBody.tsx index 49ff063f40..28a122e60f 100644 --- a/src/components/views/messages/MLocationBody.tsx +++ b/src/components/views/messages/MLocationBody.tsx @@ -16,10 +16,11 @@ limitations under the License. import React from 'react'; import maplibregl from 'maplibre-gl'; +import { logger } from "matrix-js-sdk/src/logger"; + import SdkConfig from '../../../SdkConfig'; import { replaceableComponent } from "../../../utils/replaceableComponent"; import { IBodyProps } from "./IBodyProps"; -import { logger } from "matrix-js-sdk/src/logger"; import { _t } from '../../../languageHandler'; interface IState { diff --git a/src/components/views/messages/MPollBody.tsx b/src/components/views/messages/MPollBody.tsx index 0ef9ac1b6f..55c4b672bd 100644 --- a/src/components/views/messages/MPollBody.tsx +++ b/src/components/views/messages/MPollBody.tsx @@ -16,6 +16,10 @@ limitations under the License. import React from 'react'; import classNames from 'classnames'; +import { MatrixEvent } from "matrix-js-sdk/src/models/event"; +import { Relations } from 'matrix-js-sdk/src/models/relations'; +import { MatrixClient } from 'matrix-js-sdk/src/matrix'; + import { _t } from '../../../languageHandler'; import { replaceableComponent } from "../../../utils/replaceableComponent"; import Modal from '../../../Modal'; @@ -31,11 +35,8 @@ import { TEXT_NODE_TYPE, } from '../../../polls/consts'; import StyledRadioButton from '../elements/StyledRadioButton'; -import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Relations } from 'matrix-js-sdk/src/models/relations'; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import ErrorDialog from '../dialogs/ErrorDialog'; -import { MatrixClient } from 'matrix-js-sdk/src/matrix'; interface IState { selected?: string; // Which option was clicked by the local user diff --git a/src/components/views/messages/MVideoBody.tsx b/src/components/views/messages/MVideoBody.tsx index e0ee24c9cd..202829a619 100644 --- a/src/components/views/messages/MVideoBody.tsx +++ b/src/components/views/messages/MVideoBody.tsx @@ -16,6 +16,7 @@ limitations under the License. import React from 'react'; import { decode } from "blurhash"; +import { logger } from "matrix-js-sdk/src/logger"; import { _t } from '../../../languageHandler'; import SettingsStore from "../../../settings/SettingsStore"; @@ -26,8 +27,6 @@ import { BLURHASH_FIELD } from "../../../ContentMessages"; import { IMediaEventContent } from "../../../customisations/models/IMediaEventContent"; import { IBodyProps } from "./IBodyProps"; import MFileBody from "./MFileBody"; - -import { logger } from "matrix-js-sdk/src/logger"; import { ImageSize, suggestedSize as suggestedVideoSize } from "../../../settings/enums/ImageSize"; interface IState { diff --git a/src/components/views/messages/MessageActionBar.tsx b/src/components/views/messages/MessageActionBar.tsx index ba75749f35..abaf78797e 100644 --- a/src/components/views/messages/MessageActionBar.tsx +++ b/src/components/views/messages/MessageActionBar.tsx @@ -19,6 +19,7 @@ limitations under the License. import React, { ReactElement, useEffect } from 'react'; import { EventStatus, MatrixEvent } from 'matrix-js-sdk/src/models/event'; import classNames from 'classnames'; +import { MsgType } from 'matrix-js-sdk/src/@types/event'; import type { Relations } from 'matrix-js-sdk/src/models/relations'; import { _t } from '../../../languageHandler'; @@ -40,7 +41,6 @@ import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks'; import ReplyChain from '../elements/ReplyChain'; import { dispatchShowThreadEvent } from '../../../dispatcher/dispatch-actions/threads'; import ReactionPicker from "../emojipicker/ReactionPicker"; -import { MsgType } from 'matrix-js-sdk/src/@types/event'; interface IOptionsButtonProps { mxEvent: MatrixEvent; diff --git a/src/components/views/messages/MessageEvent.tsx b/src/components/views/messages/MessageEvent.tsx index ac87595251..2cd23779d3 100644 --- a/src/components/views/messages/MessageEvent.tsx +++ b/src/components/views/messages/MessageEvent.tsx @@ -16,6 +16,7 @@ limitations under the License. import React, { createRef } from 'react'; import { EventType, MsgType } from "matrix-js-sdk/src/@types/event"; +import { Relations } from 'matrix-js-sdk/src/models/relations'; import * as sdk from '../../../index'; import SettingsStore from "../../../settings/SettingsStore"; @@ -29,7 +30,6 @@ import { MediaEventHelper } from "../../../utils/MediaEventHelper"; import { ReactAnyComponent } from "../../../@types/common"; import { IBodyProps } from "./IBodyProps"; import { POLL_START_EVENT_TYPE } from '../../../polls/consts'; -import { Relations } from 'matrix-js-sdk/src/models/relations'; // onMessageAllowed is handled internally interface IProps extends Omit { diff --git a/src/components/views/messages/MessageTimestamp.tsx b/src/components/views/messages/MessageTimestamp.tsx index b1bc5413fe..cbf37f47f6 100644 --- a/src/components/views/messages/MessageTimestamp.tsx +++ b/src/components/views/messages/MessageTimestamp.tsx @@ -16,6 +16,7 @@ limitations under the License. */ import React from 'react'; + import { formatFullDate, formatTime, formatFullTime, formatRelativeTime } from '../../../DateUtils'; import { replaceableComponent } from "../../../utils/replaceableComponent"; diff --git a/src/components/views/right_panel/TimelineCard.tsx b/src/components/views/right_panel/TimelineCard.tsx index 5bc875b8c6..d3f4851051 100644 --- a/src/components/views/right_panel/TimelineCard.tsx +++ b/src/components/views/right_panel/TimelineCard.tsx @@ -20,7 +20,6 @@ import { EventTimelineSet, IEventRelation, MatrixEvent, Room } from 'matrix-js-s import { Thread } from 'matrix-js-sdk/src/models/thread'; import BaseCard from "./BaseCard"; - import ResizeNotifier from '../../../utils/ResizeNotifier'; import MessageComposer from '../rooms/MessageComposer'; import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks'; diff --git a/src/components/views/rooms/MemberList.tsx b/src/components/views/rooms/MemberList.tsx index 224bb03ff6..21ce299e13 100644 --- a/src/components/views/rooms/MemberList.tsx +++ b/src/components/views/rooms/MemberList.tsx @@ -18,6 +18,14 @@ limitations under the License. */ import React from 'react'; +import { MatrixEvent } from 'matrix-js-sdk/src/models/event'; +import { Room } from 'matrix-js-sdk/src/models/room'; +import { RoomMember } from 'matrix-js-sdk/src/models/room-member'; +import { RoomState } from 'matrix-js-sdk/src/models/room-state'; +import { User } from "matrix-js-sdk/src/models/user"; +import { throttle } from 'lodash'; +import { JoinRule } from "matrix-js-sdk/src/@types/partials"; + import { _t } from '../../../languageHandler'; import SdkConfig from '../../../SdkConfig'; import dis from '../../../dispatcher/dispatcher'; @@ -30,11 +38,6 @@ import RoomAvatar from "../avatars/RoomAvatar"; import RoomName from "../elements/RoomName"; import { replaceableComponent } from "../../../utils/replaceableComponent"; import SettingsStore from "../../../settings/SettingsStore"; -import { MatrixEvent } from 'matrix-js-sdk/src/models/event'; -import { Room } from 'matrix-js-sdk/src/models/room'; -import { RoomMember } from 'matrix-js-sdk/src/models/room-member'; -import { RoomState } from 'matrix-js-sdk/src/models/room-state'; -import { User } from "matrix-js-sdk/src/models/user"; import TruncatedList from '../elements/TruncatedList'; import Spinner from "../elements/Spinner"; import SearchBox from "../../structures/SearchBox"; @@ -42,11 +45,9 @@ import AccessibleButton from '../elements/AccessibleButton'; import EntityTile from "./EntityTile"; import MemberTile from "./MemberTile"; import BaseAvatar from '../avatars/BaseAvatar'; -import { throttle } from 'lodash'; import SpaceStore from "../../../stores/spaces/SpaceStore"; import { shouldShowComponent } from "../../../customisations/helpers/UIComponents"; import { UIComponent } from "../../../settings/UIFeature"; -import { JoinRule } from "matrix-js-sdk/src/@types/partials"; const INITIAL_LOAD_NUM_MEMBERS = 30; const INITIAL_LOAD_NUM_INVITED = 5; diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx index d64bef9d2d..7af913763b 100644 --- a/src/components/views/rooms/MessageComposer.tsx +++ b/src/components/views/rooms/MessageComposer.tsx @@ -15,11 +15,15 @@ limitations under the License. */ import React, { createRef } from 'react'; import classNames from 'classnames'; -import { _t } from '../../../languageHandler'; -import { MatrixClientPeg } from '../../../MatrixClientPeg'; import { MatrixEvent, IEventRelation } from "matrix-js-sdk/src/models/event"; import { Room } from "matrix-js-sdk/src/models/room"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { RelationType } from 'matrix-js-sdk/src/@types/event'; +import { MsgType } from "matrix-js-sdk/src/@types/event"; +import { logger } from "matrix-js-sdk/src/logger"; + +import { _t } from '../../../languageHandler'; +import { MatrixClientPeg } from '../../../MatrixClientPeg'; import dis from '../../../dispatcher/dispatcher'; import { ActionPayload } from "../../../dispatcher/payloads"; import Stickerpicker from './Stickerpicker'; @@ -51,13 +55,10 @@ import EmojiPicker from '../emojipicker/EmojiPicker'; import LocationPicker from '../location/LocationPicker'; import UIStore, { UI_EVENTS } from '../../../stores/UIStore'; import Modal from "../../../Modal"; -import { RelationType } from 'matrix-js-sdk/src/@types/event'; import RoomContext from '../../../contexts/RoomContext'; import { POLL_START_EVENT_TYPE } from "../../../polls/consts"; import ErrorDialog from "../dialogs/ErrorDialog"; import PollCreateDialog from "../elements/PollCreateDialog"; -import { MsgType } from "matrix-js-sdk/src/@types/event"; -import { logger } from "matrix-js-sdk/src/logger"; import LocationShareType from "../location/LocationShareType"; import { SettingUpdatedPayload } from "../../../dispatcher/payloads/SettingUpdatedPayload"; diff --git a/src/components/views/rooms/ReplyTile.tsx b/src/components/views/rooms/ReplyTile.tsx index 176df6c0a6..ed4a902d66 100644 --- a/src/components/views/rooms/ReplyTile.tsx +++ b/src/components/views/rooms/ReplyTile.tsx @@ -16,22 +16,22 @@ limitations under the License. import React, { createRef } from 'react'; import classNames from 'classnames'; +import { MatrixEvent } from "matrix-js-sdk/src/models/event"; +import { EventType, MsgType } from 'matrix-js-sdk/src/@types/event'; +import { logger } from "matrix-js-sdk/src/logger"; + import { _t } from '../../../languageHandler'; import dis from '../../../dispatcher/dispatcher'; import { Action } from '../../../dispatcher/actions'; -import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks'; import SenderProfile from "../messages/SenderProfile"; import MImageReplyBody from "../messages/MImageReplyBody"; import * as sdk from '../../../index'; -import { EventType, MsgType } from 'matrix-js-sdk/src/@types/event'; import { replaceableComponent } from '../../../utils/replaceableComponent'; import { getEventDisplayInfo, isVoiceMessage } from '../../../utils/EventUtils'; import MFileBody from "../messages/MFileBody"; import MVoiceMessageBody from "../messages/MVoiceMessageBody"; -import { logger } from "matrix-js-sdk/src/logger"; - interface IProps { mxEvent: MatrixEvent; permalinkCreator?: RoomPermalinkCreator; diff --git a/src/components/views/rooms/RoomHeader.tsx b/src/components/views/rooms/RoomHeader.tsx index 4d5dfcd930..09ab7767d7 100644 --- a/src/components/views/rooms/RoomHeader.tsx +++ b/src/components/views/rooms/RoomHeader.tsx @@ -17,9 +17,12 @@ limitations under the License. import React from 'react'; import classNames from 'classnames'; +import { throttle } from 'lodash'; +import { MatrixEvent, Room, RoomState } from 'matrix-js-sdk/src'; +import { CallType } from "matrix-js-sdk/src/webrtc/call"; + import { _t } from '../../../languageHandler'; import { MatrixClientPeg } from '../../../MatrixClientPeg'; - import SettingsStore from "../../../settings/SettingsStore"; import RoomHeaderButtons from '../right_panel/RoomHeaderButtons'; import E2EIcon from './E2EIcon'; @@ -28,12 +31,9 @@ import AccessibleTooltipButton from "../elements/AccessibleTooltipButton"; import RoomTopic from "../elements/RoomTopic"; import RoomName from "../elements/RoomName"; import { replaceableComponent } from "../../../utils/replaceableComponent"; -import { throttle } from 'lodash'; -import { MatrixEvent, Room, RoomState } from 'matrix-js-sdk/src'; import { E2EStatus } from '../../../utils/ShieldUtils'; import { IOOBData } from '../../../stores/ThreepidInviteStore'; import { SearchScope } from './SearchBar'; -import { CallType } from "matrix-js-sdk/src/webrtc/call"; import { ContextMenuTooltipButton } from '../../structures/ContextMenu'; import RoomContextMenu from "../context_menus/RoomContextMenu"; import { contextMenuBelow } from './RoomTile'; diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx index b420d0b40a..2aad0c5c44 100644 --- a/src/components/views/rooms/RoomSublist.tsx +++ b/src/components/views/rooms/RoomSublist.tsx @@ -23,6 +23,7 @@ import { Room } from "matrix-js-sdk/src/models/room"; import classNames from 'classnames'; import { Enable, Resizable } from "re-resizable"; import { Direction } from "re-resizable/lib/resizer"; +import { Dispatcher } from "flux"; import { RovingAccessibleButton, RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex"; import { _t } from "../../../languageHandler"; @@ -55,7 +56,6 @@ import ExtraTile from "./ExtraTile"; import { ListNotificationState } from "../../../stores/notifications/ListNotificationState"; import { getKeyBindingsManager, RoomListAction } from "../../../KeyBindingsManager"; import { replaceableComponent } from "../../../utils/replaceableComponent"; -import { Dispatcher } from "flux"; const SHOW_N_BUTTON_HEIGHT = 28; // As defined by CSS const RESIZE_HANDLE_HEIGHT = 4; // As defined by CSS diff --git a/src/components/views/settings/CrossSigningPanel.tsx b/src/components/views/settings/CrossSigningPanel.tsx index a01e3c4101..350a99f6d8 100644 --- a/src/components/views/settings/CrossSigningPanel.tsx +++ b/src/components/views/settings/CrossSigningPanel.tsx @@ -15,6 +15,8 @@ limitations under the License. */ import React from 'react'; +import { MatrixEvent } from 'matrix-js-sdk/src'; +import { logger } from "matrix-js-sdk/src/logger"; import { MatrixClientPeg } from '../../../MatrixClientPeg'; import { _t } from '../../../languageHandler'; @@ -23,11 +25,8 @@ import Spinner from '../elements/Spinner'; import InteractiveAuthDialog from '../dialogs/InteractiveAuthDialog'; import ConfirmDestroyCrossSigningDialog from '../dialogs/security/ConfirmDestroyCrossSigningDialog'; import { replaceableComponent } from "../../../utils/replaceableComponent"; -import { MatrixEvent } from 'matrix-js-sdk/src'; import SetupEncryptionDialog from '../dialogs/security/SetupEncryptionDialog'; import { accessSecretStorage } from '../../../SecurityManager'; - -import { logger } from "matrix-js-sdk/src/logger"; import AccessibleButton from "../elements/AccessibleButton"; interface IState { diff --git a/src/components/views/settings/DevicesPanel.tsx b/src/components/views/settings/DevicesPanel.tsx index 95fae13fa8..0b19d5605e 100644 --- a/src/components/views/settings/DevicesPanel.tsx +++ b/src/components/views/settings/DevicesPanel.tsx @@ -18,6 +18,7 @@ import React from 'react'; import classNames from 'classnames'; import { IMyDevice } from "matrix-js-sdk/src/client"; import { logger } from "matrix-js-sdk/src/logger"; +import { CrossSigningInfo } from "matrix-js-sdk/src/crypto/CrossSigning"; import { MatrixClientPeg } from '../../../MatrixClientPeg'; import { _t } from '../../../languageHandler'; @@ -28,7 +29,6 @@ import InteractiveAuthDialog from "../dialogs/InteractiveAuthDialog"; import DevicesPanelEntry from "./DevicesPanelEntry"; import Spinner from "../elements/Spinner"; import AccessibleButton from "../elements/AccessibleButton"; -import { CrossSigningInfo } from "matrix-js-sdk/src/crypto/CrossSigning"; interface IProps { className?: string; diff --git a/src/components/views/settings/ImageSizePanel.tsx b/src/components/views/settings/ImageSizePanel.tsx index bacdd6144d..de9d7d5954 100644 --- a/src/components/views/settings/ImageSizePanel.tsx +++ b/src/components/views/settings/ImageSizePanel.tsx @@ -15,6 +15,7 @@ limitations under the License. */ import React from "react"; + import SettingsStore from "../../../settings/SettingsStore"; import StyledRadioButton from "../elements/StyledRadioButton"; import { _t } from "../../../languageHandler"; diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx index 6f1d8301b0..cf732bc052 100644 --- a/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx @@ -15,6 +15,8 @@ limitations under the License. */ import React, { createRef } from 'react'; +import { logger } from "matrix-js-sdk/src/logger"; + import { _t } from "../../../../../languageHandler"; import { MatrixClientPeg } from "../../../../../MatrixClientPeg"; import AccessibleButton from "../../../elements/AccessibleButton"; @@ -22,8 +24,6 @@ import Notifier from "../../../../../Notifier"; import SettingsStore from '../../../../../settings/SettingsStore'; import { SettingLevel } from "../../../../../settings/SettingLevel"; import { replaceableComponent } from "../../../../../utils/replaceableComponent"; - -import { logger } from "matrix-js-sdk/src/logger"; import { RoomEchoChamber } from "../../../../../stores/local-echo/RoomEchoChamber"; import { EchoChamber } from '../../../../../stores/local-echo/EchoChamber'; import MatrixClientContext from "../../../../../contexts/MatrixClientContext"; diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx index 7a2b6f0d08..5bb510ce87 100644 --- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx @@ -15,20 +15,20 @@ limitations under the License. */ import React from 'react'; +import { EventType } from "matrix-js-sdk/src/@types/event"; +import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { MatrixEvent } from "matrix-js-sdk/src/models/event"; +import { RoomState } from "matrix-js-sdk/src/models/room-state"; +import { logger } from "matrix-js-sdk/src/logger"; + import { _t, _td } from "../../../../../languageHandler"; import { MatrixClientPeg } from "../../../../../MatrixClientPeg"; import AccessibleButton from "../../../elements/AccessibleButton"; import Modal from "../../../../../Modal"; import { replaceableComponent } from "../../../../../utils/replaceableComponent"; -import { EventType } from "matrix-js-sdk/src/@types/event"; -import { RoomMember } from "matrix-js-sdk/src/models/room-member"; -import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { RoomState } from "matrix-js-sdk/src/models/room-state"; import { compare } from "../../../../../utils/strings"; import ErrorDialog from '../../../dialogs/ErrorDialog'; import PowerSelector from "../../../elements/PowerSelector"; - -import { logger } from "matrix-js-sdk/src/logger"; import SettingsStore from "../../../../../settings/SettingsStore"; interface IEventShowOpts { diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx index 21977b36dc..f37e2f336f 100644 --- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx @@ -17,6 +17,8 @@ limitations under the License. import React from 'react'; import { sleep } from "matrix-js-sdk/src/utils"; +import { Room } from "matrix-js-sdk/src/models/room"; +import { logger } from "matrix-js-sdk/src/logger"; import { _t } from "../../../../../languageHandler"; import { MatrixClientPeg } from "../../../../../MatrixClientPeg"; @@ -32,7 +34,6 @@ import E2eAdvancedPanel, { isE2eAdvancedPanelPossible } from "../../E2eAdvancedP import CountlyAnalytics from "../../../../../CountlyAnalytics"; import { replaceableComponent } from "../../../../../utils/replaceableComponent"; import { ActionPayload } from "../../../../../dispatcher/payloads"; -import { Room } from "matrix-js-sdk/src/models/room"; import CryptographyPanel from "../../CryptographyPanel"; import DevicesPanel from "../../DevicesPanel"; import SettingsFlag from "../../../elements/SettingsFlag"; @@ -40,8 +41,6 @@ import CrossSigningPanel from "../../CrossSigningPanel"; import EventIndexPanel from "../../EventIndexPanel"; import InlineSpinner from "../../../elements/InlineSpinner"; import { PosthogAnalytics } from "../../../../../PosthogAnalytics"; - -import { logger } from "matrix-js-sdk/src/logger"; import { showDialog as showAnalyticsLearnMoreDialog } from "../../../dialogs/AnalyticsLearnMoreDialog"; interface IIgnoredUserProps { diff --git a/src/components/views/spaces/QuickSettingsButton.tsx b/src/components/views/spaces/QuickSettingsButton.tsx index 2b7595f9a5..4e99c1ab09 100644 --- a/src/components/views/spaces/QuickSettingsButton.tsx +++ b/src/components/views/spaces/QuickSettingsButton.tsx @@ -15,6 +15,7 @@ limitations under the License. */ import React, { useMemo } from "react"; +import classNames from "classnames"; import { _t } from "../../../languageHandler"; import AccessibleTooltipButton from "../elements/AccessibleTooltipButton"; @@ -34,7 +35,6 @@ import SettingsStore from "../../../settings/SettingsStore"; import { SettingLevel } from "../../../settings/SettingLevel"; import dis from "../../../dispatcher/dispatcher"; import { RecheckThemePayload } from "../../../dispatcher/payloads/RecheckThemePayload"; -import classNames from "classnames"; const QuickSettingsButton = ({ isPanelCollapsed = false }) => { const orderedThemes = useMemo(getOrderedThemes, []); diff --git a/src/components/views/verification/VerificationCancelled.tsx b/src/components/views/verification/VerificationCancelled.tsx index 01909efdfa..2a08dfaa68 100644 --- a/src/components/views/verification/VerificationCancelled.tsx +++ b/src/components/views/verification/VerificationCancelled.tsx @@ -15,6 +15,7 @@ limitations under the License. */ import React from 'react'; + import { _t } from '../../../languageHandler'; import { replaceableComponent } from "../../../utils/replaceableComponent"; import DialogButtons from "../elements/DialogButtons"; diff --git a/src/components/views/verification/VerificationComplete.tsx b/src/components/views/verification/VerificationComplete.tsx index 93d0aac341..88bdd70d22 100644 --- a/src/components/views/verification/VerificationComplete.tsx +++ b/src/components/views/verification/VerificationComplete.tsx @@ -15,6 +15,7 @@ limitations under the License. */ import React from 'react'; + import { _t } from '../../../languageHandler'; import { replaceableComponent } from "../../../utils/replaceableComponent"; import DialogButtons from "../elements/DialogButtons"; diff --git a/src/components/views/voip/CallPreview.tsx b/src/components/views/voip/CallPreview.tsx index 963edd469b..a14506d9fb 100644 --- a/src/components/views/voip/CallPreview.tsx +++ b/src/components/views/voip/CallPreview.tsx @@ -16,21 +16,20 @@ limitations under the License. */ import React from 'react'; +import { CallEvent, CallState, MatrixCall } from 'matrix-js-sdk/src/webrtc/call'; +import { EventSubscription } from 'fbemitter'; +import { logger } from "matrix-js-sdk/src/logger"; import CallView from "./CallView"; import RoomViewStore from '../../../stores/RoomViewStore'; import CallHandler, { CallHandlerEvent } from '../../../CallHandler'; import PersistentApp from "../elements/PersistentApp"; import SettingsStore from "../../../settings/SettingsStore"; -import { CallEvent, CallState, MatrixCall } from 'matrix-js-sdk/src/webrtc/call'; import { MatrixClientPeg } from '../../../MatrixClientPeg'; import { replaceableComponent } from "../../../utils/replaceableComponent"; -import { EventSubscription } from 'fbemitter'; import PictureInPictureDragger from './PictureInPictureDragger'; import dis from '../../../dispatcher/dispatcher'; import { Action } from "../../../dispatcher/actions"; - -import { logger } from "matrix-js-sdk/src/logger"; import { WidgetLayoutStore } from '../../../stores/widgets/WidgetLayoutStore'; const SHOW_CALL_IN_STATES = [ diff --git a/src/components/views/voip/CallView/CallViewHeader.tsx b/src/components/views/voip/CallView/CallViewHeader.tsx index 6b5829a48f..2596535aa6 100644 --- a/src/components/views/voip/CallView/CallViewHeader.tsx +++ b/src/components/views/voip/CallView/CallViewHeader.tsx @@ -17,11 +17,12 @@ limitations under the License. import { CallType } from 'matrix-js-sdk/src/webrtc/call'; import { Room } from 'matrix-js-sdk/src/models/room'; import React from 'react'; +import classNames from 'classnames'; + import { _t, _td } from '../../../../languageHandler'; import RoomAvatar from '../../avatars/RoomAvatar'; import dis from '../../../../dispatcher/dispatcher'; import { Action } from '../../../../dispatcher/actions'; -import classNames from 'classnames'; import AccessibleTooltipButton from '../../elements/AccessibleTooltipButton'; const callTypeTranslationByType: Record = { diff --git a/src/components/views/voip/CallViewForRoom.tsx b/src/components/views/voip/CallViewForRoom.tsx index 99b577f4ad..e02a85a9fb 100644 --- a/src/components/views/voip/CallViewForRoom.tsx +++ b/src/components/views/voip/CallViewForRoom.tsx @@ -16,9 +16,10 @@ limitations under the License. import { CallState, MatrixCall } from 'matrix-js-sdk/src/webrtc/call'; import React from 'react'; +import { Resizable } from "re-resizable"; + import CallHandler, { CallHandlerEvent } from '../../../CallHandler'; import CallView from './CallView'; -import { Resizable } from "re-resizable"; import ResizeNotifier from "../../../utils/ResizeNotifier"; import { replaceableComponent } from "../../../utils/replaceableComponent"; diff --git a/src/linkify-matrix.ts b/src/linkify-matrix.ts index 33402889e5..668b062f59 100644 --- a/src/linkify-matrix.ts +++ b/src/linkify-matrix.ts @@ -19,6 +19,7 @@ import * as linkifyjs from 'linkifyjs'; import linkifyElement from 'linkifyjs/element'; import linkifyString from 'linkifyjs/string'; import { RoomMember } from 'matrix-js-sdk/src/models/room-member'; + import { baseUrl } from "./utils/permalinks/SpecPermalinkConstructor"; import { parsePermalink, diff --git a/src/stores/CommunityPrototypeStore.ts b/src/stores/CommunityPrototypeStore.ts index 65f091b422..04f7eb29c4 100644 --- a/src/stores/CommunityPrototypeStore.ts +++ b/src/stores/CommunityPrototypeStore.ts @@ -14,22 +14,22 @@ See the License for the specific language governing permissions and limitations under the License. */ +import { Room } from "matrix-js-sdk/src/models/room"; +import * as utils from "matrix-js-sdk/src/utils"; +import { isNullOrUndefined } from "matrix-js-sdk/src/utils"; +import { logger } from "matrix-js-sdk/src/logger"; + import { AsyncStoreWithClient } from "./AsyncStoreWithClient"; import defaultDispatcher from "../dispatcher/dispatcher"; import { ActionPayload } from "../dispatcher/payloads"; import { Action } from "../dispatcher/actions"; -import { Room } from "matrix-js-sdk/src/models/room"; import { EffectiveMembership, getEffectiveMembership } from "../utils/membership"; import SettingsStore from "../settings/SettingsStore"; -import * as utils from "matrix-js-sdk/src/utils"; import { UPDATE_EVENT } from "./AsyncStore"; import FlairStore from "./FlairStore"; import GroupFilterOrderStore from "./GroupFilterOrderStore"; import GroupStore from "./GroupStore"; import dis from "../dispatcher/dispatcher"; -import { isNullOrUndefined } from "matrix-js-sdk/src/utils"; - -import { logger } from "matrix-js-sdk/src/logger"; interface IState { // nothing of value - we use account data diff --git a/src/stores/local-echo/RoomEchoChamber.ts b/src/stores/local-echo/RoomEchoChamber.ts index a9a0a60976..f1e1fd6a4d 100644 --- a/src/stores/local-echo/RoomEchoChamber.ts +++ b/src/stores/local-echo/RoomEchoChamber.ts @@ -14,12 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ +import { MatrixEvent } from "matrix-js-sdk/src/models/event"; +import { EventType } from "matrix-js-sdk/src/@types/event"; + import { GenericEchoChamber, implicitlyReverted, PROPERTY_UPDATED } from "./GenericEchoChamber"; import { getRoomNotifsState, RoomNotifState, setRoomNotifsState } from "../../RoomNotifs"; import { RoomEchoContext } from "./RoomEchoContext"; import { _t } from "../../languageHandler"; -import { MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { EventType } from "matrix-js-sdk/src/@types/event"; export enum CachedRoomKey { NotificationVolume, diff --git a/src/stores/notifications/NotificationState.ts b/src/stores/notifications/NotificationState.ts index 744eb81151..52ce0f7439 100644 --- a/src/stores/notifications/NotificationState.ts +++ b/src/stores/notifications/NotificationState.ts @@ -14,9 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ +import { TypedEventEmitter } from "matrix-js-sdk/src/models/typed-event-emitter"; + import { NotificationColor } from "./NotificationColor"; import { IDestroyable } from "../../utils/IDestroyable"; -import { TypedEventEmitter } from "matrix-js-sdk/src/models/typed-event-emitter"; export interface INotificationStateSnapshotParams { symbol: string | null; diff --git a/src/stores/notifications/ThreadNotificationState.ts b/src/stores/notifications/ThreadNotificationState.ts index 1ad988cedf..c8c74a07e7 100644 --- a/src/stores/notifications/ThreadNotificationState.ts +++ b/src/stores/notifications/ThreadNotificationState.ts @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. */ +import { MatrixEvent } from "matrix-js-sdk/src/models/event"; +import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread"; +import { Room } from "matrix-js-sdk/src/models/room"; + import { NotificationColor } from "./NotificationColor"; import { IDestroyable } from "../../utils/IDestroyable"; import { MatrixClientPeg } from "../../MatrixClientPeg"; -import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { NotificationState } from "./NotificationState"; -import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread"; -import { Room } from "matrix-js-sdk/src/models/room"; export class ThreadNotificationState extends NotificationState implements IDestroyable { protected _symbol = null; diff --git a/src/stores/notifications/ThreadsRoomNotificationState.ts b/src/stores/notifications/ThreadsRoomNotificationState.ts index 4caa405343..eef8ff3991 100644 --- a/src/stores/notifications/ThreadsRoomNotificationState.ts +++ b/src/stores/notifications/ThreadsRoomNotificationState.ts @@ -14,10 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { IDestroyable } from "../../utils/IDestroyable"; import { Room } from "matrix-js-sdk/src/models/room"; -import { NotificationState, NotificationStateEvents } from "./NotificationState"; import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread"; + +import { IDestroyable } from "../../utils/IDestroyable"; +import { NotificationState, NotificationStateEvents } from "./NotificationState"; import { ThreadNotificationState } from "./ThreadNotificationState"; import { NotificationColor } from "./NotificationColor"; diff --git a/src/stores/widgets/StopGapWidgetDriver.ts b/src/stores/widgets/StopGapWidgetDriver.ts index dca8d73318..83b7dfb827 100644 --- a/src/stores/widgets/StopGapWidgetDriver.ts +++ b/src/stores/widgets/StopGapWidgetDriver.ts @@ -29,6 +29,11 @@ import { WidgetEventCapability, WidgetKind, } from "matrix-widget-api"; +import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; +import { IContent, IEvent, MatrixEvent } from "matrix-js-sdk/src/models/event"; +import { Room } from "matrix-js-sdk/src/models/room"; +import { logger } from "matrix-js-sdk/src/logger"; + import { iterableDiff, iterableUnion } from "../../utils/iterables"; import { MatrixClientPeg } from "../../MatrixClientPeg"; import ActiveRoomObserver from "../../ActiveRoomObserver"; @@ -38,15 +43,10 @@ import WidgetCapabilitiesPromptDialog from "../../components/views/dialogs/Widge import { WidgetPermissionCustomisations } from "../../customisations/WidgetPermissions"; import { OIDCState, WidgetPermissionStore } from "./WidgetPermissionStore"; import { WidgetType } from "../../widgets/WidgetType"; -import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; import { CHAT_EFFECTS } from "../../effects"; import { containsEmoji } from "../../effects/utils"; import dis from "../../dispatcher/dispatcher"; import { tryTransformPermalinkToLocalHref } from "../../utils/permalinks/Permalinks"; -import { IContent, IEvent, MatrixEvent } from "matrix-js-sdk/src/models/event"; -import { Room } from "matrix-js-sdk/src/models/room"; - -import { logger } from "matrix-js-sdk/src/logger"; import SettingsStore from "../../settings/SettingsStore"; // TODO: Purge this from the universe diff --git a/src/utils/EventUtils.ts b/src/utils/EventUtils.ts index 7ad323ea1d..5d6486b0bf 100644 --- a/src/utils/EventUtils.ts +++ b/src/utils/EventUtils.ts @@ -15,15 +15,15 @@ limitations under the License. */ import { EventStatus, MatrixEvent } from 'matrix-js-sdk/src/models/event'; +import { EventType, MsgType, RelationType } from "matrix-js-sdk/src/@types/event"; +import { MatrixClient } from 'matrix-js-sdk/src/client'; +import { Thread } from 'matrix-js-sdk/src/models/thread'; +import { logger } from 'matrix-js-sdk/src/logger'; import { MatrixClientPeg } from '../MatrixClientPeg'; import shouldHideEvent from "../shouldHideEvent"; import { getHandlerTile, haveTileForEvent } from "../components/views/rooms/EventTile"; import SettingsStore from "../settings/SettingsStore"; -import { EventType, MsgType, RelationType } from "matrix-js-sdk/src/@types/event"; -import { MatrixClient } from 'matrix-js-sdk/src/client'; -import { Thread } from 'matrix-js-sdk/src/models/thread'; -import { logger } from 'matrix-js-sdk/src/logger'; import { POLL_START_EVENT_TYPE } from '../polls/consts'; /** diff --git a/src/utils/exportUtils/HtmlExport.tsx b/src/utils/exportUtils/HtmlExport.tsx index 7c8265fd32..8b147a0a92 100644 --- a/src/utils/exportUtils/HtmlExport.tsx +++ b/src/utils/exportUtils/HtmlExport.tsx @@ -16,29 +16,30 @@ limitations under the License. import React from "react"; import ReactDOM from "react-dom"; -import Exporter from "./Exporter"; -import { mediaFromMxc } from "../../customisations/Media"; import { Room } from "matrix-js-sdk/src/models/room"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { renderToStaticMarkup } from "react-dom/server"; +import { EventType, MsgType } from "matrix-js-sdk/src/@types/event"; +import { logger } from "matrix-js-sdk/src/logger"; + +import Exporter from "./Exporter"; +import { mediaFromMxc } from "../../customisations/Media"; import { Layout } from "../../settings/enums/Layout"; import { shouldFormContinuation } from "../../components/structures/MessagePanel"; import { formatFullDateNoDayNoTime, wantsDateSeparator } from "../../DateUtils"; import { RoomPermalinkCreator } from "../permalinks/Permalinks"; import { _t } from "../../languageHandler"; -import { EventType, MsgType } from "matrix-js-sdk/src/@types/event"; import * as Avatar from "../../Avatar"; import EventTile, { haveTileForEvent } from "../../components/views/rooms/EventTile"; import DateSeparator from "../../components/views/messages/DateSeparator"; import BaseAvatar from "../../components/views/avatars/BaseAvatar"; -import exportJS from "!!raw-loader!./exportJS"; import { ExportType } from "./exportUtils"; import { IExportOptions } from "./exportUtils"; import MatrixClientContext from "../../contexts/MatrixClientContext"; import getExportCSS from "./exportCSS"; import { textForEvent } from "../../TextForEvent"; -import { logger } from "matrix-js-sdk/src/logger"; +import exportJS from "!!raw-loader!./exportJS"; export default class HTMLExporter extends Exporter { protected avatars: Map; diff --git a/src/utils/membership.ts b/src/utils/membership.ts index 2b31737dde..d09624dc62 100644 --- a/src/utils/membership.ts +++ b/src/utils/membership.ts @@ -17,12 +17,12 @@ limitations under the License. import { Room } from "matrix-js-sdk/src/models/room"; import { sleep } from "matrix-js-sdk/src/utils"; import { EventStatus } from "matrix-js-sdk/src/models/event"; +import React from "react"; import { MatrixClientPeg } from "../MatrixClientPeg"; import { _t } from "../languageHandler"; import Modal, { IHandle } from "../Modal"; import ErrorDialog from "../components/views/dialogs/ErrorDialog"; -import React from "react"; import dis from "../dispatcher/dispatcher"; import RoomViewStore from "../stores/RoomViewStore"; import Spinner from "../components/views/elements/Spinner"; diff --git a/src/utils/permalinks/Permalinks.ts b/src/utils/permalinks/Permalinks.ts index 7627f30ed6..3a9200259f 100644 --- a/src/utils/permalinks/Permalinks.ts +++ b/src/utils/permalinks/Permalinks.ts @@ -20,14 +20,13 @@ import { Room } from "matrix-js-sdk/src/models/room"; import { EventType } from "matrix-js-sdk/src/@types/event"; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { RoomMember } from "matrix-js-sdk/src/models/room-member"; +import { logger } from "matrix-js-sdk/src/logger"; import { MatrixClientPeg } from "../../MatrixClientPeg"; import SpecPermalinkConstructor, { baseUrl as matrixtoBaseUrl } from "./SpecPermalinkConstructor"; import PermalinkConstructor, { PermalinkParts } from "./PermalinkConstructor"; import ElementPermalinkConstructor from "./ElementPermalinkConstructor"; import SdkConfig from "../../SdkConfig"; - -import { logger } from "matrix-js-sdk/src/logger"; import { ELEMENT_URL_PATTERN } from "../../linkify-matrix"; // The maximum number of servers to pick when working out which servers diff --git a/test/CallHandler-test.ts b/test/CallHandler-test.ts index 57f592cca8..6aaf8cbe1b 100644 --- a/test/CallHandler-test.ts +++ b/test/CallHandler-test.ts @@ -16,13 +16,14 @@ limitations under the License. import './skinned-sdk'; +import { CallEvent, CallState, CallType } from 'matrix-js-sdk/src/webrtc/call'; +import EventEmitter from 'events'; + import CallHandler, { CallHandlerEvent } from '../src/CallHandler'; import { stubClient, mkStubRoom } from './test-utils'; import { MatrixClientPeg } from '../src/MatrixClientPeg'; import dis from '../src/dispatcher/dispatcher'; -import { CallEvent, CallState, CallType } from 'matrix-js-sdk/src/webrtc/call'; import DMRoomMap from '../src/utils/DMRoomMap'; -import EventEmitter from 'events'; import SdkConfig from '../src/SdkConfig'; import { ActionPayload } from '../src/dispatcher/payloads'; import { Action } from "../src/dispatcher/actions"; diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js index 422d76456e..2f2a00cca1 100644 --- a/test/components/structures/auth/Registration-test.js +++ b/test/components/structures/auth/Registration-test.js @@ -14,13 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -import sdk from '../../../skinned-sdk'; - import React from 'react'; import ReactDOM from 'react-dom'; import ReactTestUtils from 'react-dom/test-utils'; import { createClient } from 'matrix-js-sdk/src/matrix'; +import sdk from '../../../skinned-sdk'; import SdkConfig from '../../../../src/SdkConfig'; import { createTestClient, mkServerConfig } from "../../../test-utils"; diff --git a/test/components/views/elements/PollCreateDialog-test.tsx b/test/components/views/elements/PollCreateDialog-test.tsx index ba530b6f9d..38233a7e31 100644 --- a/test/components/views/elements/PollCreateDialog-test.tsx +++ b/test/components/views/elements/PollCreateDialog-test.tsx @@ -18,9 +18,10 @@ limitations under the License. import '../../../skinned-sdk'; import React from "react"; import { mount, ReactWrapper } from "enzyme"; +import { Room } from "matrix-js-sdk/src/models/room"; + import * as TestUtils from "../../../test-utils"; import { MatrixClientPeg } from "../../../../src/MatrixClientPeg"; -import { Room } from "matrix-js-sdk/src/models/room"; import _PollCreateDialog from "../../../../src/components/views/elements/PollCreateDialog"; const PollCreateDialog = TestUtils.wrapInMatrixClientContext(_PollCreateDialog); diff --git a/test/components/views/messages/MPollBody-test.tsx b/test/components/views/messages/MPollBody-test.tsx index 4a5d80a905..d57137c566 100644 --- a/test/components/views/messages/MPollBody-test.tsx +++ b/test/components/views/messages/MPollBody-test.tsx @@ -16,13 +16,12 @@ limitations under the License. import React from "react"; import { mount, ReactWrapper } from "enzyme"; - -import sdk from "../../../skinned-sdk"; -import * as TestUtils from "../../../test-utils"; - import { Callback, IContent, MatrixClient, MatrixEvent, Room } from "matrix-js-sdk"; import { ISendEventResponse } from "matrix-js-sdk/src/@types/requests"; import { Relations } from "matrix-js-sdk/src/models/relations"; + +import * as TestUtils from "../../../test-utils"; +import sdk from "../../../skinned-sdk"; import { IPollAnswer, IPollContent, diff --git a/test/end-to-end-tests/src/rest/creator.ts b/test/end-to-end-tests/src/rest/creator.ts index 9b68face62..b88501e48d 100644 --- a/test/end-to-end-tests/src/rest/creator.ts +++ b/test/end-to-end-tests/src/rest/creator.ts @@ -17,6 +17,7 @@ limitations under the License. import { exec } from 'child_process'; import request = require('request-promise-native'); + import { RestSession } from './session'; import { RestMultiSession } from './multi'; diff --git a/test/end-to-end-tests/src/rest/room.ts b/test/end-to-end-tests/src/rest/room.ts index 95a349e39f..da5f91a607 100644 --- a/test/end-to-end-tests/src/rest/room.ts +++ b/test/end-to-end-tests/src/rest/room.ts @@ -16,6 +16,7 @@ limitations under the License. */ import uuidv4 = require('uuid/v4'); + import { RestSession } from "./session"; import { Logger } from "../logger"; diff --git a/test/end-to-end-tests/src/rest/session.ts b/test/end-to-end-tests/src/rest/session.ts index 5b5dd387ef..ef9268aecf 100644 --- a/test/end-to-end-tests/src/rest/session.ts +++ b/test/end-to-end-tests/src/rest/session.ts @@ -15,6 +15,7 @@ limitations under the License. */ import request = require('request-promise-native'); + import { Logger } from '../logger'; import { RestRoom } from './room'; import { approveConsent } from './consent'; diff --git a/test/end-to-end-tests/src/scenarios/e2e-encryption.ts b/test/end-to-end-tests/src/scenarios/e2e-encryption.ts index 9d77ecc59d..17aa4bcc2f 100644 --- a/test/end-to-end-tests/src/scenarios/e2e-encryption.ts +++ b/test/end-to-end-tests/src/scenarios/e2e-encryption.ts @@ -15,8 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { ElementSession } from "../session"; +import { strict as assert } from 'assert'; +import { ElementSession } from "../session"; import { sendMessage } from '../usecases/send-message'; import { acceptInvite } from '../usecases/accept-invite'; import { receiveMessage } from '../usecases/timeline'; @@ -24,7 +25,6 @@ import { createDm } from '../usecases/create-room'; import { checkRoomSettings } from '../usecases/room-settings'; import { startSasVerification, acceptSasVerification } from '../usecases/verify'; import { setupSecureBackup } from '../usecases/security'; -import { strict as assert } from 'assert'; import { measureStart, measureStop } from '../util'; export async function e2eEncryptionScenarios(alice: ElementSession, bob: ElementSession) { diff --git a/test/end-to-end-tests/src/scenarios/lazy-loading.ts b/test/end-to-end-tests/src/scenarios/lazy-loading.ts index e0bae4d77f..3cbfdafdab 100644 --- a/test/end-to-end-tests/src/scenarios/lazy-loading.ts +++ b/test/end-to-end-tests/src/scenarios/lazy-loading.ts @@ -15,6 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +import { strict as assert } from 'assert'; + import { delay } from '../util'; import { join } from '../usecases/join'; import { sendMessage } from '../usecases/send-message'; @@ -25,7 +27,6 @@ import { import { createRoom } from '../usecases/create-room'; import { getMembersInMemberlist } from '../usecases/memberlist'; import { changeRoomSettings } from '../usecases/room-settings'; -import { strict as assert } from 'assert'; import { RestMultiSession } from "../rest/multi"; import { ElementSession } from "../session"; diff --git a/test/end-to-end-tests/src/scenarios/spaces.ts b/test/end-to-end-tests/src/scenarios/spaces.ts index ed8358d088..909d58afe2 100644 --- a/test/end-to-end-tests/src/scenarios/spaces.ts +++ b/test/end-to-end-tests/src/scenarios/spaces.ts @@ -1,5 +1,3 @@ -import { ElementSession } from "../session"; - /* Copyright 2021 The Matrix.org Foundation C.I.C. @@ -17,6 +15,7 @@ limitations under the License. */ import { createSpace, inviteSpace } from "../usecases/create-space"; +import { ElementSession } from "../session"; export async function spacesScenarios(alice: ElementSession, bob: ElementSession): Promise { console.log(" creating a space for spaces scenarios:"); diff --git a/test/end-to-end-tests/src/session.ts b/test/end-to-end-tests/src/session.ts index 80a85f6d5f..84f9b66e56 100644 --- a/test/end-to-end-tests/src/session.ts +++ b/test/end-to-end-tests/src/session.ts @@ -16,6 +16,7 @@ limitations under the License. */ import * as puppeteer from 'puppeteer'; + import { Logger } from './logger'; import { LogBuffer } from './logbuffer'; import { delay } from './util'; diff --git a/test/end-to-end-tests/src/usecases/create-room.ts b/test/end-to-end-tests/src/usecases/create-room.ts index b3e2cecf21..8736e785ba 100644 --- a/test/end-to-end-tests/src/usecases/create-room.ts +++ b/test/end-to-end-tests/src/usecases/create-room.ts @@ -15,9 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. */ +import * as puppeteer from "puppeteer"; + import { measureStart, measureStop } from '../util'; import { ElementSession } from "../session"; -import * as puppeteer from "puppeteer"; export async function openRoomDirectory(session: ElementSession): Promise { const roomDirectoryButton = await session.query('.mx_LeftPanel_exploreButton'); diff --git a/test/end-to-end-tests/src/usecases/dialog.ts b/test/end-to-end-tests/src/usecases/dialog.ts index e88617bdf5..aee6620ff9 100644 --- a/test/end-to-end-tests/src/usecases/dialog.ts +++ b/test/end-to-end-tests/src/usecases/dialog.ts @@ -16,6 +16,7 @@ limitations under the License. */ import { strict as assert } from 'assert'; + import { ElementSession } from "../session"; export async function assertDialog(session: ElementSession, expectedTitle: string): Promise { diff --git a/test/end-to-end-tests/src/usecases/memberlist.ts b/test/end-to-end-tests/src/usecases/memberlist.ts index 6ac8ea2c6a..2aa61313a3 100644 --- a/test/end-to-end-tests/src/usecases/memberlist.ts +++ b/test/end-to-end-tests/src/usecases/memberlist.ts @@ -16,9 +16,10 @@ limitations under the License. */ import { strict as assert } from 'assert'; +import { ElementHandle } from "puppeteer"; + import { openRoomSummaryCard } from "./rightpanel"; import { ElementSession } from "../session"; -import { ElementHandle } from "puppeteer"; export async function openMemberInfo(session: ElementSession, name: String): Promise { const membersAndNames = await getMembersInMemberlist(session); diff --git a/test/end-to-end-tests/src/usecases/room-settings.ts b/test/end-to-end-tests/src/usecases/room-settings.ts index 8e70627a87..e036c78e1a 100644 --- a/test/end-to-end-tests/src/usecases/room-settings.ts +++ b/test/end-to-end-tests/src/usecases/room-settings.ts @@ -16,10 +16,11 @@ limitations under the License. */ import { strict as assert } from 'assert'; +import { ElementHandle } from "puppeteer"; + import { openRoomSummaryCard } from "./rightpanel"; import { acceptDialog } from './dialog'; import { ElementSession } from "../session"; -import { ElementHandle } from "puppeteer"; export async function setSettingsToggle(session: ElementSession, toggle: ElementHandle, enabled): Promise { const className = await session.getElementProperty(toggle, "className"); diff --git a/test/end-to-end-tests/src/usecases/send-message.ts b/test/end-to-end-tests/src/usecases/send-message.ts index ab1dc96d71..cbbc836a3b 100644 --- a/test/end-to-end-tests/src/usecases/send-message.ts +++ b/test/end-to-end-tests/src/usecases/send-message.ts @@ -15,6 +15,7 @@ limitations under the License. */ import { strict as assert } from 'assert'; + import { ElementSession } from "../session"; export async function sendMessage(session: ElementSession, message: string): Promise { diff --git a/test/end-to-end-tests/src/usecases/settings.ts b/test/end-to-end-tests/src/usecases/settings.ts index a8e2bfee45..f0a3fdc35d 100644 --- a/test/end-to-end-tests/src/usecases/settings.ts +++ b/test/end-to-end-tests/src/usecases/settings.ts @@ -16,6 +16,7 @@ limitations under the License. */ import { strict as assert } from 'assert'; + import { ElementSession } from "../session"; export async function openSettings(session: ElementSession, section: string): Promise { diff --git a/test/end-to-end-tests/src/usecases/signup.ts b/test/end-to-end-tests/src/usecases/signup.ts index 24282fc60e..55301c3108 100644 --- a/test/end-to-end-tests/src/usecases/signup.ts +++ b/test/end-to-end-tests/src/usecases/signup.ts @@ -16,6 +16,7 @@ limitations under the License. */ import { strict as assert } from 'assert'; + import { ElementSession } from "../session"; export async function signup(session: ElementSession, username: string, password: string, diff --git a/test/end-to-end-tests/src/usecases/timeline.ts b/test/end-to-end-tests/src/usecases/timeline.ts index 7906eb3c88..e0b3710b42 100644 --- a/test/end-to-end-tests/src/usecases/timeline.ts +++ b/test/end-to-end-tests/src/usecases/timeline.ts @@ -16,9 +16,10 @@ limitations under the License. */ import { strict as assert } from 'assert'; -import { ElementSession } from "../session"; import { ElementHandle } from "puppeteer"; +import { ElementSession } from "../session"; + export async function scrollToTimelineTop(session: ElementSession): Promise { session.log.step(`scrolls to the top of the timeline`); await session.page.evaluate(() => { diff --git a/test/end-to-end-tests/src/usecases/toasts.ts b/test/end-to-end-tests/src/usecases/toasts.ts index c90f9ef16c..6923471c98 100644 --- a/test/end-to-end-tests/src/usecases/toasts.ts +++ b/test/end-to-end-tests/src/usecases/toasts.ts @@ -15,6 +15,7 @@ limitations under the License. */ import { strict as assert } from 'assert'; + import { ElementSession } from "../session"; export async function assertNoToasts(session: ElementSession): Promise { diff --git a/test/end-to-end-tests/src/usecases/verify.ts b/test/end-to-end-tests/src/usecases/verify.ts index b0a2e0588d..84cd342e6e 100644 --- a/test/end-to-end-tests/src/usecases/verify.ts +++ b/test/end-to-end-tests/src/usecases/verify.ts @@ -16,6 +16,7 @@ limitations under the License. */ import { strict as assert } from 'assert'; + import { openMemberInfo } from "./memberlist"; import { ElementSession } from "../session"; diff --git a/test/end-to-end-tests/start.ts b/test/end-to-end-tests/start.ts index 77013939e6..5e6b9b6066 100644 --- a/test/end-to-end-tests/start.ts +++ b/test/end-to-end-tests/start.ts @@ -14,12 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ +import * as fs from "fs"; +import program = require('commander'); + import { ElementSession } from './src/session'; import { scenario } from './src/scenario'; import { RestSessionCreator } from './src/rest/creator'; -import * as fs from "fs"; -import program = require('commander'); program .option('--no-logs', "don't output logs, document html on error", false) .option('--app-url [url]', "url to test", "http://localhost:5000") diff --git a/test/stores/RoomViewStore-test.js b/test/stores/RoomViewStore-test.js index a00ac39e87..684d757c6d 100644 --- a/test/stores/RoomViewStore-test.js +++ b/test/stores/RoomViewStore-test.js @@ -1,8 +1,6 @@ import RoomViewStore from '../../src/stores/RoomViewStore'; import { Action } from '../../src/dispatcher/actions'; - import { MatrixClientPeg as peg } from '../../src/MatrixClientPeg'; - import * as testUtils from '../test-utils'; const dispatch = testUtils.getDispatchForStore(RoomViewStore); diff --git a/test/stores/WidgetLayoutStore-test.ts b/test/stores/WidgetLayoutStore-test.ts index 61399862ab..038a489f72 100644 --- a/test/stores/WidgetLayoutStore-test.ts +++ b/test/stores/WidgetLayoutStore-test.ts @@ -15,9 +15,10 @@ limitations under the License. */ import "../skinned-sdk"; // Must be first for skinning to work +import { Room } from "matrix-js-sdk"; + import WidgetStore, { IApp } from "../../src/stores/WidgetStore"; import { Container, WidgetLayoutStore } from "../../src/stores/widgets/WidgetLayoutStore"; -import { Room } from "matrix-js-sdk"; import { stubClient } from "../test-utils"; // setup test env values