Merge cd4d8eb96d into 86e8424e46

.env

@@ -1,5 +1,5 @@
 # VITE_API_URL=https://api.revolt.chat
-# VITE_API_URL=https://app.revolt.chat/api
+VITE_API_URL=https://app.revolt.chat/api
 # VITE_API_URL=http://local.revolt.chat:8000
-VITE_API_URL=https://revolt.chat/api
+# VITE_API_URL=https://revolt.chat/api
 VITE_THEMES_URL=https://themes.revolt.chat

src/controllers/client/jsx/legacy/FileUploads.tsx

@@ -12,7 +12,7 @@ import { IconButton, Preloader } from "@revoltchat/ui";
 import { determineFileSize } from "../../../../lib/fileSize";
 
 import { modalController } from "../../../modals/ModalController";
-import { clientController, useClient } from "../../ClientController";
+import { useClient } from "../../ClientController";
 import { takeError } from "../error";
 
 type BehaviourType =
@@ -67,16 +67,9 @@ export async function uploadFile(
     const formData = new FormData();
     formData.append("file", file);
 
-    const client = clientController.getActiveSession()?.client;
-    const sesToken =
-        typeof client?.session === "string"
-            ? client.session
-            : client?.session?.token;
-
     const res = await Axios.post(`${autumnURL}/${tag}`, formData, {
         headers: {
             "Content-Type": "multipart/form-data",
-            "X-Session-Token": sesToken,
         },
         ...config,
     });

src/pages/channels/Channel.tsx

@@ -1,6 +1,5 @@
 import { Hash } from "@styled-icons/boxicons-regular";
 import { Ghost } from "@styled-icons/boxicons-solid";
-import dayjs from "dayjs";
 import { reaction } from "mobx";
 import { observer } from "mobx-react-lite";
 import { Redirect, useParams } from "react-router-dom";
@@ -164,7 +163,6 @@ const TextChannel = observer(({ channel }: { channel: ChannelI }) => {
 
         const checkUnread = () =>
             channel.unread &&
-            document.hasFocus() &&
             channel.client.unreads!.markRead(
                 channel._id,
                 channel.last_message_id!,
@@ -178,46 +176,6 @@ const TextChannel = observer(({ channel }: { channel: ChannelI }) => {
         );
     }, [channel]);
 
-    useEffect(() => {
-        let lastSubscribed: number | undefined;
-        function subscribe() {
-            if (document.hasFocus()) {
-                if (
-                    !lastSubscribed ||
-                    dayjs().subtract(10, "minutes").isAfter(lastSubscribed)
-                ) {
-                    lastSubscribed = +new Date();
-                    channel.server?.subscribe();
-                }
-            }
-        }
-
-        // Trigger logic every minute
-        const subTimer = setInterval(subscribe, 60e3);
-        subscribe();
-
-        function onFocus() {
-            // Mark channel as read if it's unread
-            if (channel.unread) {
-                channel.client.unreads!.markRead(
-                    channel._id,
-                    channel.last_message_id!,
-                    true,
-                );
-            }
-
-            // Subscribe to channel if expired
-            subscribe();
-        }
-
-        addEventListener("focus", onFocus);
-
-        return () => {
-            removeEventListener("focus", onFocus);
-            clearInterval(subTimer);
-        };
-    }, [channel]);
-
     return (
         <AgeGate
             type="channel"

src/pages/settings/server/Members.tsx

@@ -103,43 +103,10 @@ export const Members = ({ server }: Props) => {
     const [query, setQuery] = useState("");
 
     useEffect(() => {
-        function fetch() {
+        server
-            server
+            .fetchMembers()
-                .fetchMembers()
+            .then((data) => data.members)
-                .then((data) => data.members)
+            .then(setData);
-                .then(setData);
-        }
-
-        fetch();
-
-        // Members may be invalidated if we stop receiving events
-        // This is not very accurate, this should be tracked within
-        // revolt.js so we know the true validity.
-        let valid = true,
-            invalidationTimer: number;
-
-        function waitToInvalidate() {
-            invalidationTimer = setTimeout(() => {
-                valid = false;
-            }, 15 * 60e3) as never; // 15 minutes
-        }
-
-        function cancelInvalidation() {
-            if (!valid) {
-                fetch();
-                valid = true;
-            }
-
-            clearTimeout(invalidationTimer);
-        }
-
-        addEventListener("blur", waitToInvalidate);
-        addEventListener("focus", cancelInvalidation);
-
-        return () => {
-            removeEventListener("blur", waitToInvalidate);
-            removeEventListener("focus", cancelInvalidation);
-        };
     }, [server, setData]);
 
     const members = useMemo(