# HG changeset patch
# User jbe
# Date 1459808373 -7200
# Node ID 986d8f3a68952423dc5fddd8d2a45ffdd7009a0c
# Parent  f39c673420cbd715928e4f32578cfb14a0d5f7c0
Exclude revoked initiatives from updated/featured/leading initiatives in notification system

diff -r f39c673420cb -r 986d8f3a6895 core.sql
--- a/core.sql	Mon Apr 04 23:55:22 2016 +0200
+++ b/core.sql	Tue Apr 05 00:19:33 2016 +0200
@@ -2381,6 +2381,7 @@
     "ignored_initiative"."member_id" = "supporter"."member_id" AND
     "ignored_initiative"."initiative_id" = "supporter"."initiative_id"
   WHERE "issue"."state" IN ('admission', 'discussion')
+  AND "initiative"."revoked" ISNULL
   AND "ignored_initiative"."member_id" ISNULL
   AND (
     EXISTS (
@@ -2466,6 +2467,7 @@
             WHERE "supporter"."member_id" = "member_id_v"
             AND "issue"."area_id" = "area_id_p"
             AND "issue"."state" IN ('admission', 'discussion', 'verification')
+            AND "initiative"."revoked" ISNULL
             AND "self_support"."member_id" ISNULL
             AND NOT "initiative_id_ary" @> ARRAY["initiative"."id"]
             AND (
@@ -2534,6 +2536,7 @@
       "uf_initiative_full"."id" = "uf_initiative"."initiative_id"
     JOIN "initiative" ON
       "initiative"."issue_id" = "uf_initiative_full"."issue_id"
+    WHERE "initiative"."revoked" ISNULL
     ORDER BY
       "uf_initiative"."recipient_id",
       "initiative"."issue_id",
diff -r f39c673420cb -r 986d8f3a6895 update/core-update.v3.1.0-v3.2.0.sql
--- a/update/core-update.v3.1.0-v3.2.0.sql	Mon Apr 04 23:55:22 2016 +0200
+++ b/update/core-update.v3.1.0-v3.2.0.sql	Tue Apr 05 00:19:33 2016 +0200
@@ -100,6 +100,7 @@
     "ignored_initiative"."member_id" = "supporter"."member_id" AND
     "ignored_initiative"."initiative_id" = "supporter"."initiative_id"
   WHERE "issue"."state" IN ('admission', 'discussion')
+  AND "initiative"."revoked" ISNULL
   AND "ignored_initiative"."member_id" ISNULL
   AND (
     EXISTS (
@@ -185,6 +186,7 @@
             WHERE "supporter"."member_id" = "member_id_v"
             AND "issue"."area_id" = "area_id_p"
             AND "issue"."state" IN ('admission', 'discussion', 'verification')
+            AND "initiative"."revoked" ISNULL
             AND "self_support"."member_id" ISNULL
             AND NOT "initiative_id_ary" @> ARRAY["initiative"."id"]
             AND (
@@ -253,6 +255,7 @@
       "uf_initiative_full"."id" = "uf_initiative"."initiative_id"
     JOIN "initiative" ON
       "initiative"."issue_id" = "uf_initiative_full"."issue_id"
+    WHERE "initiative"."revoked" ISNULL
     ORDER BY
       "uf_initiative"."recipient_id",
       "initiative"."issue_id",