From 2f950aab5367de0557c93f8ca06fd34ad50c2dd3 Mon Sep 17 00:00:00 2001
From: TaiAurori <31465218+TaiAurori@users.noreply.github.com>
Date: Tue, 31 Aug 2021 21:37:42 +0000
Subject: [PATCH] add visible joining indicator

---
 .../common/messaging/embed/EmbedInvite.tsx    | 87 ++++++++++---------
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/src/components/common/messaging/embed/EmbedInvite.tsx b/src/components/common/messaging/embed/EmbedInvite.tsx
index 42996477..8a1ee19c 100644
--- a/src/components/common/messaging/embed/EmbedInvite.tsx
+++ b/src/components/common/messaging/embed/EmbedInvite.tsx
@@ -106,49 +106,56 @@ export default function EmbedInvite(props: Props) {
                 {invite.member_count} members
             </EmbedInviteMemberCount>
         </EmbedInviteDetails>
-        <Button onClick={async () => {
-            try {
-                setProcessing(true);
+        {processing ? (
+            <div>
+                <Preloader type="ring" />
+            </div>
+        ) : (
+            <Button onClick={async () => {
+                try {
+                    setProcessing(true);
 
-                if (invite.type === "Server") {
-                    if (
-                        client.servers.get(invite.server_id)
-                    ) {
-                        history.push(
-                            `/server/${invite.server_id}/channel/${invite.channel_id}`,
-                        );
+                    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) {
+                                    dispatch({
+                                        type: "UNREADS_MARK_MULTIPLE_READ",
+                                        channels:
+                                            server.channel_ids,
+                                    });
+
+                                    history.push(
+                                        `/server/${server._id}/channel/${invite.channel_id}`,
+                                    );
+                                }
+                            });
+
+                            dispose();
+                        });
                     }
 
-                    const dispose = autorun(() => {
-                        const server = client.servers.get(
-                            invite.server_id,
-                        );
-
-                        defer(() => {
-                            if (server) {
-                                dispatch({
-                                    type: "UNREADS_MARK_MULTIPLE_READ",
-                                    channels:
-                                        server.channel_ids,
-                                });
-
-                                history.push(
-                                    `/server/${server._id}/channel/${invite.channel_id}`,
-                                );
-                            }
-                        });
-
-                        dispose();
-                    });
+                    await client.joinInvite(code);
+                    setProcessing(false);
+                } catch (err) {
+                    setError(takeError(err));
+                    setProcessing(false);
                 }
-
-                await client.joinInvite(code);
-            } catch (err) {
-                setError(takeError(err));
-                setProcessing(false);
-            }
-        }}>
-            {client.servers.get(invite.server_id) ? "Joined" : "Join"}
-        </Button>
+            }}>
+                {client.servers.get(invite.server_id) ? "Joined" : "Join"}
+            </Button>
+        )}
     </EmbedInviteBase>
 }