Merge branch...

Merge branch 'jsalyers-new-branch-because-im-sick-of-merge-conflicts-that-shouldnt-exist' into 'develop'

[JES] Pass observer through to bridge.get_discussion

See merge request !385

hive/db/sql_scripts/bridge_get_discussion.sql

@@ -2,7 +2,8 @@ DROP FUNCTION IF EXISTS get_discussion
 ;
 CREATE OR REPLACE FUNCTION get_discussion(
     in _author hive_accounts.name%TYPE,
-    in _permlink hive_permlink_data.permlink%TYPE
+    in _permlink hive_permlink_data.permlink%TYPE,
+    in _observer VARCHAR
 )
 RETURNS TABLE
 (
@@ -72,12 +73,13 @@ BEGIN
             SELECT hp.id, hp.parent_id
             FROM hive_posts hp
             WHERE hp.id = __post_id
-            AND NOT hp.is_muted
             UNION ALL
             SELECT children.id, children.parent_id
             FROM hive_posts children
             JOIN child_posts ON children.parent_id = child_posts.id
-            WHERE children.counter_deleted = 0 AND NOT children.is_muted
+            JOIN hive_accounts ON children.author_id = hive_accounts.id
+            WHERE children.counter_deleted = 0 AND
+            (CASE WHEN _observer IS NOT NULL THEN NOT EXISTS (SELECT 1 FROM muted_accounts_view WHERE observer = _observer AND muted = hive_accounts.name) ELSE True END)
         )
         SELECT hp2.id
         FROM hive_posts hp2

hive/server/bridge_api/thread.py

@@ -26,8 +26,8 @@ async def get_discussion(context, author, permlink, observer=None):
     if observer:
         blacklists_for_user = await Mutes.get_blacklists_for_observer(observer, context)
 
-    sql = "SELECT * FROM get_discussion(:author,:permlink)"
-    rows = await db.query_all(sql, author=author, permlink=permlink)
+    sql = "SELECT * FROM get_discussion(:author,:permlink,:observer)"
+    rows = await db.query_all(sql, author=author, permlink=permlink, observer=observer)
     if not rows or len(rows) == 0:
         return {}
     root_id = rows[0]['id']

hive/server/condenser_api/get_state.py

@@ -234,11 +234,11 @@ async def _child_ids(db, parent_ids):
     rows = await db.query_all(sql, ids=tuple(parent_ids))
     return [[row[0], row[1]] for row in rows]
 
-async def _load_discussion(db, author, permlink):
+async def _load_discussion(db, author, permlink, observer=None):
     """Load a full discussion thread."""
 
-    sql = "SELECT * FROM get_discussion('{}','{}')".format( author, permlink)
-    sql_result = await db.query_all(sql)
+    sql = "SELECT * FROM get_discussion(:author,:permlink,:observer)"
+    sql_result = await db.query_all(sql, author=author, permlink=permlink, observer=observer)
 
     muted_accounts = Mutes.all()
     posts = []