Issue 3915 - Properly handle special subscriptions

options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 174 matching lines @@
   });
 
   // Load recommended subscriptions
   loadRecommendations();
 
   // Show user's filters
   reloadFilters();
 }
 $(loadOptions);
 
+function convertSpecialSubscription(subscription)
+{
+  getFilters(subscription.url, function(filters)
+  {
+    for (var j = 0; j < filters.length; j++)
+    {
+      var filter = filters[j].text;
+      if (whitelistedDomainRegexp.test(filter))
+        appendToListBox("excludedDomainsBox", RegExp.$1);
+      else
+        appendToListBox("userFiltersBox", filter);
+    }
+  });
+}
+
 // Reloads the displayed subscriptions and filters
 function reloadFilters()
 {
   // Load user filter URLs
   var container = document.getElementById("filterLists");
   while (container.lastChild)
     container.removeChild(container.lastChild);
 
   getSubscriptions(true, false, function(subscriptions)
   {
     for (var i = 0; i < subscriptions.length; i++)
     {
       var subscription = subscriptions[i];
       if (subscription.url == acceptableAdsUrl)
         $("#acceptableAds").prop("checked", !subscription.disabled);
       else
         addSubscriptionEntry(subscription);
     }
   });
 
   // User-entered filters
   getSubscriptions(false, true, function(subscriptions)
   {
     clearListBox("userFiltersBox");
     clearListBox("excludedDomainsBox");
 
     for (var i = 0; i < subscriptions.length; i++)
-      getFilters(subscriptions[i].url, function(filters)
-      {
-        for (var j = 0; j < filters.length; j++)
-        {
-          var filter = filters[j].text;
-          if (whitelistedDomainRegexp.test(filter))
-            appendToListBox("excludedDomainsBox", RegExp.$1);
-          else
-            appendToListBox("userFiltersBox", filter);
-        }
-      });
+      convertSpecialSubscription(subscriptions[i]);
   });
 }
 
 function initCheckbox(id, descriptor)
 {
   var checkbox = document.getElementById(id);
   var key = descriptor && descriptor.key || id;
   getPref(key, function(value)
   {
     if (descriptor && descriptor.get)
@@ skipping 219 matching lines @@
     case "disabled":
     case "downloading":
     case "downloadStatus":
     case "homepage":
     case "lastDownload":
     case "title":
       if (element)
         updateSubscriptionInfo(element, subscription);
       break;
     case "added":
-      if (subscription.url == acceptableAdsUrl)
+      if (subscription.url.indexOf("~user") == 0)

[kzar, 2016/04/14 09:55:22]

I decided to go with your approach in the end, rather than adding a redundant
property.

+        convertSpecialSubscription(subscription);
+      else if (subscription.url == acceptableAdsUrl)
         $("#acceptableAds").prop("checked", true);
       else if (!element)
         addSubscriptionEntry(subscription);
       break;
     case "removed":
       if (subscription.url == acceptableAdsUrl)
         $("#acceptableAds").prop("checked", false);
       else if (element)
         element.parentNode.removeChild(element);
       break;
@@ skipping 258 matching lines @@
       onFilterMessage(message.action, message.args[0]);
       break;
     case "prefs.respond":
       onPrefMessage(message.action, message.args[0]);
       break;
     case "subscriptions.respond":
       onSubscriptionMessage(message.action, message.args[0]);
       break;
   }
 });