hive/db/schema.py

@@ -601,7 +601,6 @@ def setup(db):
       "database_api_list_votes.sql",
       "update_posts_rshares.sql",
       "update_hive_post_root_id.sql",
-      "condenser_get_by_replies_to_account.sql",
       "condenser_get_by_account_comments.sql",
       "condenser_get_by_blog_without_reblog.sql",
       "bridge_get_by_feed_with_reblog.sql",

hive/db/sql_scripts/bridge_get_account_posts_by_replies.sql

 DROP FUNCTION IF EXISTS bridge_get_account_posts_by_replies;
 
-CREATE FUNCTION bridge_get_account_posts_by_replies( in _account VARCHAR, in _author VARCHAR, in _permlink VARCHAR, in _limit SMALLINT )
+CREATE FUNCTION bridge_get_account_posts_by_replies( in _account VARCHAR, in _author VARCHAR, in _permlink VARCHAR, in _limit SMALLINT, in _bridge_api BOOLEAN )
 RETURNS SETOF bridge_api_post
 AS
 $function$
@@ -8,8 +8,18 @@ DECLARE
   __account_id INT;
   __post_id INT;
 BEGIN
-  __account_id = find_account_id( _account, True );
-  __post_id = find_comment_id( _author, _permlink, True );
+  IF NOT _bridge_api AND _permlink <> '' THEN
+      -- find blogger account using parent author of page defining post
+      __post_id = find_comment_id( _author, _permlink, True );
+      SELECT pp.author_id INTO __account_id
+      FROM hive_posts hp
+      JOIN hive_posts pp ON hp.parent_id = pp.id
+      WHERE hp.id = __post_id;
+      IF __account_id = 0 THEN __account_id = NULL; END IF;
+  ELSE
+      __account_id = find_account_id( _account, True );
+      __post_id = find_comment_id( _author, _permlink, True );
+  END IF;
   RETURN QUERY SELECT
       hp.id,
       hp.author,

hive/db/sql_scripts/condenser_follows.sql

@@ -27,7 +27,7 @@ BEGIN
   __account_id = find_account_id( _account, True );
   __start_id = find_account_id( _start, _start <> '' );
   IF __start_id <> 0 THEN
-      SELECT INTO __start_id COALESCE( ( SELECT id FROM hive_follows WHERE following = __account_id AND follower = __start_id ), 0 );
+      SELECT INTO __start_id ( SELECT id FROM hive_follows WHERE following = __account_id AND follower = __start_id );
   END IF;
   RETURN QUERY SELECT
      ha.name
@@ -55,7 +55,7 @@ BEGIN
   __account_id = find_account_id( _account, True );
   __start_id = find_account_id( _start, _start <> '' );
   IF __start_id <> 0 THEN
-      SELECT INTO __start_id COALESCE( ( SELECT id FROM hive_follows WHERE follower = __account_id AND following = __start_id ), 0 );
+      SELECT INTO __start_id ( SELECT id FROM hive_follows WHERE follower = __account_id AND following = __start_id );
   END IF;
   RETURN QUERY SELECT
      ha.name

hive/db/sql_scripts/condenser_get_by_replies_to_account.sql

-DROP FUNCTION IF EXISTS condenser_get_by_replies_to_account;
-
-CREATE OR REPLACE FUNCTION condenser_get_by_replies_to_account(
-  in _author VARCHAR,
-  in _permlink VARCHAR,
-  in _limit INTEGER
-)
-RETURNS SETOF bridge_api_post
-AS
-$function$
-DECLARE
-  __post_id INTEGER := 0;
-BEGIN
-
-  IF _permlink <> '' THEN
-    SELECT
-        ha_pp.name, hp.id
-    INTO
-        _author, __post_id
-    FROM hive_posts hp
-    JOIN hive_posts pp ON hp.parent_id = pp.id
-    JOIN hive_accounts ha_pp ON ha_pp.id = pp.author_id
-    JOIN hive_permlink_data hpd_pp ON hpd_pp.id = pp.permlink_id
-    JOIN hive_accounts ha ON hp.author_id = ha.id
-    WHERE 
-      hpd_pp.permlink = _permlink AND ha.name =  _author;
-  END IF;
-
-  RETURN QUERY SELECT
-      hp.id,
-      hp.author,
-      hp.parent_author,
-      hp.author_rep,
-      hp.root_title,
-      hp.beneficiaries,
-      hp.max_accepted_payout,
-      hp.percent_hbd,
-      hp.url,
-      hp.permlink,
-      hp.parent_permlink_or_category,
-      hp.title,
-      hp.body,
-      hp.category,
-      hp.depth,
-      hp.promoted,
-      hp.payout,
-      hp.pending_payout,
-      hp.payout_at,
-      hp.is_paidout,
-      hp.children,
-      hp.votes,
-      hp.created_at,
-      hp.updated_at,
-      hp.rshares,
-      hp.abs_rshares,
-      hp.json,
-      hp.is_hidden,
-      hp.is_grayed,
-      hp.total_votes,
-      hp.sc_trend,
-      hp.role_title,
-      hp.community_title,
-      hp.role_id,
-      hp.is_pinned,
-      hp.curator_payout_value,
-      hp.is_muted
-    FROM hive_posts_view hp
-    JOIN
-    (
-	    SELECT hp.id
-	    FROM hive_posts_view hp
-	    WHERE hp.author = _author
-	    ORDER BY hp.id DESC
-	    LIMIT _limit
-    ) T ON hp.parent_id = T.id
-    WHERE ( ( __post_id = 0 ) OR ( hp.id <= __post_id ) )
-    ORDER BY hp.id DESC
-    LIMIT _limit;
-
-END
-$function$
-language plpgsql STABLE;

hive/db/sql_scripts/db_upgrade.sh

@@ -52,7 +52,6 @@ for sql in postgres_handle_view_changes.sql \
           database_api_list_votes.sql \
           update_posts_rshares.sql \
           update_hive_post_root_id.sql \
-          condenser_get_by_replies_to_account.sql \
           condenser_get_by_account_comments.sql \
           condenser_get_by_blog_without_reblog.sql \
           bridge_get_by_feed_with_reblog.sql \

hive/server/bridge_api/methods.py

@@ -289,7 +289,7 @@ async def get_account_posts(context, sort:str, account:str, start_author:str='',
         sql = "SELECT * FROM bridge_get_account_posts_by_comments( (:account)::VARCHAR, (:author)::VARCHAR, (:permlink)::VARCHAR, (:limit)::SMALLINT )"
     elif sort == 'replies':
         account_posts = False
-        sql = "SELECT * FROM bridge_get_account_posts_by_replies( (:account)::VARCHAR, (:author)::VARCHAR, (:permlink)::VARCHAR, (:limit)::SMALLINT )"
+        sql = "SELECT * FROM bridge_get_account_posts_by_replies( (:account)::VARCHAR, (:author)::VARCHAR, (:permlink)::VARCHAR, (:limit)::SMALLINT, True )"
     elif sort == 'payout':
         sql = "SELECT * FROM bridge_get_account_posts_by_payout( (:account)::VARCHAR, (:author)::VARCHAR, (:permlink)::VARCHAR, (:limit)::SMALLINT )"
 

hive/server/condenser_api/cursor.py

@@ -21,18 +21,16 @@ async def get_following(db, account: str, start: str, state: int, limit: int):
 async def get_reblogged_by(db, author: str, permlink: str):
     """Return all rebloggers of a post."""
 
-    sql = "SELECT * FROM condenser_get_names_by_reblogged( '{}', '{}' )".format( author, permlink )
-    names = await db.query_col(sql)
+    sql = "SELECT * FROM condenser_get_names_by_reblogged( (:author)::VARCHAR, (:permlink)::VARCHAR )"
+    names = await db.query_col(sql, author=author, permlink=permlink)
 
     if author in names:
         names.remove(author)
     return names
 
-async def get_data(db, sql:str, truncate_body: int = 0):
-    result = await db.query_all(sql); 
-
+async def process_posts(db, sql_result, truncate_body: int = 0):
     posts = []
-    for row in result:
+    for row in sql_result:
         row = dict(row)
         post = _condenser_post_object(row, truncate_body=truncate_body)
 
@@ -43,20 +41,24 @@ async def get_data(db, sql:str, truncate_body: int = 0):
 
 async def get_by_blog_without_reblog(db, account: str, start_permlink: str = '', limit: int = 20, truncate_body: int = 0):
   """Get a list of posts for an author's blog without reblogs."""
-  sql = " SELECT * FROM condenser_get_by_blog_without_reblog( '{}', '{}', {} ) ".format( account, start_permlink, limit )
-  return await get_data(db, sql, truncate_body )
+  sql = "SELECT * FROM condenser_get_by_blog_without_reblog( (:author)::VARCHAR, (:permlink)::VARCHAR, :limit )"
+  result = await db.query_all(sql, author=account, permlink=start_permlink, limit=limit);
+  return await process_posts(db, result, truncate_body)
 
 async def get_by_account_comments(db, account: str, start_permlink: str = '', limit: int = 20, truncate_body: int = 0):
   """Get a list of posts representing comments by an author."""
-  sql = " SELECT * FROM condenser_get_by_account_comments( '{}', '{}', {} ) ".format( account, start_permlink, limit )
-  return await get_data(db, sql, truncate_body )
+  sql = "SELECT * FROM condenser_get_by_account_comments( (:author)::VARCHAR, (:permlink)::VARCHAR, :limit )"
+  result = await db.query_all(sql, author=account, permlink=start_permlink, limit=limit);
+  return await process_posts(db, result, truncate_body)
 
 async def get_by_replies_to_account(db, start_author: str, start_permlink: str = '', limit: int = 20, truncate_body: int = 0):
   """Get a list of posts representing replies to an author."""
-  sql = " SELECT * FROM condenser_get_by_replies_to_account( '{}', '{}', {} ) ".format( start_author, start_permlink, limit )
-  return await get_data(db, sql, truncate_body )
+  sql = "SELECT * FROM bridge_get_account_posts_by_replies( (:account)::VARCHAR, (:author)::VARCHAR, (:permlink)::VARCHAR, (:limit)::SMALLINT, False )"
+  result = await db.query_all(sql, account=start_author, author=start_author if start_permlink else '', permlink=start_permlink, limit=limit);
+  return await process_posts(db, result, truncate_body)
 
 async def get_by_blog(db, account: str = '', start_author: str = '', start_permlink: str = '', limit: int = 20):
   """Get a list of posts for an author's blog."""
-  sql = " SELECT * FROM condenser_get_by_blog( '{}', '{}', '{}', {} ) ".format( account, start_author, start_permlink, limit )
-  return await get_data(db, sql )
+  sql = "SELECT * FROM condenser_get_by_blog( (:account)::VARCHAR, (:author)::VARCHAR, (:permlink)::VARCHAR, :limit )"
+  result = await db.query_all(sql, account=account, author=start_author, permlink=start_permlink, limit=limit);
+  return await process_posts(db, result)

hive/server/condenser_api/methods.py

@@ -379,8 +379,12 @@ async def get_discussions_by_comments(context, start_author: str = None, start_p
 async def get_replies_by_last_update(context, start_author: str = None, start_permlink: str = '',
                                      limit: int = 20, truncate_body: int = 0):
     """Get all replies made to any of author's posts."""
-    assert start_author, '`start_author` cannot be blank'
-
+    # despite the name time of last edit is not used, posts ranked by creation time (that is, their id)
+    # note that in this call start_author has dual meaning:
+    # - when there is only start_author it means account that authored posts that we seek replies to
+    # - when there is also start_permlink it points to one of replies (last post of previous page) and
+    #   we'll be getting account like above in form of author of parent post to the post pointed by
+    #   given start_author+start_permlink
     return await cursor.get_by_replies_to_account(
         context['db'],
         valid_account(start_author),

tests_api @ c50665c8

-Subproject commit cbb2c1c95d56181310e25d2ddcb9baff1bdaa83f
+Subproject commit c50665c8f66121db558caa7c205631c28e0fe2ed