Issue 5891 - Add missing subscription information to issue reporter

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 12 matching lines @@
 {
   const {port} = require("messaging");
   const {Prefs} = require("prefs");
   const {Utils} = require("utils");
   const {FilterStorage} = require("filterStorage");
   const {FilterNotifier} = require("filterNotifier");
   const {defaultMatcher} = require("matcher");
   const {Notification: NotificationStorage} = require("notification");
   const {getActiveNotification, shouldDisplay} = require("notificationHelper");
 
-  const {Filter, BlockingFilter, RegExpFilter} = require("filterClasses");
+  const {
+    Filter, ActiveFilter, BlockingFilter, RegExpFilter
+  } = require("filterClasses");
   const {Synchronizer} = require("synchronizer");
 
   const info = require("info");
   const {
     Subscription,
     DownloadableSubscription,
     SpecialSubscription
   } = require("subscriptionClasses");
 
   const {showOptions} = require("options");
@@ skipping 12 matching lines @@
     {
       if (key in obj)
         result[key] = obj[key];
     }
     return result;
   }
 
   function convertSubscription(subscription)
   {
     let obj = convertObject(["disabled", "downloadStatus", "homepage",
-                             "lastDownload", "title", "url"], subscription);
+                             "version", "lastDownload", "lastSuccess",
+                             "softExpiration", "expires", "title",
+                             "url"], subscription);
     if (subscription instanceof SpecialSubscription)
       obj.filters = subscription.filters.map(convertFilter);
     obj.isDownloading = Synchronizer.isExecuting(subscription.url);
     return obj;
   }
 
   let convertFilter = convertObject.bind(null, ["text"]);
 
   let changeListeners = new ext.PageMap();
   let listenedPreferences = Object.create(null);
@@ skipping 317 matching lines @@
     {
       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;
     });
 
-    return subscriptions.map(convertSubscription);
+    return subscriptions.map((s) =>
+    {
+      let result = convertSubscription(s);
+      if (message.disabledFilters)
+      {
+        result.disabledFilters = s.filters

[kzar, 2017/10/24 14:14:18]

Does this pass linting? The indentation seems a little weird and the parenthesis
for the one argument functions are superfluous.

[Wladimir Palant, 2017/10/24 14:18:59]

Yes, it passes linting. I'd normally align the dots but this doesn't work here.
As to parentheses around single parameters - not something I'd normally do, but
the surrounding code does that. Thomas prefers it this way, so I decided to keep
things consistent.

[kzar, 2017/10/24 14:20:24]

Fair enough, it's Thomas' module after all.

[Manish Jethani, 2017/10/24 14:38:25]

How about moving s.filter to the next line with a 2-space indent?

LGTM

[Wladimir Palant, 2017/10/25 11:05:01]

Not convinced that this would be better, so I better leave things as they are.

+                      .filter((f) => f instanceof ActiveFilter && f.disabled)
+                      .map((f) => f.text);
+      }
+      return result;
+    });
   });
 
   port.on("subscriptions.listen", (message, sender) =>
   {
     getListenerFilters(sender.page).subscription = message.filter;
     addFilterListeners("subscription", message.filter);
   });
 
   port.on("subscriptions.remove", (message, sender) =>
   {
@@ skipping 24 matching lines @@
     if (message.url)
       subscriptions = [Subscription.fromURL(message.url)];
 
     for (let subscription of subscriptions)
     {
       if (subscription instanceof DownloadableSubscription)
         Synchronizer.execute(subscription, true);
     }
   });
 })(this);