From 5a856ce99d679e6a936ce792a82d8b10b7d08106 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Thu, 12 Sep 2024 14:05:12 -0500
Subject: [PATCH 01/18] com.apple.InterfaceBuilder.CocoaPlugin and
 com.apple.WebKit2IBPlugin version upgrades?

---
 Sky/Base.lproj/Main.storyboard | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sky/Base.lproj/Main.storyboard b/Sky/Base.lproj/Main.storyboard
index 2283fd9..98c6854 100644
--- a/Sky/Base.lproj/Main.storyboard
+++ b/Sky/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
-        <plugIn identifier="com.apple.WebKit2IBPlugin" version="22689"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22690"/>
+        <plugIn identifier="com.apple.WebKit2IBPlugin" version="22690"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>

From bc119cfc5bc9130154f205e7519c059da94f248d Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Fri, 13 Sep 2024 13:13:04 -0500
Subject: [PATCH 02/18] SkyUrls.messages points to \(root)/messages

---
 Sky/SkyUrls.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Sky/SkyUrls.swift b/Sky/SkyUrls.swift
index 6419e51..d1b015f 100644
--- a/Sky/SkyUrls.swift
+++ b/Sky/SkyUrls.swift
@@ -13,4 +13,5 @@ enum SkyUrls {
     static let notifications = "\(root)/notifications"
     static let moderation = "\(root)/moderation"
     static let settings = "\(root)/settings"
+    static let messages = "\(root)/messages"
 }

From 8b70f9de980ba1ac2e3924b055af3eb0c8a54489 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Fri, 13 Sep 2024 13:13:26 -0500
Subject: [PATCH 03/18] actionViewChat (unused)

---
 Sky/ViewController.swift | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Sky/ViewController.swift b/Sky/ViewController.swift
index c25517e..45eb637 100644
--- a/Sky/ViewController.swift
+++ b/Sky/ViewController.swift
@@ -174,6 +174,18 @@ class ViewController: NSViewController {
         )
     }
 
+    @IBAction func actionViewChat(_ sender: Any?) {
+        let checkLoadNew = (webView.url!.absoluteString == SkyUrls.messages)
+        self.webView.evaluateJavaScript(
+            Scripts.navigateNavbar(
+                checkLoadNew: checkLoadNew,
+                label: "Chat",
+                index: -1,
+                url: SkyUrls.messages
+            )
+        )
+    }
+
     @IBAction func actionViewProfile(_ sender: Any?) {
         self.webView.evaluateJavaScript(
             Scripts.navigateNavbar(

From dec802eafaefa364cd5fb42588fe26384f429bcb Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Fri, 13 Sep 2024 13:25:14 -0500
Subject: [PATCH 04/18] Fix view section keybindings between full Desktop mode
 and non-Desktop mode

---
 Sky/Base.lproj/Main.storyboard | 24 ++++++++++++------------
 Sky/WindowDelegate.swift       | 28 +++++++++++++++++-----------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/Sky/Base.lproj/Main.storyboard b/Sky/Base.lproj/Main.storyboard
index 98c6854..40970b2 100644
--- a/Sky/Base.lproj/Main.storyboard
+++ b/Sky/Base.lproj/Main.storyboard
@@ -324,25 +324,25 @@
                                                 <action selector="actionViewSearch:" target="Ady-hI-5gd" id="Xvq-pi-8Ym"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Feeds" keyEquivalent="3" id="ut9-B8-PyY" userLabel="Feeds">
+                                        <menuItem title="Notifications" keyEquivalent="3" id="mfB-kZ-eV6" userLabel="Notifications">
                                             <connections>
-                                                <action selector="actionViewFeeds:" target="Ady-hI-5gd" id="0Y3-cb-mgg"/>
+                                                <action selector="actionViewNotifications:" target="Ady-hI-5gd" id="GTf-G1-HiP"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Notifications" keyEquivalent="4" id="mfB-kZ-eV6" userLabel="Notifications">
+                                        <menuItem title="Chat" keyEquivalent="4" id="ut9-B8-PyY" userLabel="Feeds">
                                             <connections>
-                                                <action selector="actionViewNotifications:" target="Ady-hI-5gd" id="GTf-G1-HiP"/>
+                                                <action selector="actionViewChat:" target="Ady-hI-5gd" id="C1X-gb-kmo"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Lists" hidden="YES" id="JLM-9s-Neh" userLabel="Lists">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                        <menuItem title="Feeds" keyEquivalent="5" id="6am-i1-GKh" userLabel="Feeds">
                                             <connections>
-                                                <action selector="actionViewLists:" target="Ady-hI-5gd" id="G7a-np-wqG"/>
+                                                <action selector="actionViewFeeds:" target="Ady-hI-5gd" id="8mY-Vt-gu7"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Moderation" hidden="YES" id="W0R-Jf-REN" userLabel="Moderation">
+                                        <menuItem title="Lists" hidden="YES" id="JLM-9s-Neh" userLabel="Lists">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
-                                                <action selector="actionViewModeration:" target="Ady-hI-5gd" id="6S8-Ij-vzC"/>
+                                                <action selector="actionViewLists:" target="Ady-hI-5gd" id="G7a-np-wqG"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem title="Profile" hidden="YES" id="LZ2-q5-Ixa" userLabel="Profile">
@@ -617,7 +617,7 @@
                                                             <rect key="frame" x="8" y="0.0" width="421" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ldB-0K-Pbh">
+                                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ldB-0K-Pbh">
                                                                     <rect key="frame" x="0.0" y="0.0" width="421" height="16"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="ufj-mp-s6u">
@@ -728,7 +728,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="480" height="279"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Gcw-JG-r8m">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Gcw-JG-r8m">
                                 <rect key="frame" x="0.0" y="250" width="480" height="29"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" enabled="NO" drawsBackground="YES" id="DUY-Us-eia">
@@ -776,7 +776,7 @@
                                                             <rect key="frame" x="18" y="0.0" width="443" height="24"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lZ2-Tc-YzK">
+                                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lZ2-Tc-YzK">
                                                                     <rect key="frame" x="0.0" y="0.0" width="443" height="24"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="TTf-rB-auk">
diff --git a/Sky/WindowDelegate.swift b/Sky/WindowDelegate.swift
index aa8bfe9..80ca9f9 100644
--- a/Sky/WindowDelegate.swift
+++ b/Sky/WindowDelegate.swift
@@ -29,27 +29,33 @@ class WindowDelegate: NSObject, NSWindowDelegate {
         let mainMenu = NSApplication.shared.mainMenu!
         let viewMenu = mainMenu.item(withTitle: "View")?.submenu
 
+        let homeMenuItem = viewMenu?.item(withTitle: "Home")
+        let searchMenuItem = viewMenu?.item(withTitle: "Search")
+        let notificationsMenuItem = viewMenu?.item(withTitle: "Notifications")
+        let chatMenuItem = viewMenu?.item(withTitle: "Chat")
+        let feedsMenuItem = viewMenu?.item(withTitle: "Feeds")
         let listsMenuItem = viewMenu?.item(withTitle: "Lists")
-        let moderationMenuItem = viewMenu?.item(withTitle: "Moderation")
         let profileMenuItem = viewMenu?.item(withTitle: "Profile")
         let settingsMenuItem = viewMenu?.item(withTitle: "Settings")
 
-        // COMMON: home, search, feeds, notifications
+        showMenuItem(homeMenuItem!, commandNumber: 1)
+        showMenuItem(searchMenuItem!, commandNumber: 2)
+
         if desktopMode {
-            // SHOW: moderation, profile, settings
-            showMenuItem(listsMenuItem!, commandNumber: 5)
-            showMenuItem(moderationMenuItem!, commandNumber: 6)
+            showMenuItem(notificationsMenuItem!, commandNumber: 3)
+            showMenuItem(chatMenuItem!, commandNumber: 4)
+            showMenuItem(feedsMenuItem!, commandNumber: 5)
+            showMenuItem(listsMenuItem!, commandNumber: 6)
             showMenuItem(profileMenuItem!, commandNumber: 7)
             showMenuItem(settingsMenuItem!, commandNumber: 8)
         } else {
-            // hide moderation, settings, profile
+            hideMenuItem(notificationsMenuItem!)
+            showMenuItem(chatMenuItem!, commandNumber: 3)
+            showMenuItem(notificationsMenuItem!, commandNumber: 4)
+            hideMenuItem(feedsMenuItem!)
             hideMenuItem(listsMenuItem!)
-            hideMenuItem(moderationMenuItem!)
-            hideMenuItem(settingsMenuItem!)
-            hideMenuItem(profileMenuItem!)
-
-            // SHOW: profile
             showMenuItem(profileMenuItem!, commandNumber: 5)
+            hideMenuItem(settingsMenuItem!)
         }
     }
 

From 5623493091b0b4f3ea36115783f01a4c3a75863d Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Fri, 13 Sep 2024 13:27:15 -0500
Subject: [PATCH 05/18] Lower MIN_DESKTOP_WIDTH to 815.0

---
 Sky/WindowDelegate.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sky/WindowDelegate.swift b/Sky/WindowDelegate.swift
index 80ca9f9..924f960 100644
--- a/Sky/WindowDelegate.swift
+++ b/Sky/WindowDelegate.swift
@@ -8,7 +8,7 @@ import AppKit
 
 class WindowDelegate: NSObject, NSWindowDelegate {
 
-    let MIN_DESKTOP_WIDTH = 1230.0
+    let MIN_DESKTOP_WIDTH = 815.0
     var lastDesktopMode: Bool? = nil
 
     func windowWillResize(_ sender: NSWindow, to frameSize: NSSize) -> NSSize {

From d2a26d53feda481020bb62dfeedf0683a084fa10 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Fri, 13 Sep 2024 13:34:07 -0500
Subject: [PATCH 06/18] Fix menuItem title

---
 Sky/Base.lproj/Main.storyboard | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sky/Base.lproj/Main.storyboard b/Sky/Base.lproj/Main.storyboard
index 40970b2..048c162 100644
--- a/Sky/Base.lproj/Main.storyboard
+++ b/Sky/Base.lproj/Main.storyboard
@@ -329,7 +329,7 @@
                                                 <action selector="actionViewNotifications:" target="Ady-hI-5gd" id="GTf-G1-HiP"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Chat" keyEquivalent="4" id="ut9-B8-PyY" userLabel="Feeds">
+                                        <menuItem title="Chat" keyEquivalent="4" id="ut9-B8-PyY">
                                             <connections>
                                                 <action selector="actionViewChat:" target="Ady-hI-5gd" id="C1X-gb-kmo"/>
                                             </connections>

From e8aacf8caeadc85717a2226327e51f83d09e2055 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Fri, 13 Sep 2024 14:58:15 -0500
Subject: [PATCH 07/18] Fix menu between desktop and compact mode

---
 Sky/Base.lproj/Main.storyboard | 127 +++++++++++++++++++++++----------
 Sky/WindowDelegate.swift       |  63 ++++++++--------
 2 files changed, 116 insertions(+), 74 deletions(-)

diff --git a/Sky/Base.lproj/Main.storyboard b/Sky/Base.lproj/Main.storyboard
index 048c162..eafad42 100644
--- a/Sky/Base.lproj/Main.storyboard
+++ b/Sky/Base.lproj/Main.storyboard
@@ -314,48 +314,97 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="View" autoenablesItems="NO" id="oIs-FJ-jib">
                                     <items>
-                                        <menuItem title="Home" keyEquivalent="1" id="LE2-aR-0XJ" userLabel="Home">
-                                            <connections>
-                                                <action selector="actionViewHome:" target="Ady-hI-5gd" id="6gm-YF-Bty"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Search" keyEquivalent="2" id="Knq-La-itP" userLabel="Search">
-                                            <connections>
-                                                <action selector="actionViewSearch:" target="Ady-hI-5gd" id="Xvq-pi-8Ym"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Notifications" keyEquivalent="3" id="mfB-kZ-eV6" userLabel="Notifications">
-                                            <connections>
-                                                <action selector="actionViewNotifications:" target="Ady-hI-5gd" id="GTf-G1-HiP"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Chat" keyEquivalent="4" id="ut9-B8-PyY">
-                                            <connections>
-                                                <action selector="actionViewChat:" target="Ady-hI-5gd" id="C1X-gb-kmo"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Feeds" keyEquivalent="5" id="6am-i1-GKh" userLabel="Feeds">
-                                            <connections>
-                                                <action selector="actionViewFeeds:" target="Ady-hI-5gd" id="8mY-Vt-gu7"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Lists" hidden="YES" id="JLM-9s-Neh" userLabel="Lists">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="actionViewLists:" target="Ady-hI-5gd" id="G7a-np-wqG"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Profile" hidden="YES" id="LZ2-q5-Ixa" userLabel="Profile">
+                                        <menuItem title="Desktop View" hidden="YES" id="mII-Iu-Fht">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="actionViewProfile:" target="Ady-hI-5gd" id="J9g-HD-AOg"/>
-                                            </connections>
+                                            <menu key="submenu" title="Desktop View" id="33W-cf-Hh4">
+                                                <items>
+                                                    <menuItem title="Home" id="LE2-aR-0XJ" userLabel="Home">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="actionViewHome:" target="Ady-hI-5gd" id="6gm-YF-Bty"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Search" id="Knq-La-itP" userLabel="Search">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="actionViewSearch:" target="Ady-hI-5gd" id="Xvq-pi-8Ym"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Notifications" id="mfB-kZ-eV6" userLabel="Notifications">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="actionViewNotifications:" target="Ady-hI-5gd" id="GTf-G1-HiP"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Chat" id="ut9-B8-PyY">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="actionViewChat:" target="Ady-hI-5gd" id="C1X-gb-kmo"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Feeds" id="6am-i1-GKh" userLabel="Feeds">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="actionViewFeeds:" target="Ady-hI-5gd" id="8mY-Vt-gu7"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Lists" id="JLM-9s-Neh" userLabel="Lists">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="actionViewLists:" target="Ady-hI-5gd" id="G7a-np-wqG"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Profile" id="LZ2-q5-Ixa" userLabel="Profile">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="actionViewProfile:" target="Ady-hI-5gd" id="J9g-HD-AOg"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Settings" id="Aqg-zh-zCt" userLabel="Settings">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="actionViewSettings:" target="Ady-hI-5gd" id="noE-Wq-eGt"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
                                         </menuItem>
-                                        <menuItem title="Settings" hidden="YES" id="Aqg-zh-zCt" userLabel="Settings">
+                                        <menuItem title="Compact View" hidden="YES" id="IAo-xF-Y6u" userLabel="Compact View">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="actionViewSettings:" target="Ady-hI-5gd" id="noE-Wq-eGt"/>
-                                            </connections>
+                                            <menu key="submenu" title="Compact View" id="4er-wd-MDx">
+                                                <items>
+                                                    <menuItem title="Home" id="ANR-Pm-9hg" userLabel="Home">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="actionViewHome:" target="Ady-hI-5gd" id="Hft-bu-bfn"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Search" id="oBN-kV-dJb" userLabel="Search">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="actionViewSearch:" target="Ady-hI-5gd" id="9D8-QB-33u"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Chat" id="LDf-NQ-Rd6">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="actionViewChat:" target="Ady-hI-5gd" id="wxB-AX-Ls0"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Notifications" id="11H-wB-xFK" userLabel="Notifications">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="actionViewNotifications:" target="Ady-hI-5gd" id="XNN-YG-mVE"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Profile" id="Qxt-A4-tqJ" userLabel="Profile">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="actionViewProfile:" target="Ady-hI-5gd" id="eHk-Lw-u3J"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="2GO-Mh-Pot"/>
                                         <menuItem title="Actual Size" keyEquivalent="0" id="vBi-ho-dYr">
diff --git a/Sky/WindowDelegate.swift b/Sky/WindowDelegate.swift
index 924f960..4f08218 100644
--- a/Sky/WindowDelegate.swift
+++ b/Sky/WindowDelegate.swift
@@ -27,48 +27,41 @@ class WindowDelegate: NSObject, NSWindowDelegate {
 
     func updateViewNavigation(_ desktopMode: Bool) {
         let mainMenu = NSApplication.shared.mainMenu!
-        let viewMenu = mainMenu.item(withTitle: "View")?.submenu
-
-        let homeMenuItem = viewMenu?.item(withTitle: "Home")
-        let searchMenuItem = viewMenu?.item(withTitle: "Search")
-        let notificationsMenuItem = viewMenu?.item(withTitle: "Notifications")
-        let chatMenuItem = viewMenu?.item(withTitle: "Chat")
-        let feedsMenuItem = viewMenu?.item(withTitle: "Feeds")
-        let listsMenuItem = viewMenu?.item(withTitle: "Lists")
-        let profileMenuItem = viewMenu?.item(withTitle: "Profile")
-        let settingsMenuItem = viewMenu?.item(withTitle: "Settings")
-
-        showMenuItem(homeMenuItem!, commandNumber: 1)
-        showMenuItem(searchMenuItem!, commandNumber: 2)
-
+        let viewMenu = mainMenu.item(withTitle: "View")!.submenu!
+        let desktopViewMenu = viewMenu.item(withTitle: "Desktop View")!.submenu!
+        let compactViewMenu = viewMenu.item(withTitle: "Compact View")!.submenu!
+        clearViewItemsUntilSeparator(viewMenu)
         if desktopMode {
-            showMenuItem(notificationsMenuItem!, commandNumber: 3)
-            showMenuItem(chatMenuItem!, commandNumber: 4)
-            showMenuItem(feedsMenuItem!, commandNumber: 5)
-            showMenuItem(listsMenuItem!, commandNumber: 6)
-            showMenuItem(profileMenuItem!, commandNumber: 7)
-            showMenuItem(settingsMenuItem!, commandNumber: 8)
+            copySubmenuToBeginning(desktopViewMenu, viewMenu)
         } else {
-            hideMenuItem(notificationsMenuItem!)
-            showMenuItem(chatMenuItem!, commandNumber: 3)
-            showMenuItem(notificationsMenuItem!, commandNumber: 4)
-            hideMenuItem(feedsMenuItem!)
-            hideMenuItem(listsMenuItem!)
-            showMenuItem(profileMenuItem!, commandNumber: 5)
-            hideMenuItem(settingsMenuItem!)
+            copySubmenuToBeginning(compactViewMenu, viewMenu)
         }
     }
 
-    func showMenuItem(_ menuItem: NSMenuItem, commandNumber: Int) {
-        menuItem.isHidden = false
-        menuItem.keyEquivalent = "\(commandNumber)"
-        menuItem.keyEquivalentModifierMask = .command
+    func copySubmenuToBeginning(_ sourceMenu: NSMenu?, _ targetMenu: NSMenu) {
+        for index in 0..<sourceMenu!.numberOfItems {
+            let srcMenuItem = sourceMenu!.item(at: index)!
+            let menuItem = srcMenuItem.copy() as! NSMenuItem
+            let modifierNumber = index + 1
+            menuItem.keyEquivalent = "\(modifierNumber)"
+            menuItem.keyEquivalentModifierMask = .command
+            targetMenu.insertItem(menuItem, at: index)
+        }
     }
 
-    func hideMenuItem(_ menuItem: NSMenuItem) {
-        menuItem.isHidden = true
-        menuItem.keyEquivalent = ""
-        menuItem.keyEquivalentModifierMask = NSEvent.ModifierFlags()
+    func clearViewItemsUntilSeparator(_ viewMenu: NSMenu) {
+        var index = 0
+        while index < viewMenu.numberOfItems {
+            let menuItem = viewMenu.item(at: index)
+            if menuItem?.isSeparatorItem == true {
+                break
+            } else if ["Desktop View", "Compact View"].contains(menuItem?.title) {
+                index += 1
+                continue
+            } else {
+                viewMenu.removeItem(at: index)
+            }
+        }
     }
 
 }

From 9689d28ad48e06dd687a650238dddd577a0a2ff3 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Fri, 13 Sep 2024 20:31:35 -0500
Subject: [PATCH 08/18] inject user scripts .atDocumentStart

---
 Sky/JsLoader.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sky/JsLoader.swift b/Sky/JsLoader.swift
index e0b0873..7aeb95b 100644
--- a/Sky/JsLoader.swift
+++ b/Sky/JsLoader.swift
@@ -14,7 +14,7 @@ class JsLoader {
         let source = JsLoader.loadScriptContents(name, context)
         return WKUserScript(
             source: source,
-            injectionTime: .atDocumentEnd,
+            injectionTime: .atDocumentStart,
             forMainFrameOnly: false
         )
     }

From 72d81829d643689170244ddb43618d83199298c1 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Fri, 13 Sep 2024 20:32:04 -0500
Subject: [PATCH 09/18] handle Request and URL request types in hook_fetch

---
 Sky/Scripts/hook_fetch.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Sky/Scripts/hook_fetch.js b/Sky/Scripts/hook_fetch.js
index 6a0fe58..a8bdceb 100644
--- a/Sky/Scripts/hook_fetch.js
+++ b/Sky/Scripts/hook_fetch.js
@@ -1,7 +1,18 @@
 $INCLUDE("_filters.js");
 
 async function overrideGet(...args) {
-    const url = args[0];
+    let request = args[0];
+    let url = null;
+    if (request.constructor.name === "Request") {
+        url = request.url;
+    } else if (request.constructor.name === "URL") {
+        url = request.href;
+    } else if (request.constructor.name === "String") {
+        url = request;
+    } else {
+        console.warn("Unknown request type", request);
+        return window._fetch(...args);
+    }
     const response = await window._fetch(...args);
     const contentType = response.headers.get("Content-Type");
     if (
@@ -21,7 +32,6 @@ async function overrideGet(...args) {
     });
 
     let altered = false;
-
     let isSearch = url.indexOf("https://search.bsky.social/search/posts") === 0;
     let featureOrderPosts = localStorage.getItem("featureOrderPosts") === "yes";
     let featureHideHomeReplies = localStorage.getItem("featureHideHomeReplies") === "yes";

From 93d8cb9af2a963e0012938d72c468e66b44c3802 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Sat, 14 Sep 2024 06:30:11 -0500
Subject: [PATCH 10/18] Remove toggle_dark_mode

---
 Sky/Base.lproj/Main.storyboard  |  6 ------
 Sky/Scripts.swift               |  6 ------
 Sky/Scripts/toggle_dark_mode.js | 34 ---------------------------------
 Sky/ViewController.swift        |  6 ------
 4 files changed, 52 deletions(-)
 delete mode 100644 Sky/Scripts/toggle_dark_mode.js

diff --git a/Sky/Base.lproj/Main.storyboard b/Sky/Base.lproj/Main.storyboard
index eafad42..552c173 100644
--- a/Sky/Base.lproj/Main.storyboard
+++ b/Sky/Base.lproj/Main.storyboard
@@ -422,12 +422,6 @@
                                                 <action selector="actionZoomOut:" target="Ady-hI-5gd" id="9J8-9Q-oaz"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="vWQ-2z-ZVe"/>
-                                        <menuItem title="Toggle Dark Mode" keyEquivalent="D" id="sDs-WP-qC5">
-                                            <connections>
-                                                <action selector="actionToggleDarkMode:" target="Ady-hI-5gd" id="fJI-7C-ZPZ"/>
-                                            </connections>
-                                        </menuItem>
                                         <menuItem isSeparatorItem="YES" id="mHh-pj-LA4"/>
                                         <menuItem title="Open in Browser..." keyEquivalent="t" id="k6J-EO-HUe">
                                             <connections>
diff --git a/Sky/Scripts.swift b/Sky/Scripts.swift
index fe7e4fc..65710f0 100644
--- a/Sky/Scripts.swift
+++ b/Sky/Scripts.swift
@@ -49,10 +49,4 @@ class Scripts {
         )
     }
 
-    static func toggleDarkMode() -> String {
-        return JsLoader.loadScriptContents(
-            "Scripts/toggle_dark_mode", [:]
-        )
-    }
-
 }
diff --git a/Sky/Scripts/toggle_dark_mode.js b/Sky/Scripts/toggle_dark_mode.js
deleted file mode 100644
index b684270..0000000
--- a/Sky/Scripts/toggle_dark_mode.js
+++ /dev/null
@@ -1,34 +0,0 @@
-function toggleDarkMode() {
-    let buttons = Array.from(
-        document.querySelectorAll("div[aria-label]")
-    ).filter((elem) => {
-        let ariaLabel = elem.getAttribute("aria-label");
-        return ariaLabel.match(/toggle .* mode/i);
-    });
-    if (buttons.length === 0) {
-        let answer = window.confirm(
-            "Toggling dark mode requires reloading the page. Would you like to proceed?"
-        );
-        if (answer) {
-            let json = localStorage.root;
-            let doc = JSON.parse(json);
-            let changed = false;
-            if (doc.shell.colorMode === "light") {
-                doc.shell.colorMode = "dark";
-                changed = true;
-            } else if (doc.shell.colorMode === "dark") {
-                doc.shell.colorMode = "light";
-                changed = true;
-            }
-            if (changed) {
-                let jsonReturn = JSON.stringify(doc, null, 0);
-                localStorage.setItem("root", jsonReturn);
-                window.webkit.messageHandlers.windowReload.postMessage({});
-            }
-        }
-    } else {
-        buttons[0].click();
-    }
-}
-
-toggleDarkMode();
diff --git a/Sky/ViewController.swift b/Sky/ViewController.swift
index 45eb637..6c44783 100644
--- a/Sky/ViewController.swift
+++ b/Sky/ViewController.swift
@@ -386,12 +386,6 @@ class ViewController: NSViewController {
         )
     }
 
-    @IBAction func actionToggleDarkMode(_ sender: Any?) {
-        self.webView.evaluateJavaScript(
-            Scripts.toggleDarkMode()
-        )
-    }
-
     @IBAction func actionLaunchJumpbar(_ sender: Any?) {
         if let jumpbarWindowController = AppDelegate.shared.jumpbarWindowController {
             NSApplication.shared.runModal(for: jumpbarWindowController.window!)

From b11e094e107ced09a714bfe375238b8e1b08cd38 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Sat, 14 Sep 2024 06:44:46 -0500
Subject: [PATCH 11/18] Separate user scripts to load at the document start vs
 document end

---
 Sky/JsLoader.swift       |  5 +++--
 Sky/ViewController.swift | 20 ++++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Sky/JsLoader.swift b/Sky/JsLoader.swift
index 7aeb95b..53e3a13 100644
--- a/Sky/JsLoader.swift
+++ b/Sky/JsLoader.swift
@@ -9,12 +9,13 @@ class JsLoader {
 
     class func loadWKUserScript(
         _ name: String,
-        _ context: [String: String] = [:]
+        _ context: [String: String] = [:],
+        _ injectionTime: WKUserScriptInjectionTime = .atDocumentStart
     ) -> WKUserScript {
         let source = JsLoader.loadScriptContents(name, context)
         return WKUserScript(
             source: source,
-            injectionTime: .atDocumentStart,
+            injectionTime: injectionTime,
             forMainFrameOnly: false
         )
     }
diff --git a/Sky/ViewController.swift b/Sky/ViewController.swift
index 6c44783..d200a75 100644
--- a/Sky/ViewController.swift
+++ b/Sky/ViewController.swift
@@ -25,9 +25,12 @@ class ViewController: NSViewController {
     var hideHomeRepliesWkUserScript: WKUserScript?
     var setZoomFactorWkUserScript: WKUserScript?
 
-    let userScripts = [
-        "hook_ctrl_tab",
+    let userScriptsAtDocumentStart = [
         "hook_fetch",
+    ]
+
+    let userScriptsAtDocumentEnd = [
+        "hook_ctrl_tab",
         "hook_history_state",
         "hook_local_storage",
         "hook_window_color_scheme",
@@ -45,10 +48,19 @@ class ViewController: NSViewController {
         for name in scriptMessageHandler.nameFns.keys {
             userContentController.add(scriptMessageHandler, name: name)
         }
-        for userScript in userScripts {
+        for userScript in userScriptsAtDocumentStart {
+            userContentController.addUserScript(
+                JsLoader.loadWKUserScript(
+                    "Scripts/\(userScript)",
+                    [:],
+                    .atDocumentStart))
+        }
+        for userScript in userScriptsAtDocumentEnd {
             userContentController.addUserScript(
                 JsLoader.loadWKUserScript(
-                    "Scripts/\(userScript)"))
+                    "Scripts/\(userScript)",
+                    [:],
+                    .atDocumentEnd))
         }
 
         let orderPosts = AppDelegate.shared.getUserDefaultsOrderPosts()

From 2c7e4db303ef75a3c9b157fc3de20d54c6de34b2 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Sat, 14 Sep 2024 07:03:01 -0500
Subject: [PATCH 12/18] Fix dark/dim/light mode titlebar sync

---
 Sky/ScriptMessageHandler.swift          |  8 ++++---
 Sky/Scripts/hook_window_color_scheme.js | 19 +++++++----------
 Sky/ViewController.swift                | 28 ++++++++++++++++++-------
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/Sky/ScriptMessageHandler.swift b/Sky/ScriptMessageHandler.swift
index eda8c2e..c6e16c2 100644
--- a/Sky/ScriptMessageHandler.swift
+++ b/Sky/ScriptMessageHandler.swift
@@ -46,11 +46,13 @@ class ScriptMessageHandler: NSObject, WKScriptMessageHandler {
 
     func windowColorSchemeChange(_ message: WKScriptMessage) {
         if let messageBody = message.body as? NSDictionary {
-            if let darkMode = messageBody["darkMode"] as? Int {
+            if let darkMode = messageBody["darkMode"] as? Int,
+               let backgroundColor = messageBody["backgroundColor"] as? String
+            {
                 if darkMode == 1 {
-                    viewController.updateTitleBar(.dark)
+                    viewController.updateTitleBar(.dark, backgroundColor: backgroundColor)
                 } else {
-                    viewController.updateTitleBar(.light)
+                    viewController.updateTitleBar(.light, backgroundColor: backgroundColor)
                 }
             }
         }
diff --git a/Sky/Scripts/hook_window_color_scheme.js b/Sky/Scripts/hook_window_color_scheme.js
index 3975acb..2e6d189 100644
--- a/Sky/Scripts/hook_window_color_scheme.js
+++ b/Sky/Scripts/hook_window_color_scheme.js
@@ -1,19 +1,16 @@
 $INCLUDE("_with_retry");
 function setColorScheme(darkMode) {
-    const DARK_MODE_FOREGROUND = "#79787c";
-    const DARK_MODE_BACKGROUND = "#000000";
-    const LIGHT_MODE_FOREGROUND = "#c3c3c3";
-    const LIGHT_MODE_BACKGROUND = "#fafafa";
+    let background = document.body.style.backgroundColor;
+    let foreground = document.body.style.color;
+    if (background === "rgb(255, 255, 255)") {
+        darkMode = false;
+    } else {
+        darkMode = true;
+    }
     window.webkit.messageHandlers.windowColorSchemeChange.postMessage({
         darkMode: darkMode,
+        backgroundColor: background,
     });
-    if (darkMode) {
-        foreground = DARK_MODE_FOREGROUND;
-        background = DARK_MODE_BACKGROUND;
-    } else {
-        foreground = LIGHT_MODE_FOREGROUND;
-        background = LIGHT_MODE_BACKGROUND;
-    }
     let rules = [
         `::-webkit-scrollbar { width: auto }`,
         `::-webkit-scrollbar-track { background: ${background}; }`,
diff --git a/Sky/ViewController.swift b/Sky/ViewController.swift
index d200a75..793c7f0 100644
--- a/Sky/ViewController.swift
+++ b/Sky/ViewController.swift
@@ -409,14 +409,28 @@ class ViewController: NSViewController {
         case light
     }
 
-    func updateTitleBar(_ mode: WindowColorScheme) {
-//        NSLog("mode = \(mode)")
-        switch (mode) {
-        case .dark:
-            self.webView.window!.backgroundColor = NSColor.black
+    func updateTitleBar(_ mode: WindowColorScheme, backgroundColor: String) {
+        if backgroundColor.starts(with:"rgb("),
+            let range = backgroundColor.range(of: #"\((.*?)\)"#, options: .regularExpression)
+        {
+            let result = backgroundColor[range]
+            let trimmedResult = result.trimmingCharacters(in: CharacterSet(charactersIn: "()"))
+            let rgb: [String.SubSequence] = trimmedResult.split(separator: ",")
+            if rgb.count == 3 {
+                let r = CGFloat(Int(rgb[0].trimmingCharacters(in:.whitespaces))!) / 255.0
+                let g = CGFloat(Int(rgb[1].trimmingCharacters(in:.whitespaces))!) / 255.0
+                let b = CGFloat(Int(rgb[2].trimmingCharacters(in:.whitespaces))!) / 255.0
+                self.webView.window!.backgroundColor = NSColor(
+                    red: r,
+                    green: g,
+                    blue: b,
+                    alpha: 1.0
+                )
+            }
+        }
+        if mode == .dark {
             self.webView.window!.appearance = NSAppearance(named: .darkAqua)
-        case .light:
-            self.webView.window!.backgroundColor = NSColor.white
+        } else {
             self.webView.window!.appearance = NSAppearance(named: .aqua)
         }
     }

From f4c4862c0337481546e885af45f5ae42f63755e8 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Sat, 14 Sep 2024 07:29:28 -0500
Subject: [PATCH 13/18] Include unread convos in badge count

---
 Sky/AppDelegate.swift          |  9 +++++++++
 Sky/ScriptMessageHandler.swift | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/Sky/AppDelegate.swift b/Sky/AppDelegate.swift
index 9d336ff..ad08476 100644
--- a/Sky/AppDelegate.swift
+++ b/Sky/AppDelegate.swift
@@ -13,6 +13,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     var lastBadgeCount = 0
     var notificationReadStatuses = [String:Int]()
+    var convoUnreadCounts = [String:Int]()
     var firstRun = true
 
     var mutedTermsHits = 0
@@ -104,12 +105,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     func clearNotifCounts() {
         notificationReadStatuses.removeAll()
+        convoUnreadCounts.removeAll()
     }
 
     func setNotificationReadStatus(uri: String, isRead: Int) {
         notificationReadStatuses[uri] = isRead
     }
 
+    func setConvoUnreadCount(id: String, unreadCount: Int) {
+        convoUnreadCounts[id] = unreadCount
+    }
+
     func refreshBadge() {
 //        NSLog("notificationReadStatuses = \(notificationReadStatuses)")
         var totalBadgeCount = 0
@@ -118,6 +124,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                 totalBadgeCount += 1
             }
         }
+        for (_, unreadCount) in convoUnreadCounts {
+            totalBadgeCount += unreadCount
+        }
         if totalBadgeCount != lastBadgeCount {
             if totalBadgeCount == 0 {
                 NSApp.dockTile.badgeLabel = nil
diff --git a/Sky/ScriptMessageHandler.swift b/Sky/ScriptMessageHandler.swift
index c6e16c2..d148d2a 100644
--- a/Sky/ScriptMessageHandler.swift
+++ b/Sky/ScriptMessageHandler.swift
@@ -84,6 +84,22 @@ class ScriptMessageHandler: NSObject, WKScriptMessageHandler {
         }
     }
 
+    func handleFetchListConversations(_ doc : NSDictionary) {
+        if let convosList = doc["convos"] as? [NSDictionary] {
+            var mutedThreadUris: [String] = []
+            for convo in convosList {
+                if let convoId = convo["id"] as? String,
+                   let convoUnreadCount = convo["unreadCount"] as? Int
+                {
+                    AppDelegate.shared.setConvoUnreadCount(
+                        id: convoId, unreadCount: convoUnreadCount
+                    )
+                }
+            }
+            AppDelegate.shared.refreshBadge()
+        }
+    }
+
     func fetch(_ message: WKScriptMessage) {
         if let messageBody = message.body as? NSDictionary {
             if let urlString = messageBody["url"] as? String,
@@ -92,6 +108,9 @@ class ScriptMessageHandler: NSObject, WKScriptMessageHandler {
                 if urlString.contains("listNotifications") {
                     handleFetchListNotifications(response)
                 }
+                if urlString.contains("listConvos") {
+                    handleFetchListConversations(response)
+                }
             }
         }
     }

From 95c7be47876886c1affa91607e2e497fda2513ca Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Sat, 14 Sep 2024 07:35:58 -0500
Subject: [PATCH 14/18] Fix color scheme sync

---
 Sky/Scripts/hook_window_color_scheme.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Sky/Scripts/hook_window_color_scheme.js b/Sky/Scripts/hook_window_color_scheme.js
index 2e6d189..3a5228f 100644
--- a/Sky/Scripts/hook_window_color_scheme.js
+++ b/Sky/Scripts/hook_window_color_scheme.js
@@ -1,7 +1,8 @@
 $INCLUDE("_with_retry");
-function setColorScheme(darkMode) {
+function updateColorScheme() {
     let background = document.body.style.backgroundColor;
     let foreground = document.body.style.color;
+    let darkMode = false;
     if (background === "rgb(255, 255, 255)") {
         darkMode = false;
     } else {
@@ -21,14 +22,11 @@ function setColorScheme(darkMode) {
     for (let rule of rules) {
         stylesheet.insertRule(rule, stylesheet.rules.length - 1);
     }
-    elems = Array.from(document.querySelectorAll("div")).filter((div) => {
-        return div.scrollHeight > window.innerHeight;
-    });
 }
 
 function setColorSchemeChange() {
     let done = false;
-    let elems = Array.from(document.querySelectorAll("#root div div"));
+    let elems = Array.from(document.querySelectorAll("body"));
     if (elems.length > 0) {
         let elem = elems[0];
         if (elem.dataset.windowColorSchemeObserverSet === undefined) {
@@ -42,11 +40,7 @@ function setColorSchemeChange() {
                     let backgroundColor =
                         window.getComputedStyle(elem).backgroundColor;
                     if (elem.dataset.lastBackgroundColor !== backgroundColor) {
-                        if (backgroundColor === "rgb(0, 0, 0)") {
-                            setColorScheme(true);
-                        } else {
-                            setColorScheme(false);
-                        }
+                        updateColorScheme();
                         elem.dataset.lastBackgroundColor = backgroundColor;
                         break;
                     }

From 74d611313495c4e34ce05c0de2e025714df9d04a Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Sat, 14 Sep 2024 07:38:03 -0500
Subject: [PATCH 15/18] Map Sky.app -> Settings... to /settings

---
 Sky/Base.lproj/Main.storyboard | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Sky/Base.lproj/Main.storyboard b/Sky/Base.lproj/Main.storyboard
index 552c173..455d0ae 100644
--- a/Sky/Base.lproj/Main.storyboard
+++ b/Sky/Base.lproj/Main.storyboard
@@ -23,10 +23,15 @@
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
-                                        <menuItem title="Check for Updates..." id="fv0-HU-nF8">
+                                        <menuItem title="Settings..." keyEquivalent="," id="fv0-HU-nF8" userLabel="Settings...">
+                                            <connections>
+                                                <action selector="actionViewSettings:" target="Ady-hI-5gd" id="8a7-ek-96l"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check for Updates..." id="skY-dr-tsu">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
-                                                <action selector="checkForUpdates:" target="hqL-jg-X44" id="RJJ-Mb-ABn"/>
+                                                <action selector="checkForUpdates:" target="hqL-jg-X44" id="JIL-jg-RpR"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="gFw-en-kLH"/>

From 206db300764c0cf7a78d278f06530c186ea6056a Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Sat, 14 Sep 2024 07:42:38 -0500
Subject: [PATCH 16/18] README keyboard shortcut updates

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index fe73577..92e6932 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ In Compact Mode:
 
 * `⌘-1` Home
 * `⌘-2` Search
-* `⌘-3` Feeds
+* `⌘-3` Chat
 * `⌘-4` Notifications
 * `⌘-5` Profile
 
@@ -38,18 +38,18 @@ In Desktop Mode:
 
 * `⌘-1` Home
 * `⌘-2` Search
-* `⌘-3` Feeds
-* `⌘-4` Notifications
-* `⌘-5` Lists
-* `⌘-6` Moderation
+* `⌘-3` Notifications
+* `⌘-4` Chat
+* `⌘-5` Feed
+* `⌘-6` Lists
 * `⌘-7` Profile
 * `⌘-8` Settings
 
 ### Other
 
+* `⌘-,` Settings...
 * `⌘-K` Jump To...
 * `⌘-T` Open in Browser
-* `⌘-⇧-D` Toggle Dark Mode
 * `⌘-⇧-C` Copy Share URL
 * `^-⌘-⇧-C` Copy Current URL
 

From b312c57c0029ebfd5bd9cc9dafbc88162d640736 Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Sat, 14 Sep 2024 07:45:07 -0500
Subject: [PATCH 17/18] Changelog 0.4.0 items

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 92e6932..2223930 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,15 @@ Check for Updates powered by [Sparkle](https://sparkle-project.org).
 
 ## Changelog
 
+### 0.4.0
+
+* Add (`⌘-,`) to go to the Settings page
+* Fix color scheme sync
+* Remove "Toggle Dark Mode" (for now?)
+* Notification badges now include unread chat messages
+* Fix notification badges
+* Fix keybindings and menu items between Compact and Desktop modes
+
 ### 0.3.9
 
 * Remove Developer Console [#7](https://github.com/jcsalterego/Sky.app/issues/7)

From 76f0ae32b5d3041862e5e5acbfe2b122fcfb210f Mon Sep 17 00:00:00 2001
From: Jerry Chen <jerry@apache.org>
Date: Sat, 14 Sep 2024 07:45:37 -0500
Subject: [PATCH 18/18] VERSION: 0.4.0

---
 README.md      | 2 +-
 Sky/Info.plist | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2223930..1dc7f12 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ keyboard shortcuts, Dark Mode Sync, and notification badges.
 
 _If you're looking for the official Bluesky Social iOS app, [head on over to the App Store](https://apps.apple.com/us/app/bluesky-social/id6444370199)._
 
-The current release is [**0.3.9**](https://github.com/jcsalterego/Sky.app/releases/latest).
+The current release is [**0.4.0**](https://github.com/jcsalterego/Sky.app/releases/latest).
 
 ![](Docs/screenshot.png)
 
diff --git a/Sky/Info.plist b/Sky/Info.plist
index b9e1a6e..ffbe9e0 100644
--- a/Sky/Info.plist
+++ b/Sky/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.10-pre</string>
+	<string>0.4.0</string>
 	<key>CFBundleVersion</key>
-	<string>0.3.10-pre</string>
+	<string>0.4.0</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>