Merge branch 'jsalyers-blacklist-v2' into 'develop'

Jsalyers blacklist v2

See merge request !421

hive/db/schema.py

@@ -558,6 +558,7 @@ def setup(db):
       "hive_votes_view.sql",
       "hive_muted_accounts_view.sql",
       "hive_muted_accounts_by_id_view.sql",
+      "hive_blacklisted_accounts_by_observer_view.sql",
       "hive_post_operations.sql",
       "head_block_time.sql",
       "update_feed_cache.sql",

hive/db/sql_scripts/bridge_get_account_posts_by_blog.sql

@@ -60,7 +60,8 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      NULL
     FROM hive_posts_view hp
     JOIN
     (

hive/db/sql_scripts/bridge_get_account_posts_by_comments.sql

@@ -47,7 +47,8 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      NULL
   FROM
   (
     SELECT hp1.id

hive/db/sql_scripts/bridge_get_account_posts_by_payout.sql

@@ -51,7 +51,8 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      NULL
   FROM
       hive_posts_view hp
   WHERE

hive/db/sql_scripts/bridge_get_account_posts_by_posts.sql

@@ -47,7 +47,8 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      NULL
   FROM
       hive_posts_view hp
   WHERE

hive/db/sql_scripts/bridge_get_account_posts_by_replies.sql

@@ -57,7 +57,8 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      NULL
   FROM
   (
       SELECT

hive/db/sql_scripts/bridge_get_discussion.sql

@@ -54,24 +54,25 @@ BEGIN
         hpv.is_pinned,
         hpv.curator_payout_value,
         hpv.is_muted,
-        hpv.parent_id
+        hpv.parent_id,
+        ds.source
     FROM
     (
         WITH RECURSIVE child_posts (id, parent_id) AS
         (
-            SELECT hp.id, hp.parent_id
-            FROM hive_posts hp
+            SELECT hp.id, hp.parent_id, blacklisted_by_observer_view.source as source
+            FROM hive_posts hp left outer join blacklisted_by_observer_view on (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp.author_id)
             WHERE hp.id = __post_id
             AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp.author_id))
             UNION ALL
-            SELECT children.id, children.parent_id
-            FROM hive_posts children
+            SELECT children.id, children.parent_id, blacklisted_by_observer_view.source as source
+            FROM hive_posts children left outer join blacklisted_by_observer_view on (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = children.author_id)
             JOIN child_posts ON children.parent_id = child_posts.id
             JOIN hive_accounts ON children.author_id = hive_accounts.id
             WHERE children.counter_deleted = 0
             AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = children.author_id))
         )
-        SELECT hp2.id
+        SELECT hp2.id, cp.source
         FROM hive_posts hp2
         JOIN child_posts cp ON cp.id = hp2.id
         ORDER BY hp2.id

hive/db/sql_scripts/bridge_get_post.sql

@@ -45,7 +45,8 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      NULL
   FROM
       hive_posts_view hp
   WHERE

hive/db/sql_scripts/bridge_get_ranked_post_for_all.sql

@@ -46,13 +46,15 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      created.source
   FROM
   (
       SELECT
-          hp1.id
+          hp1.id, blacklisted_by_observer_view.source as source
       FROM hive_posts hp1
           JOIN hive_accounts_view ha ON hp1.author_id = ha.id
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hp1.counter_deleted = 0 AND hp1.depth = 0 AND NOT ha.is_grayed AND ( __post_id = 0 OR hp1.id < __post_id )
       AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp1.author_id))
       ORDER BY hp1.id DESC
@@ -117,14 +119,17 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      hot.source
   FROM
   (
       SELECT
           hp1.id
-        , hp1.sc_hot as hot
+        , hp1.sc_hot as hot,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.depth = 0
           AND ( __post_id = 0 OR hp1.sc_hot < __hot_limit OR ( hp1.sc_hot = __hot_limit AND hp1.id < __post_id ) )
           AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp1.author_id))
@@ -146,8 +151,10 @@ $function$
 DECLARE
   __post_id INT;
   __payout_limit hive_posts.payout%TYPE;
+  __observer_id INT;
 BEGIN
   __post_id = find_comment_id( _author, _permlink, True );
+  __observer_id = find_account_id(_observer, True);
   IF __post_id <> 0 THEN
       SELECT ( hp.payout + hp.pending_payout ) INTO __payout_limit FROM hive_posts hp WHERE hp.id = __post_id;
   END IF;
@@ -188,15 +195,18 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      payout.source
   FROM
   (
       SELECT
           hp1.id
-        , ( hp1.payout + hp1.pending_payout ) as all_payout
+        , ( hp1.payout + hp1.pending_payout ) as all_payout,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
           JOIN hive_accounts_view ha ON hp1.author_id = ha.id
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND ha.is_grayed AND ( hp1.payout + hp1.pending_payout ) > 0
           AND ( __post_id = 0 OR ( hp1.payout + hp1.pending_payout ) < __payout_limit OR ( ( hp1.payout + hp1.pending_payout ) = __payout_limit AND hp1.id < __post_id ) )
       ORDER BY ( hp1.payout + hp1.pending_payout ) DESC, hp1.id DESC
@@ -261,14 +271,17 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      payout.source
   FROM
   (
       SELECT
           hp1.id
-        , ( hp1.payout + hp1.pending_payout ) as all_payout
+        , ( hp1.payout + hp1.pending_payout ) as all_payout,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.depth > 0
           AND ( __post_id = 0 OR ( hp1.payout + hp1.pending_payout ) < __payout_limit OR ( ( hp1.payout + hp1.pending_payout ) = __payout_limit AND hp1.id < __post_id ) )
           AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp1.author_id))
@@ -336,14 +349,17 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      payout.source
   FROM
   (
       SELECT
           hp1.id
-        , ( hp1.payout + hp1.pending_payout ) as all_payout
+        , ( hp1.payout + hp1.pending_payout ) as all_payout,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hp1.counter_deleted = 0 AND NOT hp1.is_paidout
           AND ( ( NOT _bridge_api AND hp1.depth = 0 ) OR ( _bridge_api AND hp1.payout_at BETWEEN __head_block_time + interval '12 hours' AND __head_block_time + interval '36 hours' ) )
           AND ( __post_id = 0 OR ( hp1.payout + hp1.pending_payout ) < __payout_limit OR ( ( hp1.payout + hp1.pending_payout ) = __payout_limit AND hp1.id < __post_id ) )
@@ -410,14 +426,17 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      promoted.source
   FROM
   (
       SELECT
           hp1.id
-        , hp1.promoted as promoted
+        , hp1.promoted as promoted,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.promoted > 0
           AND ( __post_id = 0 OR hp1.promoted < __promoted_limit OR ( hp1.promoted = __promoted_limit AND hp1.id < __post_id ) )
           AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp1.author_id))
@@ -483,14 +502,17 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      trends.source
   FROM
   (
       SELECT
           hp1.id
-        , hp1.sc_trend as trend
+        , hp1.sc_trend as trend,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.depth = 0
           AND ( __post_id = 0 OR hp1.sc_trend < __trending_limit OR ( hp1.sc_trend = __trending_limit AND hp1.id < __post_id ) )
           AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp1.author_id))

hive/db/sql_scripts/bridge_get_ranked_post_for_communities.sql

@@ -44,10 +44,12 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      blacklisted_by_observer_view.source
   FROM
       hive_posts_view hp
       JOIN hive_communities hc ON hc.id = hp.community_id
+      LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp.author_id)
   WHERE hc.name = _community AND hp.is_pinned
   AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp.author_id))
   ORDER BY hp.id DESC
@@ -108,15 +110,18 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      trends.source
   FROM
   (
       SELECT
           hp1.id
-        , hp1.sc_trend as trend
+        , hp1.sc_trend as trend,
+        blacklisted_by_observer_view.source as source
       FROM
          hive_posts hp1
          JOIN hive_communities hc ON hp1.community_id = hc.id
+         LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hc.name = _community AND hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.depth = 0
          AND ( NOT _bridge_api OR NOT hp1.is_pinned ) -- concatenated with bridge_get_ranked_post_pinned_for_community when called for bridge_api
          AND ( __post_id = 0 OR hp1.sc_trend < __trending_limit OR ( hp1.sc_trend = __trending_limit AND hp1.id < __post_id ) )
@@ -183,15 +188,18 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      promoted.source
   FROM
   (
       SELECT
           hp1.id
-        , hp1.promoted as promoted
+        , hp1.promoted as promoted,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
           JOIN hive_communities hc ON hp1.community_id = hc.id
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hc.name = _community AND hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.promoted > 0
           AND ( __post_id = 0 OR hp1.promoted < __promoted_limit OR ( hp1.promoted = __promoted_limit AND hp1.id < __post_id ) )
           AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp1.author_id))
@@ -259,15 +267,18 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      payout.source
   FROM
   (
       SELECT
           hp1.id
-        , ( hp1.payout + hp1.pending_payout ) as all_payout
+        , ( hp1.payout + hp1.pending_payout ) as all_payout,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
           JOIN hive_communities hc ON hp1.community_id = hc.id
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hc.name = _community AND hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.payout_at BETWEEN __head_block_time + interval '12 hours' AND __head_block_time + interval '36 hours'
           AND ( __post_id = 0 OR ( hp1.payout + hp1.pending_payout ) < __payout_limit OR ( ( hp1.payout + hp1.pending_payout ) = __payout_limit AND hp1.id < __post_id ) )
           AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp1.author_id))
@@ -333,15 +344,18 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      payout.source
   FROM
   (
       SELECT
           hp1.id
-        , ( hp1.payout + hp1.pending_payout ) as all_payout
+        , ( hp1.payout + hp1.pending_payout ) as all_payout,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
           JOIN hive_communities hc ON hp1.community_id = hc.id
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hc.name = _community AND hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.depth > 0
           AND ( __post_id = 0 OR ( hp1.payout + hp1.pending_payout ) < __payout_limit OR ( ( hp1.payout + hp1.pending_payout ) = __payout_limit AND hp1.id < __post_id ) )
           AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp1.author_id))
@@ -363,11 +377,13 @@ $function$
 DECLARE
   __post_id INT;
   __payout_limit hive_posts.payout%TYPE;
+  __observer_id INT;
 BEGIN
   __post_id = find_comment_id( _author, _permlink, True );
   IF __post_id <> 0 THEN
       SELECT ( hp.payout + hp.pending_payout ) INTO __payout_limit FROM hive_posts hp WHERE hp.id = __post_id;
   END IF;
+  __observer_id = find_account_id(_observer, True);
   RETURN QUERY SELECT
       hp.id,
       hp.author,
@@ -405,16 +421,19 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      payout.source
   FROM
   (
       SELECT
           hp1.id
-        , ( hp1.payout + hp1.pending_payout ) as all_payout
+        , ( hp1.payout + hp1.pending_payout ) as all_payout,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
           JOIN hive_communities hc ON hp1.community_id = hc.id
           JOIN hive_accounts_view ha ON hp1.author_id = ha.id
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hc.name = _community AND hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND ha.is_grayed AND ( hp1.payout + hp1.pending_payout ) > 0
           AND ( __post_id = 0 OR ( hp1.payout + hp1.pending_payout ) < __payout_limit OR ( ( hp1.payout + hp1.pending_payout ) = __payout_limit AND hp1.id < __post_id ) )
       ORDER BY ( hp1.payout + hp1.pending_payout ) DESC, hp1.id DESC
@@ -479,15 +498,18 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      hot.source
   FROM
   (
       SELECT
           hp1.id
-        , hp1.sc_hot as hot
+        , hp1.sc_hot as hot,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
           JOIN hive_communities hc ON hp1.community_id = hc.id
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hc.name = _community AND hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.depth = 0
           AND ( __post_id = 0 OR hp1.sc_hot < __hot_limit OR ( hp1.sc_hot = __hot_limit AND hp1.id < __post_id ) )
           AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp1.author_id))
@@ -549,14 +571,17 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      created.source
   FROM
   (
       SELECT
-          hp1.id
+          hp1.id,
+          blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
           JOIN hive_communities hc ON hp1.community_id = hc.id
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hc.name = _community AND hp1.counter_deleted = 0 AND hp1.depth = 0
           AND ( NOT _bridge_api OR NOT hp1.is_pinned ) -- concatenated with bridge_get_ranked_post_pinned_for_community when called for bridge_api
           AND ( __post_id = 0 OR hp1.id < __post_id )

hive/db/sql_scripts/bridge_get_ranked_post_for_observer_communities.sql

@@ -6,6 +6,7 @@ $function$
 DECLARE
   __post_id INT;
   __account_id INT;
+  __subscription_count INT;
 BEGIN
   __post_id = find_comment_id( _author, _permlink, True );
   __account_id = find_account_id( _observer, True );
@@ -64,9 +65,11 @@ BEGIN
           hp.role_id,
           hp.is_pinned,
           hp.curator_payout_value,
-          hp.is_muted
+          hp.is_muted,
+          blacklisted_by_observer_view.source
       from post_ids
       join hive_posts_view hp using (id)
+      LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __account_id AND blacklisted_by_observer_view.blacklisted_id = hp.author_id)
       order by id desc;
 END
 $function$
@@ -124,10 +127,12 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      blacklisted_by_observer_view.source
   FROM
       hive_posts_view hp
       JOIN hive_subscriptions hs ON hp.community_id = hs.community_id
+      LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __account_id AND blacklisted_by_observer_view.blacklisted_id = hp.author_id)
   WHERE hs.account_id = __account_id AND NOT hp.is_paidout AND hp.depth = 0
       AND ( __post_id = 0 OR hp.sc_hot < __hot_limit OR ( hp.sc_hot = __hot_limit AND hp.id < __post_id ) )
       AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __account_id AND muted_id = hp.author_id))
@@ -189,15 +194,18 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      payout.blacklist_source
   FROM
   (
       SELECT
           hp1.id
-        , ( hp1.payout + hp1.pending_payout ) as all_payout
+        , ( hp1.payout + hp1.pending_payout ) as all_payout,
+        blacklisted_by_observer_view.source as blacklist_source
       FROM
           hive_posts hp1
           JOIN hive_subscriptions hs ON hp1.community_id = hs.community_id
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __account_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hs.account_id = __account_id AND hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.depth > 0
           AND ( __post_id = 0 OR ( hp1.payout + hp1.pending_payout ) < __payout_limit OR ( ( hp1.payout + hp1.pending_payout ) = __payout_limit AND hp1.id < __post_id ) )
           AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __account_id AND muted_id = hp1.author_id))
@@ -265,10 +273,12 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      blacklisted_by_observer_view.source
   FROM
       hive_posts_view hp
       JOIN hive_subscriptions hs ON hp.community_id = hs.community_id
+      LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __account_id AND blacklisted_by_observer_view.blacklisted_id = hp.author_id)
   WHERE hs.account_id = __account_id AND NOT hp.is_paidout AND hp.payout_at BETWEEN __head_block_time + interval '12 hours' AND __head_block_time + interval '36 hours'
       AND ( __post_id = 0 OR ( hp.payout + hp.pending_payout ) < __payout_limit OR ( ( hp.payout + hp.pending_payout ) = __payout_limit AND hp.id < __post_id ) )
       AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __account_id AND muted_id = hp.author_id))
@@ -330,10 +340,12 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      blacklisted_by_observer_view.source
   FROM
       hive_posts_view hp
       JOIN hive_subscriptions hs ON hp.community_id = hs.community_id
+      LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __account_id AND blacklisted_by_observer_view.blacklisted_id = hp.author_id)
   WHERE hs.account_id = __account_id AND NOT hp.is_paidout AND hp.promoted > 0
       AND ( __post_id = 0 OR hp.promoted < __promoted_limit OR ( hp.promoted = __promoted_limit AND hp.id < __post_id ) )
       AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __account_id AND muted_id = hp.author_id))
@@ -396,15 +408,18 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      trending.source
   FROM
   (
       SELECT
           hp1.id
-        , hp1.sc_trend
+        , hp1.sc_trend,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
           JOIN hive_subscriptions hs ON hp1.community_id = hs.community_id
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __account_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE
           hs.account_id = __account_id AND hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.depth = 0
           AND ( __post_id = 0 OR hp1.sc_trend < __trending_limit OR ( hp1.sc_trend = __trending_limit AND hp1.id < __post_id ) )
@@ -471,11 +486,13 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      blacklisted_by_observer_view.source
   FROM
       hive_posts_view hp
       JOIN hive_subscriptions hs ON hp.community_id = hs.community_id
       JOIN hive_accounts_view ha ON ha.id = hp.author_id
+      LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __account_id AND blacklisted_by_observer_view.blacklisted_id = hp.author_id)
   WHERE hs.account_id = __account_id AND NOT hp.is_paidout AND ha.is_grayed AND ( hp.payout + hp.pending_payout ) > 0
       AND ( __post_id = 0 OR ( hp.payout + hp.pending_payout ) < __payout_limit OR ( ( hp.payout + hp.pending_payout ) = __payout_limit AND hp.id < __post_id ) )
   ORDER BY ( hp.payout + hp.pending_payout ) DESC, hp.id DESC

hive/db/sql_scripts/bridge_get_ranked_post_for_tag.sql

@@ -10,7 +10,7 @@ DECLARE
 BEGIN
   __post_id = find_comment_id( _author, _permlink, True );
   __hive_tag = ARRAY_APPEND( __hive_tag, find_tag_id( _tag, True ));
-  __observer_id = find_account_id( _observer, True );
+  __observer_id = find_account_id(_observer, True);
   RETURN QUERY SELECT
       hp.id,
       hp.author,
@@ -48,14 +48,17 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      created.source
   FROM
   (
       SELECT
-          hp1.id
+          hp1.id,
+          blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
           JOIN hive_accounts_view ha ON hp1.author_id = ha.id
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hp1.tags_ids @> __hive_tag AND hp1.counter_deleted = 0 AND hp1.depth = 0 AND NOT ha.is_grayed AND ( __post_id = 0 OR hp1.id < __post_id )
       --ORDER BY hp1.id + 0 DESC -- this workaround helped the query to better choose indexes, but after some time it started to significally slow down
       AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp1.author_id))
@@ -85,7 +88,7 @@ BEGIN
       SELECT hp.sc_hot INTO __hot_limit FROM hive_posts hp WHERE hp.id = __post_id;
   END IF;
   __hive_tag = ARRAY_APPEND( __hive_tag, find_tag_id( _tag, True ));
-  __observer_id = find_account_id( _observer, True );
+  __observer_id = find_account_id(_observer, True);
   RETURN QUERY SELECT
       hp.id,
       hp.author,
@@ -123,14 +126,17 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      hot.source
   FROM
   (
       SELECT
           hp1.id
-        , hp1.sc_hot as hot
+        , hp1.sc_hot as hot,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hp1.tags_ids @> __hive_tag AND hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.depth = 0
           AND ( __post_id = 0 OR hp1.sc_hot < __hot_limit OR ( hp1.sc_hot = __hot_limit AND hp1.id < __post_id ) )
           AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp1.author_id))
@@ -153,12 +159,14 @@ DECLARE
   __post_id INT;
   __payout_limit hive_posts.payout%TYPE;
   __hive_tag INT[];
+  __observer_id INT;
 BEGIN
   __post_id = find_comment_id( _author, _permlink, True );
   IF __post_id <> 0 THEN
       SELECT ( hp.payout + hp.pending_payout ) INTO __payout_limit FROM hive_posts hp WHERE hp.id = __post_id;
   END IF;
   __hive_tag = ARRAY_APPEND( __hive_tag, find_tag_id( _tag, True ) );
+  __observer_id = find_account_id(_observer, True);
   RETURN QUERY SELECT
       hp.id,
       hp.author,
@@ -196,15 +204,18 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      payout.source
   FROM
   (
       SELECT
           hp1.id
-        , ( hp1.payout + hp1.pending_payout ) as all_payout
+        , ( hp1.payout + hp1.pending_payout ) as all_payout,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
           JOIN hive_accounts_view ha ON hp1.author_id = ha.id
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hp1.tags_ids @> __hive_tag AND hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND ha.is_grayed AND ( hp1.payout + hp1.pending_payout ) > 0
           AND ( __post_id = 0 OR ( hp1.payout + hp1.pending_payout ) < __payout_limit OR ( ( hp1.payout + hp1.pending_payout ) = __payout_limit AND hp1.id < __post_id ) )
       ORDER BY ( hp1.payout + hp1.pending_payout ) DESC, hp1.id DESC
@@ -233,7 +244,7 @@ BEGIN
       SELECT ( hp.payout + hp.pending_payout ) INTO __payout_limit FROM hive_posts hp WHERE hp.id = __post_id;
   END IF;
   __hive_category = find_category_id( _category, True );
-  __observer_id = find_account_id( _observer, True );
+  __observer_id = find_account_id(_observer, True);
   RETURN QUERY SELECT
       hp.id,
       hp.author,
@@ -271,14 +282,17 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      payout.source
   FROM
   (
       SELECT
           hp1.id
-        , ( hp1.payout + hp1.pending_payout ) as all_payout
+        , ( hp1.payout + hp1.pending_payout ) as all_payout,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hp1.category_id = __hive_category AND hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.depth > 0
           AND ( __post_id = 0 OR ( hp1.payout + hp1.pending_payout ) < __payout_limit OR ( ( hp1.payout + hp1.pending_payout ) = __payout_limit AND hp1.id < __post_id ) )
           AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp1.author_id))
@@ -310,7 +324,7 @@ BEGIN
   END IF;
   __hive_category = find_category_id( _category, True );
   __head_block_time = head_block_time();
-  __observer_id = find_account_id( _observer, True );
+  __observer_id = find_account_id(_observer, True);
   RETURN QUERY SELECT
       hp.id,
       hp.author,
@@ -348,14 +362,17 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      payout.source
   FROM
   (
       SELECT
           hp1.id
-        , ( hp1.payout + hp1.pending_payout ) as all_payout
+        , ( hp1.payout + hp1.pending_payout ) as all_payout,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hp1.category_id = __hive_category AND hp1.counter_deleted = 0 AND NOT hp1.is_paidout
           AND ( ( NOT _bridge_api AND hp1.depth = 0 ) OR ( _bridge_api AND hp1.payout_at BETWEEN __head_block_time + interval '12 hours' AND __head_block_time + interval '36 hours' ) )
           AND ( __post_id = 0 OR ( hp1.payout + hp1.pending_payout ) < __payout_limit OR ( ( hp1.payout + hp1.pending_payout ) = __payout_limit AND hp1.id < __post_id ) )
@@ -386,7 +403,7 @@ BEGIN
       SELECT hp.promoted INTO __promoted_limit FROM hive_posts hp WHERE hp.id = __post_id;
   END IF;
   __hive_tag = ARRAY_APPEND( __hive_tag,  find_tag_id( _tag, True ) );
-  __observer_id = find_account_id( _observer, True );
+  __observer_id = find_account_id(_observer, True);
   RETURN QUERY SELECT
       hp.id,
       hp.author,
@@ -424,14 +441,17 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      promoted.source
   FROM
   (
       SELECT
           hp1.id
-        , hp1.promoted as promoted
+        , hp1.promoted as promoted,
+        blacklisted_by_observer_view.source as source
       FROM
           hive_posts hp1
+          LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hp1.tags_ids @> __hive_tag AND hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.promoted > 0
           AND ( __post_id = 0 OR hp1.promoted < __promoted_limit OR ( hp1.promoted = __promoted_limit AND hp1.id < __post_id ) )
           AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp1.author_id))
@@ -461,7 +481,7 @@ BEGIN
       SELECT hp.sc_trend INTO __trending_limit FROM hive_posts hp WHERE hp.id = __post_id;
   END IF;
   __hive_tag = ARRAY_APPEND( __hive_tag, find_tag_id( _tag, True ));
-  __observer_id = find_account_id( _observer, True );
+  __observer_id = find_account_id(_observer, True);
   RETURN QUERY SELECT
       hp.id,
       hp.author,
@@ -499,14 +519,17 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      trends.source
   FROM
   (
       SELECT
           hp1.id
-        , hp1.sc_trend as trend
+        , hp1.sc_trend as trend,
+        blacklisted_by_observer_view.source as source
       FROM
          hive_posts hp1
+         LEFT OUTER JOIN blacklisted_by_observer_view ON (blacklisted_by_observer_view.observer_id = __observer_id AND blacklisted_by_observer_view.blacklisted_id = hp1.author_id)
       WHERE hp1.tags_ids @> __hive_tag AND hp1.counter_deleted = 0 AND NOT hp1.is_paidout AND hp1.depth = 0
           AND ( __post_id = 0 OR hp1.sc_trend < __trending_limit OR ( hp1.sc_trend = __trending_limit AND hp1.id < __post_id ) )
           AND (NOT EXISTS (SELECT 1 FROM muted_accounts_by_id_view WHERE observer_id = __observer_id AND muted_id = hp1.author_id))
@@ -514,6 +537,7 @@ BEGIN
       LIMIT _limit
   ) as trends
   JOIN hive_posts_view hp ON hp.id = trends.id
+  WHERE (CASE WHEN _observer IS NOT NULL THEN NOT EXISTS (SELECT 1 FROM muted_accounts_view WHERE observer = _observer AND muted = hp.author) ELSE true END)
   ORDER BY trends.trend DESC, trends.id DESC
   LIMIT _limit;
 END

hive/db/sql_scripts/bridge_get_ranked_post_type.sql

@@ -36,7 +36,8 @@ CREATE TYPE bridge_api_post AS (
     role_id SMALLINT,
     is_pinned BOOLEAN,
     curator_payout_value VARCHAR,
-    is_muted BOOLEAN
+    is_muted BOOLEAN,
+    blacklists TEXT
 );
 
 DROP TYPE IF EXISTS bridge_api_post_reblogs CASCADE;
@@ -122,5 +123,6 @@ CREATE TYPE bridge_api_post_discussion AS (
     is_pinned BOOLEAN,
     curator_payout_value VARCHAR,
     is_muted BOOLEAN,
-    parent_id INTEGER
+    parent_id INTEGER,
+    blacklists TEXT
 );
\ No newline at end of file

hive/db/sql_scripts/condenser_get_by_account_comments.sql

@@ -53,7 +53,8 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      NULL
     FROM hive_posts_view hp
     WHERE ( hp.author = _author ) AND ( ( __post_id = 0 ) OR ( hp.id <= __post_id ) ) AND hp.depth > 0
     ORDER BY hp.id DESC

hive/db/sql_scripts/condenser_get_by_blog.sql

@@ -63,7 +63,8 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      NULL
     FROM hive_posts_view hp
     JOIN hive_feed_cache hfc ON hp.id = hfc.post_id
     WHERE hfc.account_id = __account_id AND ( ( __post_id = 0 ) OR ( hfc.created_at <= __created_at ) )

hive/db/sql_scripts/condenser_get_by_blog_without_reblog.sql

@@ -53,7 +53,8 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      NULL
     FROM hive_posts_view hp
     WHERE ( hp.author = _author ) AND ( ( __post_id = 0 ) OR ( hp.id <= __post_id ) ) AND hp.depth = 0
     ORDER BY hp.id DESC

hive/db/sql_scripts/condenser_get_discussions_by_comments.sql

@@ -53,7 +53,8 @@ BEGIN
       hp.role_id,
       hp.is_pinned,
       hp.curator_payout_value,
-      hp.is_muted
+      hp.is_muted,
+      NULL
     FROM hive_posts_view hp
     WHERE
         hp.author = _author AND hp.depth > 0 AND ( ( __post_id = 0 ) OR ( hp.id <= __post_id ) )

hive/db/sql_scripts/db_upgrade.sh

@@ -16,6 +16,7 @@ for sql in postgres_handle_view_changes.sql \
           hive_votes_view.sql \
           hive_muted_accounts_view.sql \
           hive_muted_accounts_by_id_view.sql \
+          hive_blacklisted_accounts_by_observer_view.sql \
           hive_post_operations.sql \
           head_block_time.sql \
           update_feed_cache.sql \

hive/db/sql_scripts/hive_blacklisted_accounts_by_observer_view.sql

+DROP VIEW IF EXISTS blacklisted_by_observer_view;
+CREATE OR REPLACE VIEW blacklisted_by_observer_view AS
+SELECT observer_accounts.id AS observer_id,
+    following_accounts.id AS blacklisted_id,
+    following_accounts.name AS blacklisted_name,
+    'my blacklist'::text AS source
+   FROM ((hive_follows
+     JOIN hive_accounts following_accounts ON ((hive_follows.following = following_accounts.id)))
+     JOIN hive_accounts observer_accounts ON ((hive_follows.follower = observer_accounts.id)))
+  WHERE hive_follows.blacklisted
+UNION
+ SELECT observer_accounts.id AS observer_id,
+    following_accounts.id AS blacklisted_id,
+    following_accounts.name AS blacklisted_name,
+    string_agg(('blacklisted by '::text || (indirect_accounts.name)::text), ','::text) AS source
+   FROM (((hive_follows hive_follows_direct
+     JOIN hive_follows hive_follows_indirect ON ((hive_follows_direct.following = hive_follows_indirect.follower)))
+     JOIN hive_accounts following_accounts ON ((hive_follows_indirect.following = following_accounts.id)))
+     JOIN hive_accounts observer_accounts ON ((hive_follows_direct.follower = observer_accounts.id)))
+     JOIN hive_accounts indirect_accounts ON ((hive_follows_indirect.follower = indirect_accounts.id))
+  WHERE (hive_follows_direct.follow_blacklists AND hive_follows_indirect.blacklisted)
+  GROUP BY observer_accounts.id, following_accounts.id;
\ No newline at end of file

hive/server/bridge_api/methods.py

@@ -58,16 +58,12 @@ async def get_post(context, author, permlink, observer=None):
     valid_account(observer, allow_empty=True)
     valid_permlink(permlink)
 
-    blacklisted_for_user = None
-    if observer:
-        blacklisted_for_user = await Mutes.get_blacklisted_for_observer(observer, context)
-
     sql = "SELECT * FROM bridge_get_post( (:author)::VARCHAR, (:permlink)::VARCHAR )"
     result = await db.query_all(sql, author=author, permlink=permlink)
 
     post = _bridge_post_object(result[0])
     post['active_votes'] = await find_votes_impl(db, author, permlink, VotesPresentation.BridgeApi)
-    post = append_statistics_to_post(post, result[0], False, blacklisted_for_user)
+    post = append_statistics_to_post(post, result[0], False)
     return post
 
 @return_error_info
@@ -233,14 +229,11 @@ async def get_ranked_posts(context, sort:str, start_author:str='', start_permlin
     db = context['db']
 
     async def process_query_results( sql_result ):
-        blacklisted_for_user = None
-        if observer:
-            blacklisted_for_user = await Mutes.get_blacklisted_for_observer(observer, context)
         posts = []
         for row in sql_result:
             post = _bridge_post_object(row)
             post['active_votes'] = await find_votes_impl(db, row['author'], row['permlink'], VotesPresentation.BridgeApi)
-            post = append_statistics_to_post(post, row, row['is_pinned'], blacklisted_for_user)
+            post = append_statistics_to_post(post, row, row['is_pinned'])
             posts.append(post)
         return posts
 
@@ -298,12 +291,6 @@ async def get_account_posts(context, sort:str, account:str, start_author:str='',
 
     sql_result = await db.query_all(sql, account=account, author=start_author, permlink=start_permlink, limit=limit )
     posts = []
-    blacklisted_for_user = None
-    if observer and account_posts:
-        # it looks like the opposite would make more sense, that is, to handle observer for 'blog', 'feed' and 'replies',
-        # since that's when posts can come from various authors, some blacklisted and some not, but original version
-        # ignored it (only) in those cases
-        blacklisted_for_user = await Mutes.get_blacklisted_for_observer(observer, context)
 
     for row in sql_result:
         post = _bridge_post_object(row)
@@ -319,7 +306,7 @@ async def get_account_posts(context, sort:str, account:str, start_author:str='',
                 reblogged_by_list.sort()
                 post['reblogged_by'] = reblogged_by_list
 
-        post = append_statistics_to_post(post, row, False if account_posts else row['is_pinned'], blacklisted_for_user)
+        post = append_statistics_to_post(post, row, False if account_posts else row['is_pinned'])
         posts.append(post)
     return posts