Commit 2737f6d5 authored by Thomas Greiner's avatar Thomas Greiner

Issue 7221 - Fixed: Manual filter list update broke due to missing compatibility change

parent f8e5396c
Pipeline #45577075 passed with stages
in 4 minutes and 1 second
......@@ -209,7 +209,10 @@
{
this.disabled = !!details.disabled;
this.title = details.title || "";
this._filters = this._filters.concat(details.filters);
if (details.filters)
{
this._filters.push(...details.filters);
}
}
}
Subscription.prototype =
......
......@@ -72,7 +72,7 @@
"softExpiration", "expires", "title",
"url"], subscription);
if (subscription instanceof SpecialSubscription)
obj.filters = Array.from(subscription.filters()).map(convertFilter);
obj.filters = Array.from(subscription.filters(), convertFilter);
obj.isDownloading = Synchronizer.isExecuting(subscription.url);
return obj;
}
......@@ -295,7 +295,7 @@
if (!subscription)
return [];
return Array.from(subscription.filters()).map(convertFilter);
return Array.from(subscription.filters(), convertFilter);
});
port.on("filters.importRaw", (message, sender) =>
......@@ -467,9 +467,15 @@
port.on("subscriptions.update", (message, sender) =>
{
let {subscriptions} = filterStorage;
let subscriptions;
if (message.url)
{
subscriptions = [Subscription.fromURL(message.url)];
}
else
{
subscriptions = filterStorage.subscriptions();
}
for (const subscription of subscriptions)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment