Issue 5802 - Handle custom subscription creation

new-options.js

Index: new-options.js
===================================================================
--- a/new-options.js
+++ b/new-options.js
@@ -449,6 +449,15 @@
     filtersMap[filter.text] = filter;
   }
 
+  function loadCustomFilters(filters)
+  {
+    for (let filter of filters)
+      updateFilter(filter);
+
+    setCustomFiltersView("read");
+    isCustomFiltersLoaded = true;
+  }
+
   function removeCustomFilter(text)
   {
     let index = customFilters.indexOf(text);
@@ -1055,6 +1064,7 @@
     for (let property in collections)
       collections[property].clearAll();
 
+    setCustomFiltersView("empty");
     ext.backgroundPage.sendMessage({
       type: "subscriptions.get",
       special: true
@@ -1070,11 +1080,7 @@
         },
         (filters) =>
         {
-          for (let filter of filters)
-            updateFilter(filter);
-
-          isCustomFiltersLoaded = true;
-          setCustomFiltersView("read");
+          loadCustomFilters(filters);
         });
       }
     });
@@ -1210,7 +1216,13 @@
         break;
       case "added":
         let {url, recommended} = subscription;
-        if (url in subscriptionsMap)
+        // Handle custom subscription
+        if (/^~user/.test(url))

[saroyanm, 2017/09/27 20:05:41]

I don't think there is an easy way to check if this is a special subscription on
this stage.

I used your solution here as well, as it seems to be the easiest solution so
far, but I wander what should be the proper solution be, should we send request
and check the type of subscription each time a new subscription is added ? (I
don't feel like sending a lot of async request is also a good idea as well, but
still unsure)

+        {
+          loadCustomFilters(subscription.filters);
+          return;
+        }
+        else if (url in subscriptionsMap)
           updateSubscription(subscription);
         else
           addSubscription(subscription);