Issue 3048 - Mark inactive notifications instead of removing them

sitescripts/notifications/web/notification.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 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,
@@ skipping 11 matching lines @@
 import urlparse
 
 from sitescripts.notifications.parser import load_notifications
 from sitescripts.web import url_handler
 
 def _determine_groups(version, notifications):
   version_groups = dict(x.split("/") for x in version.split("-")[1:]
                         if x.count("/") == 1)
   groups = []
   for notification in notifications:
-    if "variants" not in notification:
-      continue
     group_id = notification["id"]
     if group_id in version_groups:
       groups.append({"id": group_id, "variant": int(version_groups[group_id])})
   return groups
 
 def _assign_groups(notifications):
   groups = []
   selection = random.random()
   start = 0
   for notification in notifications:
@@ skipping 53 matching lines @@
     "version": _generate_version(groups),
     "notifications": _get_notifications_to_send(notifications, groups)
   }
 
 @url_handler("/notification.json")
 def notification(environ, start_response):
   params = urlparse.parse_qs(environ.get("QUERY_STRING", ""))
   version = params.get("lastVersion", [""])[0]
   notifications = load_notifications()
   groups = _determine_groups(version, notifications)
+  notifications = [x for x in notifications
+                   if not ("inactive" in x and x["inactive"])]

[Sebastian Noack, 2015/09/10 13:29:20]

How about |not x.get("inactive", False)| ?

[Felix Dahlke, 2015/09/11 07:04:43]

Done.

   if not groups:
     groups = _assign_groups(notifications)
   response = _create_response(notifications, groups)
   response_headers = [("Content-Type", "application/json; charset=utf-8"),
                       ("ABP-Notification-Version", response["version"])]
   response_body = json.dumps(response, ensure_ascii=False, indent=2,
                              separators=(",", ": "),
                              sort_keys=True).encode("utf-8")
   start_response("200 OK", response_headers)
   return response_body