Implemented anti-adblock message notification

lib/notification.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 13 matching lines @@
 let {TimeLine} = require("timeline");
 let {Prefs} = require("prefs");
 let {Downloader, Downloadable, MILLIS_IN_MINUTE, MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader");
 let {Utils} = require("utils");
 let {Matcher} = require("matcher");
 let {Filter} = require("filterClasses");
 
 let INITIAL_DELAY = 12 * MILLIS_IN_MINUTE;
 let CHECK_INTERVAL = 1 * MILLIS_IN_HOUR;
 let EXPIRATION_INTERVAL = 1 * MILLIS_IN_DAY;
-let TYPES = {

[Felix Dahlke, 2014/02/13 10:22:04]

Maybe we should call this TYPE_SEVERITY since it's effectively a type: severity
mapping now? (also: singular)

[Thomas Greiner, 2014/02/13 12:57:54]

I don't think we need to make it overly specific given that "information" and
"critical" can also be considered notification types.

+let TYPE = {
   information: 0,
   question: 1,
   critical: 2
 };
 
 let listeners = {};
 
 function getNumericalSeverity(notification)
 {
-  let type = ("type" in notification) ? notification.type : notification.severity;
-  return (type in TYPES ? TYPES[type] : TYPES.information);
+  return (notification.type in TYPE ? TYPE[notification.type] : TYPE.information);
 }
 
 function saveNotificationData()
 {
   // HACK: JSON values aren't saved unless they are assigned a different object.
   Prefs.notificationdata = JSON.parse(JSON.stringify(Prefs.notificationdata));
 }
 
 function localize(translations, locale)
 {
@@ skipping 65 matching lines @@
     Prefs.notificationdata.lastCheck = downloadable.lastCheck;
     Prefs.notificationdata.softExpiration = downloadable.softExpiration;
     Prefs.notificationdata.hardExpiration = downloadable.hardExpiration;
     saveNotificationData();
   },
 
   _onDownloadSuccess: function(downloadable, responseText, errorCallback, redirectCallback)
   {
     try
     {
-      Prefs.notificationdata.data = JSON.parse(responseText);
+      let data = JSON.parse(responseText);
+      for each (let notification in data.notifications)
+      {
+        if ("severity" in notification)
+        {
+          if (!("type" in notification))
+            notification.type = notification.severity;
+          delete notification.severity;
+        }
+      }
+      Prefs.notificationdata.data = data;
     }
     catch (e)
     {
       Cu.reportError(e);
       errorCallback("synchronize_invalid_data");
       return;
     }
 
     Prefs.notificationdata.lastError = 0;
     Prefs.notificationdata.downloadStatus = "synchronize_ok";
@@ skipping 35 matching lines @@
     }
 
     let notifications = localData.concat(remoteData);
     if (notifications.length === 0)
       return null;
 
     let {addonName, addonVersion, application, applicationVersion, platform, platformVersion} = require("info");
     let notificationToShow = null;
     for each (let notification in notifications)
     {
       if ((typeof notification.type === "undefined" || notification.type !== "critical")

[Felix Dahlke, 2014/02/13 10:22:04]

I'm sorry, my suggestion for being downwards compatible above wasn't complete,
we need to do something here to :( How about this:

When we download the notification, we do this:

if ("severity" in notification)
{
  if (!("type" in notification))
    notification.type = notification.severity;
  delete notification.severity;
}

That way we could centralise the type/severity confusion.

[Thomas Greiner, 2014/02/13 12:57:54]

Done.

           && Prefs.notificationdata.shown.indexOf(notification.id) !== -1)
         continue;
 
       if (typeof url === "string" || notification.urlFilters instanceof Array)
       {
         if (typeof url === "string" && notification.urlFilters instanceof Array)
         {
           let matcher = new Matcher();
           for each (let urlFilter in notification.urlFilters)
             matcher.add(Filter.fromText(urlFilter));
@@ skipping 122 matching lines @@
    */
   triggerQuestionListeners: function(id, approved)
   {
     if (!(id in listeners))
       return;
     for each (let listener in listeners[id])
       listener(approved);
   }
 };
 Notification.init();