Issue 2982 - Return all notifications that have title and message

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 50 matching lines @@
     variant = group["variant"]
     if variant == 0:
       continue
     notification = next(x for x in notifications if x["id"] == group_id)
     notification = copy.deepcopy(notification)
     notification.update(notification["variants"][variant - 1])
     for key_to_remove in ("sample", "variants"):
       notification.pop(key_to_remove, None)
     return notification
 
+def _can_be_shown(notification):
+  return "title" in notification and "message" in notification
+
 def _generate_version(groups):
   version = time.strftime("%Y%m%d%H%M", time.gmtime())
   for group in groups:
     version += "-%s/%s" % (group["id"], group["variant"])
   return version
 
-def _create_response(notifications, groups):
+def _get_notifications_to_send(notifications, groups):
   active_variant = _get_active_variant(notifications, groups)
   if active_variant:
-    notifications = [active_variant]
-  else:
-    notifications = [x for x in notifications if "variants" not in x]
-  response = {
+    return [active_variant] if _can_be_shown(active_variant) else []
+
+  notifications_to_send = []
+  for notification in notifications:
+    if not _can_be_shown(notification):
+      continue
+    if "variants" in notification:
+      notification = copy.deepcopy(notification)
+      del notification["variants"]
+    notifications_to_send.append(notification)
+  return notifications_to_send
+
+def _create_response(notifications, groups):
+  return {
     "version": _generate_version(groups),
-    "notifications": notifications
+    "notifications": _get_notifications_to_send(notifications, groups)
   }
-  return response
 
 @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)
   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