Switch to importing most things from the main matrix-js-sdk export (#11406)

* Switch to importing most things from the main matrix-js-sdk export

* fix imports

* Iterate

* Fix tests

src/stores/OwnBeaconStore.ts

@@ -24,8 +24,8 @@ import {
     RoomMember,
     RoomState,
     RoomStateEvent,
+    ContentHelpers,
 } from "matrix-js-sdk/src/matrix";
-import { BeaconInfoState, makeBeaconContent, makeBeaconInfoContent } from "matrix-js-sdk/src/content-helpers";
 import { MBeaconInfoEventContent, M_BEACON } from "matrix-js-sdk/src/@types/beacon";
 import { logger } from "matrix-js-sdk/src/logger";
 
@@ -549,13 +549,16 @@ export class OwnBeaconStore extends AsyncStoreWithClient<OwnBeaconStoreState> {
      * Records error in beaconUpdateErrors
      * rethrows
      */
-    private updateBeaconEvent = async (beacon: Beacon, update: Partial<BeaconInfoState>): Promise<void> => {
+    private updateBeaconEvent = async (
+        beacon: Beacon,
+        update: Partial<ContentHelpers.BeaconInfoState>,
+    ): Promise<void> => {
         const { description, timeout, timestamp, live, assetType } = {
             ...beacon.beaconInfo,
             ...update,
         };
 
-        const updateContent = makeBeaconInfoContent(timeout, live, description, assetType, timestamp);
+        const updateContent = ContentHelpers.makeBeaconInfoContent(timeout, live, description, assetType, timestamp);
 
         try {
             await this.matrixClient!.unstable_setLiveBeacon(beacon.roomId, updateContent);
@@ -593,7 +596,7 @@ export class OwnBeaconStore extends AsyncStoreWithClient<OwnBeaconStoreState> {
      * Sends m.location event to referencing given beacon
      */
     private sendLocationToBeacon = async (beacon: Beacon, { geoUri, timestamp }: TimedGeoUri): Promise<void> => {
-        const content = makeBeaconContent(geoUri, timestamp, beacon.beaconInfoId);
+        const content = ContentHelpers.makeBeaconContent(geoUri, timestamp, beacon.beaconInfoId);
         try {
             await this.matrixClient!.sendEvent(beacon.roomId, M_BEACON.name, content);
             this.incrementBeaconLocationPublishErrorCount(beacon.identifier, false);

src/stores/spaces/SpaceStore.ts

@@ -24,9 +24,9 @@ import {
     RoomStateEvent,
     MatrixEvent,
     ClientEvent,
+    ISendEventResponse,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { ISendEventResponse } from "matrix-js-sdk/src/@types/requests";
 
 import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
 import defaultDispatcher from "../../dispatcher/dispatcher";

src/stores/spaces/index.ts

@@ -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 { IHierarchyRoom } from "matrix-js-sdk/src/@types/spaces";
+import { Room, HierarchyRoom } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../languageHandler";
 
@@ -50,7 +49,7 @@ export const getMetaSpaceName = (spaceKey: MetaSpace, allRoomsInHome = false): s
 
 export type SpaceKey = MetaSpace | Room["roomId"];
 
-export interface ISuggestedRoom extends IHierarchyRoom {
+export interface ISuggestedRoom extends HierarchyRoom {
     viaServers: string[];
 }