Merge branch 'master' of https://github.com/revoltchat/revite into pr-6

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}`,
                                         );

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",

src/context/intermediate/popovers/UserProfile.tsx

@@ -195,8 +195,11 @@ export const UserProfile = observer(
                                 <Edit size={28} />
                             </IconButton>
                         )}
-                        {(user.relationship === RelationshipStatus.Incoming ||
+                        {!user.bot &&
-                            user.relationship === RelationshipStatus.None) && (
+                            (user.relationship ===
+                                RelationshipStatus.Incoming ||
+                                user.relationship ===
+                                    RelationshipStatus.None) && (
                                 <IconButton onClick={() => user.addFriend()}>
                                     <UserPlus size={28} />
                                 </IconButton>

src/lib/ContextMenus.tsx

@@ -585,6 +585,7 @@ function ContextMenus(props: Props) {
                     }
 
                     if (user) {
+                        if (!user.bot) {
                             let actions: Action["action"][];
                             switch (user.relationship) {
                                 case RelationshipStatus.User:
@@ -639,6 +640,7 @@ function ContextMenus(props: Props) {
                                 } as unknown as Action);
                             }
                         }
+                    }
 
                     if (contextualChannel) {
                         if (contextualChannel.channel_type === "Group" && uid) {

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 {