checkpint

overlayeddev · Aug 31, 2024 · 1e2c9d8 · 1e2c9d8
1 parent d2cb460
commit 1e2c9d8
Show file tree

Hide file tree

Showing 6 changed files with 245 additions and 127 deletions.
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
@@ -44,6 +44,8 @@
     "@tauri-apps/plugin-global-shortcut": "2.0.0-rc.0",
     "@tauri-apps/plugin-websocket": "2.0.0-rc.0",
     "@tauri-apps/plugin-window-state": "2.0.0-rc.0",
+    "@tauri-apps/plugin-store": "2.0.0-rc.0",
+    "@tauri-apps/plugin-log": "2.0.0-rc.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
     "date-fns": "^2.30.0",
@@ -54,10 +56,6 @@
     "react-router-dom": "^6.22.3",
     "tailwind-merge": "^2.2.1",
     "tailwindcss-animate": "^1.0.7",
-    "tauri-plugin-log": "github:tauri-apps/tauri-plugin-log#v1",
-    "tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
-    "tauri-plugin-websocket-api": "github:tauri-apps/tauri-plugin-websocket#v1",
-    "tauri-plugin-window-state-api": "github:tauri-apps/tauri-plugin-window-state#v1",
     "uuid": "^9.0.1",
     "zustand": "^4.5.2"
   },

diff --git a/apps/desktop/src/hooks/use-config-value.ts b/apps/desktop/src/hooks/use-config-value.ts
@@ -1,4 +1,4 @@
-import { Store } from "tauri-plugin-store-api";
+import { Store } from "@tauri-apps/plugin-store";
 import { useEffect, useState } from "react";
 import { DEFAULT_OVERLAYED_CONFIG, type OverlayedConfig, type OverlayedConfigKey } from "@/config";
 

diff --git a/apps/desktop/src/metrics.ts b/apps/desktop/src/metrics.ts
@@ -1,5 +1,5 @@
 import { axiom } from "@/axiom";
-import { Store } from "tauri-plugin-store-api";
+import { Store } from "@tauri-apps/plugin-store";
 
 const store = new Store("config.json");
 

diff --git a/apps/desktop/src/views/settings/account.tsx b/apps/desktop/src/views/settings/account.tsx
@@ -5,7 +5,7 @@ import { saveWindowState, StateFlags } from "@tauri-apps/plugin-window-state";
 
 import { invoke } from "@tauri-apps/api/core";
 import { usePlatformInfo } from "@/hooks/use-platform-info";
-import { Store } from "tauri-plugin-store-api";
+import { Store } from "@tauri-apps/plugin-store";
 
 import {
   Dialog,
@@ -19,7 +19,6 @@ import {
 } from "@/components/ui/dialog";
 import { useEffect, useState } from "react";
 import { Checkbox } from "@/components/ui/checkbox";
-import { emit } from "@tauri-apps/api/event";
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import type { VoiceUser } from "@/types";
 import { useConfigValue } from "@/hooks/use-config-value";

diff --git a/apps/desktop/src/views/settings/join-history.tsx b/apps/desktop/src/views/settings/join-history.tsx
@@ -9,14 +9,13 @@ import { Event } from "@/constants";
 import { useToast } from "@/components/ui/use-toast";
 import { requestPermission, sendNotification } from "@tauri-apps/plugin-notification";
 import { Checkbox } from "@/components/ui/checkbox";
-import { Store } from "tauri-plugin-store-api";
+import Config from "@/config";
 import type { JoinHistoryLogUser } from "@/types";
-import { emit } from "@tauri-apps/api/event";
 import { useConfigValue } from "@/hooks/use-config-value";
+import { emit } from "@tauri-apps/api/event";
 
 const MAX_LOG_LENGTH = 420;
 
-const store = new Store("config.json");
 export const JoinHistory = () => {
   const [userLog, setUserLog] = useState<JoinHistoryLogUser[]>([]);
   const { value: joinHistoryNotifications } = useConfigValue("joinHistoryNotifications");
@@ -52,6 +51,12 @@ export const JoinHistory = () => {
     });
   }, []);
 
+  // keep the notifications toggle in sync with the config
+  useEffect(() => {
+    // HACK: add a ref to avoid stale closure
+    notificationsEnabledRef.current = joinHistoryNotifications;
+  }, [joinHistoryNotifications]);
+
   const resetUserLog = () => {
     setUserLog([]);
   };
@@ -67,9 +72,8 @@ export const JoinHistory = () => {
             id="notification"
             checked={joinHistoryNotifications}
             onCheckedChange={async () => {
-              const newValue = !joinHistoryNotifications;
-              await store.set("joinHistoryNotifications", newValue);
-              await store.save();
+              await Config.set("joinHistoryNotifications", !joinHistoryNotifications);
+              await emit("config_update", await Config.getConfig());
             }}
           />
           <label