diff --git a/hive/indexer/posts.py b/hive/indexer/posts.py index 5c858ef51a40a253deb166def5582e7c7a5c27ce..54949220096a7af441db1f6865802468f9443b7f 100644 --- a/hive/indexer/posts.py +++ b/hive/indexer/posts.py @@ -304,7 +304,7 @@ class Posts: author, permlink, "NULL" if ( total_payout_value is None ) else ( "'{}'".format( legacy_amount(total_payout_value) ) ), - "NULL" if ( curators_vesting_payout is None ) else ( "'{}'".format( legacy_amount(curators_vesting_payout) ) ), #curator_payout_value + "NULL" if ( curator_payout_value is None ) else ( "'{}'".format( legacy_amount(curator_payout_value) ) ), "NULL" if ( author_rewards is None ) else author_rewards, "NULL" if ( author_rewards_hive is None ) else author_rewards_hive, "NULL" if ( author_rewards_hbd is None ) else author_rewards_hbd, diff --git a/hive/server/condenser_api/tags.py b/hive/server/condenser_api/tags.py index 7c687cfdde938238c23ada35668643c7cd65bcc6..cdf541ec14a9e21893404c11365a7f00f2e3a3e6 100644 --- a/hive/server/condenser_api/tags.py +++ b/hive/server/condenser_api/tags.py @@ -29,10 +29,10 @@ async def get_trending_tags(context, start_tag: str = '', limit: int = 250): if start_tag: seek = """ - HAVING SUM(payout) <= ( - SELECT SUM(payout) + HAVING SUM(payout + pending_payout) <= ( + SELECT SUM(payout + pending_payout) FROM hive_posts - WHERE is_paidout = '0' + WHERE is_paidout = '0' and is_deleted = false AND category_id = (SELECT id FROM hive_category_data WHERE category = :start_tag)) """ else: @@ -42,11 +42,11 @@ async def get_trending_tags(context, start_tag: str = '', limit: int = 250): SELECT (SELECT category FROM hive_category_data WHERE id = category_id) as category, COUNT(*) AS total_posts, SUM(CASE WHEN depth = 0 THEN 1 ELSE 0 END) AS top_posts, - SUM(payout) AS total_payouts + SUM(payout + pending_payout) AS total_payouts FROM hive_posts - WHERE is_paidout = '0' + WHERE is_paidout = '0' and is_deleted = false GROUP BY category %s - ORDER BY SUM(payout) DESC + ORDER BY SUM(payout + pending_payout) DESC LIMIT :limit """ % seek