Issue 4878 - Start using ESLint for adblockpluscore

lib/notification.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 /**
  * @fileOverview Handles notifications.
  */
 
-Cu.import("resource://gre/modules/Services.jsm");
+const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 
 const {Prefs} = require("prefs");
 const {Downloader, Downloadable,
        MILLIS_IN_MINUTE, MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader");
 const {Utils} = require("utils");
 const {Matcher, defaultMatcher} = require("matcher");
 const {Filter, RegExpFilter, WhitelistFilter} = require("filterClasses");
 
-let INITIAL_DELAY = 1 * MILLIS_IN_MINUTE;
-let CHECK_INTERVAL = 1 * MILLIS_IN_HOUR;
-let EXPIRATION_INTERVAL = 1 * MILLIS_IN_DAY;
-let TYPE = {

[Wladimir Palant, 2017/03/02 14:07:01]

The values declared above are actually constants.

[kzar, 2017/03/08 12:33:48]

Done.

+const INITIAL_DELAY = 1 * MILLIS_IN_MINUTE;
+const CHECK_INTERVAL = 1 * MILLIS_IN_HOUR;
+const EXPIRATION_INTERVAL = 1 * MILLIS_IN_DAY;
+const TYPE = {
   information: 0,
   question: 1,
   relentless: 2,
   critical: 3
 };
 
 let showListeners = [];
 let questionListeners = {};
 
 function getNumericalSeverity(notification)
@@ skipping 53 matching lines @@
    */
   *_getDownloadables()
   {
     let downloadable = new Downloadable(Prefs.notificationurl);
     if (typeof Prefs.notificationdata.lastError === "number")
       downloadable.lastError = Prefs.notificationdata.lastError;
     if (typeof Prefs.notificationdata.lastCheck === "number")
       downloadable.lastCheck = Prefs.notificationdata.lastCheck;
     if (typeof Prefs.notificationdata.data === "object" &&
         "version" in Prefs.notificationdata.data)
+    {
       downloadable.lastVersion = Prefs.notificationdata.data.version;
+    }
     if (typeof Prefs.notificationdata.softExpiration === "number")
       downloadable.softExpiration = Prefs.notificationdata.softExpiration;
     if (typeof Prefs.notificationdata.hardExpiration === "number")
       downloadable.hardExpiration = Prefs.notificationdata.hardExpiration;
     if (typeof Prefs.notificationdata.downloadCount === "number")
       downloadable.downloadCount = Prefs.notificationdata.downloadCount;
     yield downloadable;
   },
 
   _onExpirationChange(downloadable)
@@ skipping 23 matching lines @@
     }
     catch (e)
     {
       Cu.reportError(e);
       errorCallback("synchronize_invalid_data");
       return;
     }
 
     Prefs.notificationdata.lastError = 0;
     Prefs.notificationdata.downloadStatus = "synchronize_ok";
-    [Prefs.notificationdata.softExpiration,
-     Prefs.notificationdata.hardExpiration] =

[Wladimir Palant, 2017/03/02 14:07:00]

The indentation here looks wrong. How about:

[
  Prefs.notificationdata.softExpiration,
  Prefs.notificationdata.hardExpiration
] = ...

[kzar, 2017/03/08 12:33:49]

Done.

-      downloader.processExpirationInterval(EXPIRATION_INTERVAL);
+    [
+      Prefs.notificationdata.softExpiration,
+      Prefs.notificationdata.hardExpiration
+    ] = downloader.processExpirationInterval(EXPIRATION_INTERVAL);
     Prefs.notificationdata.downloadCount = downloadable.downloadCount;
     saveNotificationData();
 
     Notification.showNext();
   },
 
   _onDownloadError(downloadable, downloadURL, error, channelStatus,
                    responseStatus, redirectCallback)
   {
     Prefs.notificationdata.lastError = Date.now();
@@ skipping 37 matching lines @@
       return !((parameter in target && target[parameter] != name) ||
                (minVersionKey in target &&
                 Services.vc.compare(version, target[minVersionKey]) < 0) ||
                (maxVersionKey in target &&
                 Services.vc.compare(version, target[maxVersionKey]) > 0));
     }
 
     let remoteData = [];
     if (typeof Prefs.notificationdata.data == "object" &&
         Prefs.notificationdata.data.notifications instanceof Array)
+    {
       remoteData = Prefs.notificationdata.data.notifications;
+    }
 
     let notifications = localData.concat(remoteData);
     if (notifications.length === 0)
       return null;
 
     const {addonName, addonVersion, application,
            applicationVersion, platform, platformVersion} = require("info");
     let notificationToShow = null;
     for (let notification of notifications)
     {
@@ skipping 10 matching lines @@
           {
             if (shown + notification.interval > Date.now())
               continue;
           }
           else if (shown)
             continue;
         }
 
         if (notification.type !== "relentless" &&
             Prefs.notifications_ignoredcategories.indexOf("*") != -1)
+        {
           continue;
+        }
       }
 
       if (typeof url === "string" || notification.urlFilters instanceof Array)
       {
         if (Prefs.enabled && typeof url === "string" &&
             notification.urlFilters instanceof Array)
         {
           let host;
           try
           {
             host = new URL(url).hostname;
           }
           catch (e)
           {
             host = "";
           }
 
           let exception = defaultMatcher.matchesAny(
             url, RegExpFilter.typeMap.DOCUMENT, host, false, null
           );
           if (exception instanceof WhitelistFilter)
             continue;
 
           let matcher = new Matcher();
           for (let urlFilter of notification.urlFilters)
             matcher.add(Filter.fromText(urlFilter));
           if (!matcher.matchesAny(url, RegExpFilter.typeMap.DOCUMENT, host,
               false, null))
+          {
             continue;
+          }
         }
         else
           continue;
       }
 
       if (notification.targets instanceof Array)
       {
         let match = false;
         for (let target of notification.targets)
         {
@@ skipping 101 matching lines @@
   removeNotification(notification)
   {
     let index = localData.indexOf(notification);
     if (index > -1)
       localData.splice(index, 1);
   },
 
   /**
    * A callback function which listens to see if notifications were approved.
    *
-   * @callback approvedListener

[Wladimir Palant, 2017/03/02 14:07:03]

QuestionListener? Seems to be the obvious choice given the terminology used
here.

[kzar, 2017/03/08 12:33:49]

Done.

+   * @callback QuestionListener
    * @param {boolean} approved
    */
 
   /**
    * Adds a listener for question-type notifications
    * @param {string} id
-   * @param {approvedListener} listener
+   * @param {QuestionListener} listener
    */
   addQuestionListener(id, listener)
   {
     if (!(id in questionListeners))
       questionListeners[id] = [];
     if (questionListeners[id].indexOf(listener) === -1)
       questionListeners[id].push(listener);
   },
 
   /**
    * Removes a listener that was previously added via addQuestionListener
    * @param {string} id
-   * @param {approvedListener} listener
+   * @param {QuestionListener} listener
    */
   removeQuestionListener(id, listener)
   {
     if (!(id in questionListeners))
       return;
     let index = questionListeners[id].indexOf(listener);
     if (index > -1)
       questionListeners[id].splice(index, 1);
     if (questionListeners[id].length === 0)
       delete questionListeners[id];
@@ skipping 30 matching lines @@
     else if (index != -1 && forceValue !== true)
       categories.splice(index, 1);
 
     // HACK: JSON values aren't saved unless they are assigned a
     // different object.
     Prefs.notifications_ignoredcategories =
       JSON.parse(JSON.stringify(categories));
   }
 };
 Notification.init();