My Feeds -> feeds. Fix feeds url

jcsalterego · Sep 27, 2023 · 1059a23 · 1059a23
1 parent d58ebaa
commit 1059a23
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Sky/Base.lproj/Main.storyboard b/Sky/Base.lproj/Main.storyboard
@@ -324,9 +324,9 @@
                                                 <action selector="actionViewSearch:" target="Ady-hI-5gd" id="Xvq-pi-8Ym"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="My Feeds" keyEquivalent="3" id="ut9-B8-PyY" userLabel="My Feeds">
+                                        <menuItem title="Feeds" keyEquivalent="3" id="ut9-B8-PyY" userLabel="Feeds">
                                             <connections>
-                                                <action selector="actionViewMyFeeds:" target="Ady-hI-5gd" id="0Y3-cb-mgg"/>
+                                                <action selector="actionViewFeeds:" target="Ady-hI-5gd" id="0Y3-cb-mgg"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem title="Notifications" keyEquivalent="4" id="mfB-kZ-eV6" userLabel="Notifications">

diff --git a/Sky/Jumpbar/JumpbarItem.swift b/Sky/Jumpbar/JumpbarItem.swift
@@ -6,7 +6,7 @@
 enum JumpbarDestination: Decodable, Encodable {
     case home
     case search
-    case myFeeds
+    case feeds
     case notifications
     case moderation
     case profile

diff --git a/Sky/Jumpbar/JumpbarViewController.swift b/Sky/Jumpbar/JumpbarViewController.swift
@@ -69,8 +69,8 @@ class JumpbarViewController:
             case .search:
                 mainViewController?.actionViewSearch(nil)
                 break
-            case .myFeeds:
-                mainViewController?.actionViewMyFeeds(nil)
+            case .feeds:
+                mainViewController?.actionViewFeeds(nil)
                 break
             case .feed:
                 mainViewController?.goToFeed(item.value)
@@ -132,7 +132,7 @@ class JumpbarViewController:
         jumpbarItems.append(JumpbarItem(
             label: "Search", value: "search", destination: .search))
         jumpbarItems.append(JumpbarItem(
-            label: "My Feeds", value: "my feeds", destination: .myFeeds))
+            label: "Feeds", value: "feeds", destination: .feeds))
 
         let localStorageMirror = AppDelegate.shared.localStorageMirror
         if let rootJsonData = localStorageMirror["root"]?.data(using:.utf8) {

diff --git a/Sky/ViewController.swift b/Sky/ViewController.swift
@@ -169,14 +169,14 @@ class ViewController: NSViewController {
         )
     }
 
-    @IBAction func actionViewMyFeeds(_ sender: Any?) {
+    @IBAction func actionViewFeeds(_ sender: Any?) {
         let checkLoadNew = (webView.url!.absoluteString == SkyUrls.feeds)
         self.webView.evaluateJavaScript(
             Scripts.navigateNavbar(
                 checkLoadNew: checkLoadNew,
-                label: "My Feeds",
+                label: "Feeds",
                 index: 2,
-                url: SkyUrls.notifications
+                url: SkyUrls.feeds
             )
         )
     }

diff --git a/Sky/WindowDelegate.swift b/Sky/WindowDelegate.swift
@@ -33,7 +33,7 @@ class WindowDelegate: NSObject, NSWindowDelegate {
         let profileMenuItem = viewMenu?.item(withTitle: "Profile")
         let settingsMenuItem = viewMenu?.item(withTitle: "Settings")
 
-        // COMMON: home, search, my feeds, notifications
+        // COMMON: home, search, feeds, notifications
         if desktopMode {
             // SHOW: moderation, profile, settings
             showMenuItem(moderationMenuItem!, commandNumber: 5)