feat: update script with new tahoe position for checkbox

Author: cmorten

src/macOS/enableDoNotDisturb.ts

@@ -37,10 +37,16 @@ set command to "
 my withTimeout(command, timeoutSeconds)
 `;
 
-const enableFocusModeVenturaAppleScript = (locale: string) => {
+const enableFocusModeVenturaAppleScript = (
+  locale: string,
+  platformMajor: number
+) => {
   // TODO: attempt to rewrite scripts without any locale specific instructions
   // so this setup can be used regardless of user locale preferences.
   const center = locale.trim() === "en_GB" ? "Centre" : "Center";
+  // Tahoe moved the position of the DND checkbox in Control Center
+  const position =
+    platformMajor < 25 ? "checkbox 2 of group 1" : "checkbox 7 of group 1";
 
   return `-- Startup delay to reduce chance of "Application isn't running (-600)" errors
 delay 1
@@ -61,7 +67,7 @@ set command to "
     tell its application process \\"Control ${center}\\"
       tell its window 1
         -- Check if Do Not Disturb already enabled
-        set doNotDisturbCheckbox to checkbox 2 of group 1
+        set doNotDisturbCheckbox to ${position}
         set doNotDisturbCheckboxStatus to value of doNotDisturbCheckbox as boolean
 
         tell doNotDisturbCheckbox
@@ -87,98 +93,6 @@ my withTimeout(command, timeoutSeconds)
 `;
 };
 
-const enableFocusModeTahoeAppleScript = (locale: string) => {
-  // TODO: attempt to rewrite scripts without any locale specific instructions
-  // so this setup can be used regardless of user locale preferences.
-  const center = locale.trim() === "en_GB" ? "Centre" : "Center";
-
-  return `-- Startup delay to reduce chance of "Application isn't running (-600)" errors
-delay 1
-
-on findDoNotDisturb(e)
-  tell application "System Events"
-    try
-      log ("Checking element: ")
-      try
-        log (" - name: " & (name of e))
-      end try
-      try
-        log (" - role: " & (role of e))
-      end try
-      try
-        log (" - description: " & (description of e))
-      end try
-      try
-        log (" - value: " & (value of e))
-      end try
-      try
-        log (" - help: " & (help of e))
-      end try
-      try
-        log (" - title: " & (title of e))
-      end try
-      try
-        log (" - identifier: " & (identifier of e))
-      end try
-
-      if name of e is "Focus" then
-        return e
-      end if
-    end try
-
-    try
-      repeat with k in UI elements of e
-        set found to my findDoNotDisturb(k)
-        if found is not missing value then return found
-      end repeat
-    end try
-  end tell
-
-  return missing value
-end findDoNotDisturb
-
--- Open Control Center drop down
-tell application "System Events"
-  key down 63
-  keystroke "c"
-  delay 0.5
-  key up "c"
-  key up 63
-end tell
-
-tell application "System Events"
-  tell process "Control ${center}"
-    set roots to UI elements of window 1
-
-    repeat with r in roots
-      set doNotDisturbCheckbox to my findDoNotDisturb(r)
-      if doNotDisturbCheckbox is not missing value then exit repeat
-    end repeat
-
-    -- Toggle Do Not Disturb
-    if doNotDisturbCheckbox is not missing value then
-      set doNotDisturbCheckboxStatus to value of doNotDisturbCheckbox as boolean
-
-      tell doNotDisturbCheckbox
-        if doNotDisturbCheckboxStatus is false then
-          perform action 1 of doNotDisturbCheckbox
-        end if
-      end tell
-    end if
-  end tell
-end tell
-
--- Close Control Center drop down
-tell application "System Events"
-  key down 63
-  key down "c"
-  delay 0.5
-  key up "c"
-  key up 63
-end tell
-`;
-};
-
 export async function enableDoNotDisturb() {
   const platformMajor = Number(os.version().split("Version ")[1].split(".")[0]);
 
@@ -188,21 +102,12 @@ export async function enableDoNotDisturb() {
     } else if (platformMajor === 21) {
       // From MacOS 12 Monterey (Darwin 21) there is no known way to enable DND via system defaults
       await retryOnError(() => runAppleScript(enableFocusModeAppleScript));
-    } else if (platformMajor < 25) {
-      const { stdout: locale } = await promisify(exec)(getLocale);
-
-      // From MacOS 13 Ventura (Darwin 22) there is no known way to enable DND via system settings
-      await retryOnError(() =>
-        runAppleScript(enableFocusModeVenturaAppleScript(locale))
-      );
     } else {
       const { stdout: locale } = await promisify(exec)(getLocale);
 
-      // From MacOS 26 Tahoe (Darwin 25) there is no known way to enable DND via system settings
+      // From MacOS 13 Ventura (Darwin 22) there is no known way to enable DND via system settings
       await retryOnError(() =>
-        runAppleScript(enableFocusModeTahoeAppleScript(locale), {
-          wrapped: false,
-        })
+        runAppleScript(enableFocusModeVenturaAppleScript(locale, platformMajor))
       );
     }
   } catch (e) {

src/macOS/runAppleScript.ts

@@ -5,12 +5,8 @@ export const DEFAULT_MAX_BUFFER = 1000 * 1000 * 100;
 
 export async function runAppleScript<T = string | void>(
   script: string,
-  {
-    timeout = DEFAULT_TIMEOUT,
-    wrapped = true,
-  }: { timeout?: number; wrapped?: boolean } = {
+  { timeout = DEFAULT_TIMEOUT } = {
     timeout: DEFAULT_TIMEOUT,
-    wrapped: true,
   }
 ): Promise<T> {
   const scriptWithTimeout = `
@@ -61,7 +57,7 @@ end doWithTimeout
       }
     );
 
-    child.stdin.write(wrapped ? scriptWithTimeout : script);
+    child.stdin.write(scriptWithTimeout);
     child.stdin.end();
   })) as unknown as T;
 }