All local timelines now being served by the private web server.

Heartbeat/TimelineViewController.swift

@@ -514,17 +514,10 @@ class TimelineViewController: NSViewController, WKNavigationDelegate
     
     func loadIndexPage()
     {
-        // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-        // Refactoring in progress: moving to timelines served via the private web server.
-        // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-        // Pre-refactor timeline URL.
-        var timelineToLoad = "http://127.0.0.1:42003/index.html"
-        
         //
         // Special case: everyone timeline is loaded from Waystone.
         //
-        
+        var timelineToLoad:String? = nil
         if let currentTimelineID = CurrentTimeline.id
         {
             if currentTimelineID == "everyone"
@@ -535,14 +528,29 @@ class TimelineViewController: NSViewController, WKNavigationDelegate
             {
                 timelineToLoad = "http://127.0.0.1:42003/all-friends-timeline"
             }
+            if currentTimelineID == "private"
+            {
+                timelineToLoad = "http://127.0.0.1:42003/private-timeline"
+            }
+            if currentTimelineID == "public"
+            {
+                timelineToLoad = "http://127.0.0.1:42003/public-timeline"
+            }
             if currentTimelineID != "allfriends" && currentTimelineID != "conversations" && currentTimelineID != "private" && currentTimelineID != "everyone" && currentTimelineID != "public"
             {
                 timelineToLoad = "http://127.0.0.1:42003/conversation-with/\(currentTimelineID)"
             }
         }
         
-        var urlRequest = NSURLRequest(URL: NSURL(string: timelineToLoad)!)
-        webkit.loadRequest(urlRequest)
+        if let timelineToLoad = timelineToLoad
+        {
+            var urlRequest = NSURLRequest(URL: NSURL(string: timelineToLoad)!)
+            webkit.loadRequest(urlRequest)
+        }
+        else
+        {
+            println("❌ Error: Could not find the timeline to load: \(CurrentTimeline.id)")
+        }
     }