Issue 7027 - User FilterStorage.knownSubscriptions in messageResponder.js

messageResponder.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 293 matching lines @@
     const seenFilter = Object.create(null);
     for (const filter of result.filters)
     {
       FilterStorage.addFilter(filter);
       seenFilter[filter.text] = null;
     }
 
     if (!message.removeExisting)
       return errors;
 
-    for (const subscription of FilterStorage.subscriptions)
+    for (const subscription of FilterStorage.knownSubscriptions.values())
     {
       if (!(subscription instanceof SpecialSubscription))
         continue;
 
       for (let j = subscription.filters.length - 1; j >= 0; j--)
       {
         const filter = subscription.filters[j];
         if (/^@@\|\|([^/:]+)\^\$document$/.test(filter.text))
           continue;
 
@@ skipping 74 matching lines @@
       });
     }
     else
     {
       addSubscription(subscription, message);
     }
   });
 
   port.on("subscriptions.get", (message, sender) =>
   {
-    const subscriptions = FilterStorage.subscriptions.filter((s) =>
-    {
-      if (message.ignoreDisabled && s.disabled)
+    const subscriptions = [
+      ...FilterStorage.knownSubscriptions.values()].filter((s) =>
+      {
+        if (message.ignoreDisabled && s.disabled)
+          return false;
+        if (s instanceof DownloadableSubscription && message.downloadable)
+          return true;
+        if (s instanceof SpecialSubscription && message.special)
+          return true;
         return false;
-      if (s instanceof DownloadableSubscription && message.downloadable)
-        return true;
-      if (s instanceof SpecialSubscription && message.special)
-        return true;
-      return false;
-    });
+      });
 
     return subscriptions.map((s) =>
     {
       const result = convertSubscription(s);
       if (message.disabledFilters)
       {
         result.disabledFilters = s.filters
                       .filter((f) => f instanceof ActiveFilter && f.disabled)
                       .map((f) => f.text);
       }
@@ skipping 94 matching lines @@
       // "*.listen" messages to tackle #6440
       if (action == "listen")
       {
         listen(type, filters, message.filter, message, uiPort.sender.tab.id);
       }
     });
   }
 
   browser.runtime.onConnect.addListener(onConnect);
 })(this);