From d129d9816ded6b638d611031a69d08db6813dccf Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Sat, 9 Apr 2022 19:02:41 +0100
Subject: [PATCH] fix(invites): use new invite handling

---
 .../common/messaging/embed/EmbedInvite.tsx    | 39 ++++---------------
 src/pages/invite/Invite.tsx                   | 39 ++++---------------
 2 files changed, 14 insertions(+), 64 deletions(-)

diff --git a/src/components/common/messaging/embed/EmbedInvite.tsx b/src/components/common/messaging/embed/EmbedInvite.tsx
index 368ac7df..c1447331 100644
--- a/src/components/common/messaging/embed/EmbedInvite.tsx
+++ b/src/components/common/messaging/embed/EmbedInvite.tsx
@@ -139,42 +139,17 @@ export function EmbedInvite({ code }: Props) {
                 ) : (
                     <Button
                         onClick={async () => {
+                            setProcessing(true);
+
                             try {
-                                setProcessing(true);
+                                await client.joinInvite(invite);
 
-                                if (invite.type === "Server") {
-                                    if (client.servers.get(invite.server_id)) {
-                                        history.push(
-                                            `/server/${invite.server_id}/channel/${invite.channel_id}`,
-                                        );
-
-                                        return;
-                                    }
-
-                                    const dispose = reaction(
-                                        () =>
-                                            client.servers.get(
-                                                invite.server_id,
-                                            ),
-                                        (server) => {
-                                            if (server) {
-                                                client.unreads!.markMultipleRead(
-                                                    server.channel_ids,
-                                                );
-
-                                                history.push(
-                                                    `/server/${server._id}/channel/${invite.channel_id}`,
-                                                );
-
-                                                dispose();
-                                            }
-                                        },
-                                    );
-                                }
-
-                                await client.joinInvite(code);
+                                history.push(
+                                    `/server/${invite.server_id}/channel/${invite.channel_id}`,
+                                );
                             } catch (err) {
                                 setJoinError(takeError(err));
+                            } finally {
                                 setProcessing(false);
                             }
                         }}>
diff --git a/src/pages/invite/Invite.tsx b/src/pages/invite/Invite.tsx
index bb492319..801426ab 100644
--- a/src/pages/invite/Invite.tsx
+++ b/src/pages/invite/Invite.tsx
@@ -158,42 +158,17 @@ export default function Invite() {
                                     return history.push("/");
                                 }
 
+                                setProcessing(true);
+
                                 try {
-                                    setProcessing(true);
+                                    await client.joinInvite(invite);
 
-                                    if (invite.type === "Server") {
-                                        if (
-                                            client.servers.get(invite.server_id)
-                                        ) {
-                                            history.push(
-                                                `/server/${invite.server_id}/channel/${invite.channel_id}`,
-                                            );
-                                        }
-
-                                        const dispose = autorun(() => {
-                                            const server = client.servers.get(
-                                                invite.server_id,
-                                            );
-
-                                            defer(() => {
-                                                if (server) {
-                                                    client.unreads!.markMultipleRead(
-                                                        server.channel_ids,
-                                                    );
-
-                                                    history.push(
-                                                        `/server/${server._id}/channel/${invite.channel_id}`,
-                                                    );
-                                                }
-                                            });
-
-                                            dispose();
-                                        });
-                                    }
-
-                                    await client.joinInvite(code);
+                                    history.push(
+                                        `/server/${invite.server_id}/channel/${invite.channel_id}`,
+                                    );
                                 } catch (err) {
                                     setError(takeError(err));
+                                } finally {
                                     setProcessing(false);
                                 }
                             }}>