{selfMuted &&
}
{selfDeafened &&
}
diff --git a/apps/desktop/src/rpc/manager.ts b/apps/desktop/src/rpc/manager.ts
index a65e1a8d..0a0975c8 100644
--- a/apps/desktop/src/rpc/manager.ts
+++ b/apps/desktop/src/rpc/manager.ts
@@ -179,7 +179,10 @@ class SocketManager {
this.store.clearUsers();
if (this.store.currentChannel) {
- this.channelEvents(RPCCommand.UNSUBSCRIBE, this.store.currentChannel.id);
+ this.channelEvents(
+ RPCCommand.UNSUBSCRIBE,
+ this.store.currentChannel.id,
+ );
}
// after unsub we clear the channel
@@ -228,21 +231,20 @@ class SocketManager {
}
}
+ console.log(payload);
// we are ready to do things cause we are fully authed
if (
payload.cmd === RPCCommand.AUTHENTICATE &&
payload.evt === RPCEvent.ERROR
) {
- // TODO: handle
- if (payload.data.code === RPCErrors.OAUTH2_ERROR) {
- }
-
+ // if they have an invalid we remove it and make them auth again
if (payload.data.code === RPCErrors.INVALID_TOKEN) {
+ this.store.pushError(payload.data.message);
this.tokenStore?.removeAccessToken();
}
- // TODO: handle saving the last error message(s) so we can display then on the error view
-
+ this.store.pushError(payload.data.message);
+ // move to the error page
this.navigate?.("/error");
} else if (payload?.cmd === RPCCommand.AUTHENTICATE) {
// try to find the user
diff --git a/apps/desktop/src/store.ts b/apps/desktop/src/store.ts
index 6cdb85f7..8c58b55c 100644
--- a/apps/desktop/src/store.ts
+++ b/apps/desktop/src/store.ts
@@ -33,6 +33,7 @@ export interface AppState {
name: string;
} | null;
users: Record
;
+ discordErrors: string[];
}
export interface AppActions {
@@ -46,6 +47,8 @@ export interface AppActions {
// TODO: type this
setCurrentChannel: (channel: any) => void;
setMe: (user: OverlayedUser | null) => void;
+ pushError: (message: string) => void;
+ resetErrors: () => void;
}
// sort discord users by name and myself on top
@@ -92,6 +95,7 @@ export const useAppStore = create()(
// @ts-ignore
immer((set) => ({
me: null,
+ discordErrors: [],
clickThrough: false,
currentChannel: null,
users: {},
@@ -133,5 +137,13 @@ export const useAppStore = create()(
set((state) => {
state.clickThrough = enabled;
}),
+ pushError: (error) =>
+ set((state) => {
+ state.discordErrors.push(error);
+ }),
+ resetErrors: () =>
+ set((state) => {
+ state.discordErrors = [];
+ }),
})),
);
diff --git a/apps/desktop/src/use-border.ts b/apps/desktop/src/use-border.ts
deleted file mode 100644
index 44575be5..00000000
--- a/apps/desktop/src/use-border.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useEffect, useState } from "react";
-
-export const useBorder = () => {
- const [mouseInViewport, setMouseInViewport] = useState(false);
-
- const [mousePos, setMousePos] = useState({ x: 0, y: 0 });
-
- useEffect(() => {
- const mouseMoveFn = (event: MouseEvent) => {
- setMousePos({ x: event.clientX, y: event.clientY });
- };
- document.addEventListener("mousemove", mouseMoveFn);
-
- const mouseOutFn = () => {
- setMouseInViewport(false);
- };
-
- document.addEventListener("mouseout", mouseOutFn);
-
- const mouseOverFn = () => {
- setMouseInViewport(true);
- };
- document.addEventListener("mouseover", mouseOverFn);
-
- return () => {
- mouseOutFn();
- mouseOverFn();
- };
- }, []);
-
- return { mouseInViewport, mousePos };
-};
diff --git a/apps/desktop/src/use-set-size.ts b/apps/desktop/src/use-set-size.ts
new file mode 100644
index 00000000..d0e6a997
--- /dev/null
+++ b/apps/desktop/src/use-set-size.ts
@@ -0,0 +1,28 @@
+import { LogicalSize, appWindow } from "@tauri-apps/api/window";
+import { useEffect, useRef } from "react";
+
+export const useSetWindowSize = ({
+ width,
+ height,
+}: {
+ width: number;
+ height: number;
+}) => {
+ const lastSizeRef = useRef(null);
+
+ useEffect(() => {
+ appWindow.outerSize().then((size) => {
+ lastSizeRef.current = size;
+
+ // set the new
+ appWindow.setSize(new LogicalSize(width, height));
+ });
+
+ // on unmount save the last size
+ return () => {
+ if (lastSizeRef.current) {
+ appWindow.setSize(lastSizeRef.current);
+ }
+ };
+ }, []);
+};
diff --git a/apps/desktop/src/use-window-resize.ts b/apps/desktop/src/use-window-resize.ts
new file mode 100644
index 00000000..3c00c27f
--- /dev/null
+++ b/apps/desktop/src/use-window-resize.ts
@@ -0,0 +1,22 @@
+import { useEffect, useState } from "react";
+
+// write a window rezise hook
+export const useWindowResize = () => {
+ const [windowSize, setWindowSize] = useState({
+ width: window.innerWidth,
+ height: window.innerHeight,
+ });
+
+ useEffect(() => {
+ const handleResize = () => {
+ setWindowSize({
+ width: window.innerWidth,
+ height: window.innerHeight,
+ });
+ };
+ window.addEventListener("resize", handleResize);
+ return () => window.removeEventListener("resize", handleResize);
+ }, []);
+
+ return windowSize;
+}
diff --git a/apps/desktop/src/views/channel.tsx b/apps/desktop/src/views/channel.tsx
index 58be3834..d7e7587d 100644
--- a/apps/desktop/src/views/channel.tsx
+++ b/apps/desktop/src/views/channel.tsx
@@ -1,14 +1,17 @@
import { User } from "../components/user";
import { useAppStore } from "../store";
+import { useWindowResize } from "../use-window-resize";
export const Channel = () => {
const { users } = useAppStore();
+ const windowSize = useWindowResize();
return (
+ {JSON.stringify({ windowSize })}
{Object.entries(users).map(([_k, item]) => (
-
+
))}
-
-
Error Connecting to Dicsord
+
+
+
Error Connecting to Discord
+
+
+
+
+
+ {discordErrors.map((item, i) => (
+
{item}
+ ))}
-
-
+
diff --git a/apps/desktop/src/views/main.tsx b/apps/desktop/src/views/main.tsx
index 1d16b70c..758241f4 100644
--- a/apps/desktop/src/views/main.tsx
+++ b/apps/desktop/src/views/main.tsx
@@ -1,37 +1,49 @@
-import { useNavigate } from "react-router-dom";
import { useSocket } from "../rpc/manager";
+import { useAppStore } from "../store";
+import { useEffect } from "react";
+import { useSetWindowSize } from "../use-set-size";
import { Button } from "../components/ui/button";
+import { Link } from "react-router-dom";
export const Main = () => {
- const socket = useSocket();
- const navigate = useNavigate();
+ useSocket();
+ useSetWindowSize({ width: 400, height: 600 });
+ const { resetErrors } = useAppStore();
+
+ useEffect(() => {
+ resetErrors();
+ }, []);
return (
- {!socket?.isConnected ? (
-
- ) : (
- <>
-
+
+
Authorize Discord
+
+
-
-
-
Request Prompt again
-
-
-
- )}
+
+
+
+
);
};