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

Switch to importing @types/{event,partials} from main js-sdk export (#11369)

Browse source
This commit is contained in:
Michael Telatynski 2023-08-08 11:12:12 +01:00 • committed by GitHub
parent 368b6b9355
commit 033c600fa2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
125 changed files with 217 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/utils/DMRoomMap.ts
View file

@ -15,10 +15,9 @@ limitations under the License.
*/
import { uniq } from "lodash";
import { Room, MatrixEvent } from "matrix-js-sdk/src/matrix";
import { Room, MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client";
import { logger } from "matrix-js-sdk/src/logger";
import { EventType } from "matrix-js-sdk/src/@types/event";
import { Optional } from "matrix-events-sdk";
import { filterValidMDirect } from "./dm/filterValidMDirect";

3
src/utils/EventRenderingUtils.ts
View file

@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { MatrixEvent, IContent, MatrixClient } from "matrix-js-sdk/src/matrix";
import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
import { MatrixEvent, IContent, MatrixClient, EventType, MsgType } from "matrix-js-sdk/src/matrix";
import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls";
import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";

10
src/utils/EventUtils.ts
View file

@ -14,8 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { EventStatus, MatrixEvent } from "matrix-js-sdk/src/matrix";
import { EventType, EVENT_VISIBILITY_CHANGE_TYPE, MsgType, RelationType } from "matrix-js-sdk/src/@types/event";
import {
EventStatus,
MatrixEvent,
EventType,
EVENT_VISIBILITY_CHANGE_TYPE,
MsgType,
RelationType,
} from "matrix-js-sdk/src/matrix";
import { MatrixClient } from "matrix-js-sdk/src/client";
import { logger } from "matrix-js-sdk/src/logger";
import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls";

3
src/utils/MediaEventHelper.ts
View file

@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { MatrixEvent } from "matrix-js-sdk/src/matrix";
import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
import { MatrixEvent, EventType, MsgType } from "matrix-js-sdk/src/matrix";
import { logger } from "matrix-js-sdk/src/logger";
import { LazyValue } from "./LazyValue";

3
src/utils/MultiInviter.ts
View file

@ -18,8 +18,7 @@ import { MatrixError } from "matrix-js-sdk/src/http-api";
import { defer, IDeferred } from "matrix-js-sdk/src/utils";
import { logger } from "matrix-js-sdk/src/logger";
import { MatrixClient } from "matrix-js-sdk/src/client";
import { EventType } from "matrix-js-sdk/src/@types/event";
import { HistoryVisibility } from "matrix-js-sdk/src/@types/partials";
import { EventType, HistoryVisibility } from "matrix-js-sdk/src/matrix";
import { AddressType, getAddressType } from "../UserAddress";
import { _t } from "../languageHandler";

3
src/utils/PinningUtils.ts
View file

@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { MatrixEvent } from "matrix-js-sdk/src/matrix";
import { EventType } from "matrix-js-sdk/src/@types/event";
import { MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
import { M_POLL_START } from "matrix-js-sdk/src/@types/polls";
export default class PinningUtils {

3
src/utils/Reply.ts
View file

@ -15,11 +15,10 @@
* limitations under the License.
*/
import { IContent, IEventRelation, MatrixEvent } from "matrix-js-sdk/src/matrix";
import { IContent, IEventRelation, MatrixEvent, MsgType } from "matrix-js-sdk/src/matrix";
import sanitizeHtml from "sanitize-html";
import escapeHtml from "escape-html";
import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
import { MsgType } from "matrix-js-sdk/src/@types/event";
import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls";
import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";

3
src/utils/RoomUpgrade.ts
View file

@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { Room } from "matrix-js-sdk/src/matrix";
import { EventType } from "matrix-js-sdk/src/@types/event";
import { Room, EventType } from "matrix-js-sdk/src/matrix";
import { logger } from "matrix-js-sdk/src/logger";
import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client";

3
src/utils/exportUtils/HtmlExport.tsx
View file

@ -16,9 +16,8 @@ limitations under the License.
import React from "react";
import ReactDOM from "react-dom";
import { Room, MatrixEvent } from "matrix-js-sdk/src/matrix";
import { Room, MatrixEvent, EventType, MsgType } from "matrix-js-sdk/src/matrix";
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 escapeHtml from "escape-html";

3
src/utils/exportUtils/JSONExport.ts
View file

@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { Room, IEvent, MatrixEvent } from "matrix-js-sdk/src/matrix";
import { EventType } from "matrix-js-sdk/src/@types/event";
import { Room, IEvent, MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
import { logger } from "matrix-js-sdk/src/logger";
import Exporter from "./Exporter";

3
src/utils/notifications.ts
View file

@ -15,10 +15,9 @@ limitations under the License.
*/
import { MatrixClient } from "matrix-js-sdk/src/client";
import { LOCAL_NOTIFICATION_SETTINGS_PREFIX } from "matrix-js-sdk/src/@types/event";
import { LOCAL_NOTIFICATION_SETTINGS_PREFIX, NotificationCountType, Room } from "matrix-js-sdk/src/matrix";
import { LocalNotificationSettings } from "matrix-js-sdk/src/@types/local_notifications";
import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
import { NotificationCountType, Room } from "matrix-js-sdk/src/matrix";
import SettingsStore from "../settings/SettingsStore";

3
src/utils/permalinks/Permalinks.ts
View file

@ -16,9 +16,8 @@ limitations under the License.
import isIp from "is-ip";
import * as utils from "matrix-js-sdk/src/utils";
import { Room, MatrixClient, RoomStateEvent } from "matrix-js-sdk/src/matrix";
import { Room, MatrixClient, RoomStateEvent, EventType } from "matrix-js-sdk/src/matrix";
import { logger } from "matrix-js-sdk/src/logger";
import { EventType } from "matrix-js-sdk/src/@types/event";
import MatrixToPermalinkConstructor, {
baseUrl as matrixtoBaseUrl,

4
src/utils/space.tsx
View file

@ -15,9 +15,7 @@ limitations under the License.
*/
import React from "react";
import { Room, ICreateRoomStateEvent } from "matrix-js-sdk/src/matrix";
import { RoomType, EventType } from "matrix-js-sdk/src/@types/event";
import { JoinRule } from "matrix-js-sdk/src/@types/partials";
import { Room, ICreateRoomStateEvent, RoomType, EventType, JoinRule } from "matrix-js-sdk/src/matrix";
import { calculateRoomVia } from "./permalinks/Permalinks";
import Modal from "../Modal";