From c5a36b09d913147238be3e2e7a97a8652ed17339 Mon Sep 17 00:00:00 2001
From: Paul <paulmakles@gmail.com>
Date: Thu, 12 Aug 2021 17:11:34 +0100
Subject: [PATCH 1/2] Remove ability to add bot as a friend.

---
 .../intermediate/popovers/UserProfile.tsx     |  15 +--
 src/lib/ContextMenus.tsx                      | 100 +++++++++---------
 2 files changed, 60 insertions(+), 55 deletions(-)

diff --git a/src/context/intermediate/popovers/UserProfile.tsx b/src/context/intermediate/popovers/UserProfile.tsx
index 12fd4e6d..fedaaeb7 100644
--- a/src/context/intermediate/popovers/UserProfile.tsx
+++ b/src/context/intermediate/popovers/UserProfile.tsx
@@ -190,12 +190,15 @@ export const UserProfile = observer(
                                 <Edit size={28} />
                             </IconButton>
                         )}
-                        {(user.relationship === RelationshipStatus.Incoming ||
-                            user.relationship === RelationshipStatus.None) && (
-                            <IconButton onClick={() => user.addFriend()}>
-                                <UserPlus size={28} />
-                            </IconButton>
-                        )}
+                        {!user.bot &&
+                            (user.relationship ===
+                                RelationshipStatus.Incoming ||
+                                user.relationship ===
+                                    RelationshipStatus.None) && (
+                                <IconButton onClick={() => user.addFriend()}>
+                                    <UserPlus size={28} />
+                                </IconButton>
+                            )}
                     </div>
                     <div className={styles.tabs}>
                         <div
diff --git a/src/lib/ContextMenus.tsx b/src/lib/ContextMenus.tsx
index 2dad2082..7448be6e 100644
--- a/src/lib/ContextMenus.tsx
+++ b/src/lib/ContextMenus.tsx
@@ -585,58 +585,60 @@ function ContextMenus(props: Props) {
                     }
 
                     if (user) {
-                        let actions: Action["action"][];
-                        switch (user.relationship) {
-                            case RelationshipStatus.User:
-                                actions = [];
-                                break;
-                            case RelationshipStatus.Friend:
-                                actions = ["remove_friend", "block_user"];
-                                break;
-                            case RelationshipStatus.Incoming:
-                                actions = [
-                                    "add_friend",
-                                    "cancel_friend",
-                                    "block_user",
-                                ];
-                                break;
-                            case RelationshipStatus.Outgoing:
-                                actions = ["cancel_friend", "block_user"];
-                                break;
-                            case RelationshipStatus.Blocked:
-                                actions = ["unblock_user"];
-                                break;
-                            case RelationshipStatus.BlockedOther:
-                                actions = ["block_user"];
-                                break;
-                            case RelationshipStatus.None:
-                            default:
-                                actions = ["add_friend", "block_user"];
-                        }
+                        if (!user.bot) {
+                            let actions: Action["action"][];
+                            switch (user.relationship) {
+                                case RelationshipStatus.User:
+                                    actions = [];
+                                    break;
+                                case RelationshipStatus.Friend:
+                                    actions = ["remove_friend", "block_user"];
+                                    break;
+                                case RelationshipStatus.Incoming:
+                                    actions = [
+                                        "add_friend",
+                                        "cancel_friend",
+                                        "block_user",
+                                    ];
+                                    break;
+                                case RelationshipStatus.Outgoing:
+                                    actions = ["cancel_friend", "block_user"];
+                                    break;
+                                case RelationshipStatus.Blocked:
+                                    actions = ["unblock_user"];
+                                    break;
+                                case RelationshipStatus.BlockedOther:
+                                    actions = ["block_user"];
+                                    break;
+                                case RelationshipStatus.None:
+                                default:
+                                    actions = ["add_friend", "block_user"];
+                            }
 
-                        if (userPermissions & UserPermission.ViewProfile) {
-                            generateAction({
-                                action: "view_profile",
-                                user,
-                            });
-                        }
+                            if (userPermissions & UserPermission.ViewProfile) {
+                                generateAction({
+                                    action: "view_profile",
+                                    user,
+                                });
+                            }
 
-                        if (
-                            user._id !== userId &&
-                            userPermissions & UserPermission.SendMessage
-                        ) {
-                            generateAction({
-                                action: "message_user",
-                                user,
-                            });
-                        }
+                            if (
+                                user._id !== userId &&
+                                userPermissions & UserPermission.SendMessage
+                            ) {
+                                generateAction({
+                                    action: "message_user",
+                                    user,
+                                });
+                            }
 
-                        for (let i = 0; i < actions.length; i++) {
-                            // Typescript can't determine that user the actions are linked together correctly
-                            generateAction({
-                                action: actions[i],
-                                user,
-                            } as unknown as Action);
+                            for (let i = 0; i < actions.length; i++) {
+                                // Typescript can't determine that user the actions are linked together correctly
+                                generateAction({
+                                    action: actions[i],
+                                    user,
+                                } as unknown as Action);
+                            }
                         }
                     }
 

From 4ac3165bdcfdced7ed8b8ed7e7ba4ba934897644 Mon Sep 17 00:00:00 2001
From: Paul <paulmakles@gmail.com>
Date: Thu, 12 Aug 2021 19:51:23 +0100
Subject: [PATCH 2/2] Remove logs.

---
 src/components/common/messaging/attachments/MessageReply.tsx | 3 ---
 src/context/Theme.tsx                                        | 3 ---
 src/pages/channels/messaging/MessageArea.tsx                 | 1 -
 3 files changed, 7 deletions(-)

diff --git a/src/components/common/messaging/attachments/MessageReply.tsx b/src/components/common/messaging/attachments/MessageReply.tsx
index 68f50d7b..9512d828 100644
--- a/src/components/common/messaging/attachments/MessageReply.tsx
+++ b/src/components/common/messaging/attachments/MessageReply.tsx
@@ -192,9 +192,6 @@ export const MessageReply = observer(({ index, channel, id }: Props) => {
                                     if (
                                         channel.channel_type === "TextChannel"
                                     ) {
-                                        console.log(
-                                            `/server/${channel.server_id}/channel/${channel._id}/${message._id}`,
-                                        );
                                         history.push(
                                             `/server/${channel.server_id}/channel/${channel._id}/${message._id}`,
                                         );
diff --git a/src/context/Theme.tsx b/src/context/Theme.tsx
index 0eed2294..00b19588 100644
--- a/src/context/Theme.tsx
+++ b/src/context/Theme.tsx
@@ -77,9 +77,6 @@ export interface ThemeOptions {
     custom?: Partial<Theme>;
 }
 
-// import aaa from "@fontsource/open-sans/300.css?raw";
-// console.info(aaa);
-
 export const FONTS: Record<Fonts, { name: string; load: () => void }> = {
     "Open Sans": {
         name: "Open Sans",
diff --git a/src/pages/channels/messaging/MessageArea.tsx b/src/pages/channels/messaging/MessageArea.tsx
index acf2268b..3c690cbb 100644
--- a/src/pages/channels/messaging/MessageArea.tsx
+++ b/src/pages/channels/messaging/MessageArea.tsx
@@ -174,7 +174,6 @@ export const MessageArea = observer(({ channel }: Props) => {
         if (renderer.state === "RENDER") {
             runInAction(() => (renderer.fetching = true));
 
-            console.log(renderer.scrollAnchored);
             if (renderer.scrollAnchored) {
                 setScrollState({ type: "ScrollToBottom" });
             } else {