From 03ddd83e088893ef8a43f528ca88c9b25f9a73fa Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Fri, 26 Mar 2021 18:13:28 -0400
Subject: [PATCH] Fixing #1436: preferences should show All Site Stories title.

---
 media/js/newsblur/models/folders.js            | 2 +-
 media/js/newsblur/reader/reader_preferences.js | 5 +----
 media/js/newsblur/views/feed_list_view.js      | 6 ++++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/media/js/newsblur/models/folders.js b/media/js/newsblur/models/folders.js
index 3835168ce..93e2349f1 100644
--- a/media/js/newsblur/models/folders.js
+++ b/media/js/newsblur/models/folders.js
@@ -418,4 +418,4 @@ NEWSBLUR.Collections.Folders = Backbone.Collection.extend({
         }
     }
 
-});
\ No newline at end of file
+});
diff --git a/media/js/newsblur/reader/reader_preferences.js b/media/js/newsblur/reader/reader_preferences.js
index d2b3e6827..9cba99a52 100644
--- a/media/js/newsblur/reader/reader_preferences.js
+++ b/media/js/newsblur/reader/reader_preferences.js
@@ -943,10 +943,7 @@ _.extend(NEWSBLUR.ReaderPreferences.prototype, {
     
     make_autoopen_folders: function() {
         var autoopen_folder = NEWSBLUR.Preferences.autoopen_folder;
-        var $folders = NEWSBLUR.utils.make_folders(autoopen_folder, {
-            name: 'default_folder',
-            toplevel: "All Site Stories"
-        });
+        var $folders = NEWSBLUR.utils.make_folders(autoopen_folder, "All Site Stories", 'default_folder');
         return $folders;
     },
     
diff --git a/media/js/newsblur/views/feed_list_view.js b/media/js/newsblur/views/feed_list_view.js
index cd49f6d49..8de0a2e62 100644
--- a/media/js/newsblur/views/feed_list_view.js
+++ b/media/js/newsblur/views/feed_list_view.js
@@ -300,13 +300,15 @@ NEWSBLUR.Views.FeedList = Backbone.View.extend({
 
     load_url_next_param: function(route_found) {
         var next = $.getQueryString('next') || $.getQueryString('test');
-        // console.log(['load_url_next_param', next, route_found]);
+        if (next) console.log(['load_url_next_param', next, route_found]);
         if (next == 'optout') {
             NEWSBLUR.reader.open_account_modal({'animate_email': true});
         } else if (next == 'goodies') {
             NEWSBLUR.reader.open_goodies_modal();
         } else if (next == 'newsletters') {
             NEWSBLUR.reader.open_newsletters_modal();
+        } else if (next == 'preferences') {
+            NEWSBLUR.reader.open_preferences_modal();
         } else if (next == 'friends') {
             NEWSBLUR.reader.open_friends_modal();
         } else if (next == 'account') {
@@ -351,7 +353,7 @@ NEWSBLUR.Views.FeedList = Backbone.View.extend({
     load_default_folder: function() {
         var default_folder = NEWSBLUR.assets.preference('default_folder');
         
-        if (!default_folder || default_folder == "") {
+        if (!default_folder || default_folder == "" || default_folder == "river:") {
             NEWSBLUR.reader.open_river_stories();
         } else {
             var folder = NEWSBLUR.assets.get_folder(default_folder);