Implement better fallbacks

src/components/Avatar.tsx

@@ -18,7 +18,7 @@ import React, { useEffect, useState } from "react";
 import classNames from "classnames";
 import { Room, User } from "matrix-cypher";
 
-import { convertMXCtoMediaQuery } from "../utils/cypher-wrapper";
+import { getMediaQueryFromMCX } from "../utils/cypher-wrapper";
 import logo from "../imgs/matrix-logo.svg";
 
 import "./Avatar.scss";
@@ -55,15 +55,7 @@ export const UserAvatar: React.FC<IPropsUserAvatar> = ({
     userId,
 }: IPropsUserAvatar) => (
     <Avatar
-        avatarUrl={
-            user.avatar_url
-                ? convertMXCtoMediaQuery(
-                      // TODO: replace with correct client
-                      "https://matrix.org",
-                      user.avatar_url
-                  )
-                : ""
-        }
+        avatarUrl={getMediaQueryFromMCX(user.avatar_url)}
         label={user.displayname ? user.displayname : userId}
     />
 );
@@ -76,15 +68,7 @@ export const RoomAvatar: React.FC<IPropsRoomAvatar> = ({
     room,
 }: IPropsRoomAvatar) => (
     <Avatar
-        avatarUrl={
-            room.avatar_url
-                ? convertMXCtoMediaQuery(
-                      // TODO: replace with correct client
-                      "https://matrix.org",
-                      room.avatar_url
-                  )
-                : ""
-        }
+        avatarUrl={getMediaQueryFromMCX(room.avatar_url)}
         label={room.name || room.room_id}
     />
 );

src/components/LinkPreview.tsx

@@ -15,46 +15,36 @@ limitations under the License.
 */
 
 import React, { useState, useEffect } from "react";
-import { Client, getEvent, client } from "matrix-cypher";
+import { getEvent, client } from "matrix-cypher";
 
-import {
-    getRoomIdFromAlias,
-    searchPublicRooms,
-    getUserDetails,
-} from "../utils/cypher-wrapper";
 import { RoomPreviewWithTopic } from "./RoomPreview";
 import InviteTile from "./InviteTile";
-
-import { SafeLink } from "../parser/types";
-import { LinkKind } from "../parser/types";
+import { SafeLink, LinkKind } from "../parser/types";
 import UserPreview from "./UserPreview";
 import EventPreview from "./EventPreview";
 import Clients from "../clients";
+import {
+    getRoomFromId,
+    getRoomFromAlias,
+    getRoomFromPermalink,
+    getUser,
+} from "../utils/cypher-wrapper";
 
 interface IProps {
     link: SafeLink;
 }
 
-// TODO: replace with client fetch
-const defaultClient: () => Promise<Client> = () => client("https://matrix.org");
-
 const LOADING: JSX.Element = <>Generating invite</>;
 
 const invite = async ({ link }: { link: SafeLink }): Promise<JSX.Element> => {
+    // TODO: replace with client fetch
+    const defaultClient = await client("https://matrix.org");
     switch (link.kind) {
         case LinkKind.Alias:
             return (
                 <RoomPreviewWithTopic
                     room={
-                        await searchPublicRooms(
-                            await defaultClient(),
-                            (
-                                await getRoomIdFromAlias(
-                                    await defaultClient(),
-                                    link.identifier
-                                )
-                            ).room_id
-                        )
+                        await getRoomFromAlias(defaultClient, link.identifier)
                     }
                 />
             );
@@ -62,24 +52,14 @@ const invite = async ({ link }: { link: SafeLink }): Promise<JSX.Element> => {
         case LinkKind.RoomId:
             return (
                 <RoomPreviewWithTopic
-                    room={
-                        await searchPublicRooms(
-                            await defaultClient(),
-                            link.identifier
-                        )
-                    }
+                    room={await getRoomFromId(defaultClient, link.identifier)}
                 />
             );
 
         case LinkKind.UserId:
             return (
                 <UserPreview
-                    user={
-                        await getUserDetails(
-                            await defaultClient(),
-                            link.identifier
-                        )
-                    }
+                    user={await getUser(defaultClient, link.identifier)}
                     userId={link.identifier}
                 />
             );
@@ -87,15 +67,10 @@ const invite = async ({ link }: { link: SafeLink }): Promise<JSX.Element> => {
         case LinkKind.Permalink:
             return (
                 <EventPreview
-                    room={
-                        await searchPublicRooms(
-                            await defaultClient(),
-                            link.identifier
-                        )
-                    }
+                    room={await getRoomFromPermalink(defaultClient, link)}
                     event={
                         await getEvent(
-                            await defaultClient(),
+                            defaultClient,
                             link.roomLink,
                             link.eventId
                         )