imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to importing more things from the main js-sdk export (#11376)

Browse source
This commit is contained in:
Michael Telatynski 2023-08-09 16:10:54 +01:00 • committed by GitHub
parent e6c127915f
commit a1328d8ef7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
49 changed files with 100 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/utils/DecryptFile.ts
View file

@ -16,7 +16,7 @@ limitations under the License.
// Pull in the encryption lib so that we can decrypt attachments.
import encrypt from "matrix-encrypt-attachment";
import { parseErrorResponse } from "matrix-js-sdk/src/http-api";
import { parseErrorResponse } from "matrix-js-sdk/src/matrix";
import { mediaFromContent } from "../customisations/Media";
import { EncryptedFile, IMediaEventInfo } from "../customisations/models/IMediaEventContent";

2
src/utils/ErrorUtils.tsx
View file

@ -15,7 +15,7 @@ limitations under the License.
*/
import React, { ReactNode } from "react";
import { MatrixError, ConnectionError } from "matrix-js-sdk/src/http-api";
import { MatrixError, ConnectionError } from "matrix-js-sdk/src/matrix";
import { _t, _td, Tags, TranslatedString } from "../languageHandler";
import SdkConfig from "../SdkConfig";

3
src/utils/IdentityServerUtils.ts
View file

@ -16,8 +16,7 @@ limitations under the License.
import { SERVICE_TYPES } from "matrix-js-sdk/src/service-types";
import { logger } from "matrix-js-sdk/src/logger";
import { HTTPError } from "matrix-js-sdk/src/http-api";
import { MatrixClient } from "matrix-js-sdk/src/matrix";
import { HTTPError, MatrixClient } from "matrix-js-sdk/src/matrix";
import SdkConfig from "../SdkConfig";
import { Policies } from "../Terms";

3
src/utils/MultiInviter.ts
View file

@ -14,10 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { MatrixError } from "matrix-js-sdk/src/http-api";
import { MatrixError, MatrixClient, EventType, HistoryVisibility } from "matrix-js-sdk/src/matrix";
import { defer, IDeferred } from "matrix-js-sdk/src/utils";
import { logger } from "matrix-js-sdk/src/logger";
import { MatrixClient, EventType, HistoryVisibility } from "matrix-js-sdk/src/matrix";
import { AddressType, getAddressType } from "../UserAddress";
import { _t } from "../languageHandler";

3
src/utils/pushRules/monitorSyncedPushRules.ts
View file

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { MatrixClient, MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
import { MatrixClient, MatrixEvent, EventType, RuleId, IAnnotatedPushRule } from "matrix-js-sdk/src/matrix";
import { PushProcessor } from "matrix-js-sdk/src/pushprocessor";
import { RuleId, IAnnotatedPushRule } from "matrix-js-sdk/src/@types/PushRules";
import { logger } from "matrix-js-sdk/src/logger";
import { VectorPushRulesDefinitions, VectorPushRuleDefinition } from "../../notifications";