Issue 7094 - Keep subscription filters by text only

lib/filterStorage.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 183 matching lines @@
    * Replaces the list of filters in a subscription with a new list.
    * @param {Subscription} subscription The subscription to be updated.
    * @param {Array.<string>} filterText The new filter text.
    */
   updateSubscriptionFilters(subscription, filterText)
   {
     let oldFilterText = [...subscription.filterText()];
     disconnectSubscriptionFilters(subscription, oldFilterText);
     subscription.clearFilters();
 
-    for (let filter of filterText)
-      subscription.addFilterText(filter);
+    for (let text of filterText)
+      subscription.addFilterText(text);
 
     connectSubscriptionFilters(subscription, filterText);
 
     filterNotifier.emit("subscription.updated", subscription, oldFilterText);
   }
 
   /**
    * Adds a user-defined filter to the storage.
    * @param {Filter} filter
    * @param {?SpecialSubscription} [subscription] The subscription that the
@@ skipping 432 matching lines @@
  * back to disk.
  */
 let filterStorage = new FilterStorage();
 
 exports.filterStorage = filterStorage;
 
 /**
  * Connects a subscription to its filters without any notifications.
  * @param {Subscription} subscription The subscription that should be
  *   connected to its filters.
- * @param {?Array.<string>} [filters] A list of filters to which the
- *   subscription should be connected. If this is not given, the subscription
- *   is connected to its own filters.
+ * @param {?Array.<string>} [filterText] A list of filters (in text form) to
+ *   which the subscription should be connected. If this is not given, the
+ *   subscription is connected to its own filters.
  */
-function connectSubscriptionFilters(subscription, filters)
+function connectSubscriptionFilters(subscription, filterText)
 {
   if (!filterStorage.knownSubscriptions.has(subscription.url))
     return;
 
-  for (let text of filters || subscription.filterText())
-  {
-    let filter = Filter.fromText(text);
-    filter.addSubscription(subscription);
-  }
+  for (let text of filterText || subscription.filterText())
+    Filter.fromText(text).addSubscription(subscription);
 }
 
 /**
  * Disconnects a subscription from its filters without any notifications.
  * @param {Subscription} subscription The subscription that should be
  *   disconnected from its filters.
- * @param {?Array.<string>} [filters] A list of filters from which the
- *   subscription should be disconnected. If this is not given, the
+ * @param {?Array.<string>} [filterText] A list of filters (in text form) from
+ *   which the subscription should be disconnected. If this is not given, the
  *   subscription is disconnected from its own filters.
  */
-function disconnectSubscriptionFilters(subscription, filters)
+function disconnectSubscriptionFilters(subscription, filterText)
 {
   if (!filterStorage.knownSubscriptions.has(subscription.url))
     return;
 
-  for (let text of filters || subscription.filterText())
-  {
-    let filter = Filter.fromText(text);
-    filter.removeSubscription(subscription);
-  }
+  for (let text of filterText || subscription.filterText())
+    Filter.fromText(text).removeSubscription(subscription);
 }