Official Discord app id (905987126099836938) (#73)

Author: Hacksore

apps/desktop/components.json

@@ -11,6 +11,6 @@
   },
   "aliases": {
     "components": "@/components",
-    "utils": "@/lib/utils"
+    "utils": "@/utils/tw"
   }
 }

apps/desktop/src-tauri/Cargo.toml

@@ -13,7 +13,7 @@ edition = "2021"
 tauri-build = { version = "1.5", features = [] }
 
 [dependencies]
-tauri = { version = "1.5", features = [ "notification-all", "global-shortcut-all", "process-relaunch", "updater", "process-exit", "os-all",
+tauri = { version = "1.5", features = [ "fs-create-dir", "notification-all", "global-shortcut-all", "process-relaunch", "updater", "process-exit", "os-all",
   "window-set-position",
   "shell-open",
   "path-all",

apps/desktop/src-tauri/tauri.conf.json

@@ -36,15 +36,16 @@
         "open": ".*"
       },
       "fs": {
-        "scope": ["$APPDATA/*"],
+        "scope": ["$APPCONFIG/**", "$APPDATA/**"],
         "readFile": true,
         "writeFile": true,
+        "createDir": true,
         "exists": true
       },
       "http": {
         "all": true,
         "request": true,
-        "scope": ["https://streamkit.discord.com/overlay/token"]
+        "scope": ["https://api.overlayed.dev/token"]
       },
       "path": {
         "all": true

apps/desktop/src/App.tsx

@@ -34,6 +34,7 @@ function App() {
   const { horizontal, setHorizontalDirection } = useAlign();
 
   const visibleClass = visible ? "opacity-100" : "opacity-0";
+
   return (
     <div className={`text-white h-screen select-none rounded-lg ${visibleClass}`}>
       {!clickthrough && (

apps/desktop/src/components/ui/avatar.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as AvatarPrimitive from "@radix-ui/react-avatar";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/utils/tw";
 
 const Avatar = React.forwardRef<
   React.ElementRef<typeof AvatarPrimitive.Root>,

apps/desktop/src/components/ui/button.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import { Slot } from "@radix-ui/react-slot";
 import { cva, type VariantProps } from "class-variance-authority";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/utils/tw";
 
 const buttonVariants = cva(
   "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",

apps/desktop/src/components/ui/checkbox.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import * as CheckboxPrimitive from "@radix-ui/react-checkbox";
 import { Check } from "lucide-react";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/utils/tw";
 
 const Checkbox = React.forwardRef<
   React.ElementRef<typeof CheckboxPrimitive.Root>,

apps/desktop/src/components/ui/dialog.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import * as DialogPrimitive from "@radix-ui/react-dialog";
 import { X } from "lucide-react";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/utils/tw";
 
 const Dialog = DialogPrimitive.Root;
 

apps/desktop/src/components/ui/input.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/utils/tw";
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {}

apps/desktop/src/components/ui/label.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import * as LabelPrimitive from "@radix-ui/react-label";
 import { cva, type VariantProps } from "class-variance-authority";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/utils/tw";
 
 const labelVariants = cva("text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70");
 

apps/desktop/src/components/ui/tabs.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as TabsPrimitive from "@radix-ui/react-tabs";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/utils/tw";
 
 const Tabs = TabsPrimitive.Root;
 

apps/desktop/src/components/ui/toast.tsx

@@ -3,7 +3,7 @@ import * as ToastPrimitives from "@radix-ui/react-toast";
 import { cva, type VariantProps } from "class-variance-authority";
 import { X } from "lucide-react";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/utils/tw";
 
 const ToastProvider = ToastPrimitives.Provider;
 

apps/desktop/src/components/ui/tooltip.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as TooltipPrimitive from "@radix-ui/react-tooltip";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@/utils/tw";
 
 const TooltipProvider = TooltipPrimitive.Provider;
 

apps/desktop/src/rpc/manager.ts

@@ -61,9 +61,9 @@ const SUBSCRIBABLE_EVENTS = [
   RPCEvent.VOICE_STATE_UPDATE,
 ];
 
-const STREAM_KIT_APP_ID = "207646673902501888";
+export const APP_ID = "905987126099836938";
 const WEBSOCKET_URL = "ws://127.0.0.1:6463";
-const STREAMKIT_URL = "https://streamkit.discord.com";
+const API_URL = "https://api.overlayed.dev";
 
 interface DiscordPayload {
   cmd: `${RPCCommand}`;
@@ -101,12 +101,11 @@ class SocketManager {
 
     this._navigate = navigate;
 
-    const connectionUrl = `${WEBSOCKET_URL}/?v=1&client_id=${STREAM_KIT_APP_ID}`;
+    const connectionUrl = `${WEBSOCKET_URL}/?v=1&client_id=${APP_ID}`;
     try {
       this.socket = await WebSocket.connect(connectionUrl, {
         headers: {
-          // we need to set the origin header to the discord streamkit domain
-          origin: STREAMKIT_URL,
+          origin: API_URL,
         },
       });
 
@@ -143,7 +142,7 @@ class SocketManager {
   private authenticate() {
     this.send({
       args: {
-        client_id: STREAM_KIT_APP_ID,
+        client_id: APP_ID,
         scopes: ["rpc", "identify"],
       },
       cmd: RPCCommand.AUTHORIZE,
@@ -177,10 +176,10 @@ class SocketManager {
 
     const payload: DiscordPayload = JSON.parse(event.data);
 
-    // console.log(payload);
     // either the token is good and valid and we can login otherwise prompt them approve
     if (payload.evt === RPCEvent.READY) {
       const acessToken = this.userdataStore.accessToken;
+
       if (acessToken) {
         this.login(acessToken);
       } else {
@@ -250,7 +249,7 @@ class SocketManager {
     // we got a token back from discord let's fetch an access token
     if (payload.cmd === RPCCommand.AUTHORIZE) {
       const { code } = payload.data;
-      const res = await fetch<TokenResponse>(`${STREAMKIT_URL}/overlay/token`, {
+      const res = await fetch<TokenResponse>(`${API_URL}/token`, {
         method: "POST",
         body: Body.json({ code }),
       });
@@ -278,9 +277,13 @@ 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) {
-      // if they have an invalid we remove it and make them auth again
+      // they have a token from the old client id
+      if (payload.data.code === RPCErrors.INVALID_CLIENTID) {
+        this.userdataStore.removeAccessToken();
+      }
+
+      // they have an invalid token
       if (payload.data.code === RPCErrors.INVALID_TOKEN) {
-        this.store.pushError(payload.data.message);
         this.userdataStore.removeAccessToken();
       }
 

apps/desktop/src/utils/migration.ts

@@ -0,0 +1,25 @@
+import { BaseDirectory, createDir, exists, readTextFile, writeFile } from "@tauri-apps/api/fs";
+
+export async function completeMigration(name: string) {
+  try {
+    if (!(await exists("migrations", { dir: BaseDirectory.AppConfig }))) {
+      await createDir("migrations", { dir: BaseDirectory.AppConfig });
+    }
+
+    await writeFile(`migrations/${name}.json`, JSON.stringify({ completed: true }), { dir: BaseDirectory.AppConfig });
+  } catch (e) {
+    console.error(e);
+  }
+}
+
+export async function isMigrationComplete(name: string): Promise<boolean> {
+  try {
+    const contents = await readTextFile(`migrations/${name}.json`, {
+      dir: BaseDirectory.AppConfig,
+    });
+
+    return JSON.parse(contents).completed;
+  } catch (e) {
+    return false;
+  }
+}

apps/desktop/src/lib/utils.ts renamed to apps/desktop/src/utils/tw.ts

@@ -1,6 +1,6 @@
 import { Button } from "@/components/ui/button";
 import { Trash, PhoneOff, PhoneIncoming } from "lucide-react";
-import { cn } from "@/lib/utils";
+import { cn } from "@/utils/tw";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { useEffect, useRef, useState } from "react";
 import { listen } from "@tauri-apps/api/event";

apps/desktop/src/views/settings/join-history.tsx

@@ -8,7 +8,6 @@
     "clean": "turbo run clean && rm -rf node_modules .turbo",
     "lint": "turbo run lint",
     "format": "turbo run format",
-    "ui:add": "pnpm --filter ui ui:add",
     "dl-contrib": "tsx scripts/generate-contributors.ts"
   },
   "type": "module",