From 81771f511cdb5dce717bad61b3d54f25008a932e Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Thu, 13 Oct 2022 21:25:15 -0400
Subject: [PATCH] Fix types

---
 src/ClientContext.tsx                  | 4 ++--
 src/auth/useInteractiveLogin.ts        | 2 +-
 src/auth/useInteractiveRegistration.ts | 2 +-
 src/profile/useProfile.ts              | 4 +++-
 src/room/usePageUnload.ts              | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/ClientContext.tsx b/src/ClientContext.tsx
index 3e9e6ba..c7095b7 100644
--- a/src/ClientContext.tsx
+++ b/src/ClientContext.tsx
@@ -148,7 +148,7 @@ export const ClientProvider: FC<Props> = ({ children }) => {
                   },
                   false // Don't need the crypto store just to log out
                 );
-                await client.logout(undefined, true);
+                await client.logout(true);
               } catch (err_) {
                 logger.warn(
                   "The previous session was lost, and we couldn't log it out, " +
@@ -255,7 +255,7 @@ export const ClientProvider: FC<Props> = ({ children }) => {
   );
 
   const logout = useCallback(async () => {
-    await client.logout(undefined, true);
+    await client.logout(true);
     await client.clearStores();
     clearSession();
     setState({
diff --git a/src/auth/useInteractiveLogin.ts b/src/auth/useInteractiveLogin.ts
index 9ffa7ba..ae0c855 100644
--- a/src/auth/useInteractiveLogin.ts
+++ b/src/auth/useInteractiveLogin.ts
@@ -29,7 +29,7 @@ export const useInteractiveLogin = () =>
       password: string
     ) => Promise<[MatrixClient, Session]>
   >(async (homeserver: string, username: string, password: string) => {
-    const authClient = createClient(homeserver);
+    const authClient = createClient({ baseUrl: homeserver });
 
     const interactiveAuth = new InteractiveAuth({
       matrixClient: authClient,
diff --git a/src/auth/useInteractiveRegistration.ts b/src/auth/useInteractiveRegistration.ts
index 8b8647a..6b25c29 100644
--- a/src/auth/useInteractiveRegistration.ts
+++ b/src/auth/useInteractiveRegistration.ts
@@ -37,7 +37,7 @@ export const useInteractiveRegistration = (): [
 
   const authClient = useRef<MatrixClient>();
   if (!authClient.current) {
-    authClient.current = createClient(defaultHomeserver);
+    authClient.current = createClient({ baseUrl: defaultHomeserver });
   }
 
   useEffect(() => {
diff --git a/src/profile/useProfile.ts b/src/profile/useProfile.ts
index 768bae9..a05cebf 100644
--- a/src/profile/useProfile.ts
+++ b/src/profile/useProfile.ts
@@ -101,7 +101,9 @@ export function useProfile(client: MatrixClient) {
           if (removeAvatar) {
             await client.setAvatarUrl("");
           } else if (avatar) {
-            mxcAvatarUrl = await client.uploadContent(avatar);
+            ({ content_uri: mxcAvatarUrl } = await client.uploadContent(
+              avatar
+            ));
             await client.setAvatarUrl(mxcAvatarUrl);
           }
 
diff --git a/src/room/usePageUnload.ts b/src/room/usePageUnload.ts
index b49c778..d36f491 100644
--- a/src/room/usePageUnload.ts
+++ b/src/room/usePageUnload.ts
@@ -34,7 +34,7 @@ function isIOS() {
 
 export function usePageUnload(callback: () => void) {
   useEffect(() => {
-    let pageVisibilityTimeout: number;
+    let pageVisibilityTimeout: ReturnType<typeof setTimeout>;
 
     function onBeforeUnload(event: PageTransitionEvent) {
       if (event.type === "visibilitychange") {