From e31f1e5edfd7821069953f2839a75be069877c4e Mon Sep 17 00:00:00 2001
From: Jason Salyers <jsalyers@syncad.com>
Date: Tue, 30 Jun 2020 16:09:18 -0400
Subject: [PATCH] Revert "[JES] Add a limit on the get_discussion call to only
return at most 2000..."
This reverts commit abf88ff64b2864a803d8bff7bfbd5de08ea900ad
---
hive/server/bridge_api/methods.py | 33 +------------------------------
hive/server/bridge_api/thread.py | 1 -
hive/server/common/mutes.py | 10 ----------
hive/server/condenser_api/call.py | 1 -
hive/server/serve.py | 1 -
5 files changed, 1 insertion(+), 45 deletions(-)
diff --git a/hive/server/bridge_api/methods.py b/hive/server/bridge_api/methods.py
index 6276098a0..8599b23b9 100644
--- a/hive/server/bridge_api/methods.py
+++ b/hive/server/bridge_api/methods.py
@@ -340,8 +340,7 @@ async def get_relationship_between_accounts(context, account1, account2, observe
'follows': False,
'ignores': False,
'is_blacklisted': False,
- 'follows_blacklists': False,
- 'follows_muted': False
+ 'follows_blacklists': False
}
for row in sql_result:
@@ -355,36 +354,6 @@ async def get_relationship_between_accounts(context, account1, account2, observe
result['is_blacklisted'] = True
if row['follow_blacklists']:
result['follows_blacklists'] = True
- if row['follow_muted']:
- result['follows_muted'] = True
return result
-@return_error_info
-async def get_follow_list(context, observer, follow_type = 'blacklisted', starting_account = '', limit = 20):
- db = context['db']
- valid_account(observer)
- valid_account(starting_account, allow_empty=True)
- valid_limit(limit, 100)
-
- valid_types = ['blacklisted', 'follow_blacklist', 'muted', 'follow_muted']
- assert follow_type in valid_types, 'invalid follow_type'
-
- results = []
- blacklists_for_user = await Mutes.get_blacklists_for_observer(observer, context)
- for account in blacklists_for_user.keys():
- sources = blacklists_for_user[account]
- if follow_type == 'blacklisted':
- if 'my_blacklist' in sources:
- results.append(account)
- elif follow_type == 'follow_blacklist':
- if 'my_followed_blacklists' in sources:
- results.append(account)
- elif follow_type == 'muted':
- if 'my_muted' in sources:
- results.append(account)
- elif follow_type == 'follow_muted':
- if 'my_followed_mutes' in sources:
- results.append(account)
- return results
-
diff --git a/hive/server/bridge_api/thread.py b/hive/server/bridge_api/thread.py
index d73358d02..532a250e7 100644
--- a/hive/server/bridge_api/thread.py
+++ b/hive/server/bridge_api/thread.py
@@ -45,7 +45,6 @@ async def get_discussion(context, author, permlink, observer=None):
INNER JOIN hive_post_data hpd ON hpd.id = hive_posts.id
INNER JOIN hive_category_data hcd ON hcd.id = hp.category_id
WHERE NOT hive_posts.is_deleted AND NOT hive_posts.is_muted
- LIMIT 2000
"""
blacklists_for_user = None
diff --git a/hive/server/common/mutes.py b/hive/server/common/mutes.py
index da0219b8e..53fc16777 100644
--- a/hive/server/common/mutes.py
+++ b/hive/server/common/mutes.py
@@ -19,15 +19,6 @@ WITH blacklisted_users AS (
(SELECT following FROM hive_follows WHERE follower =
(SELECT id FROM hive_accounts WHERE name = :observer )
AND follow_blacklists) AND blacklisted
- UNION ALL
- SELECT following, 'my_muted' AS source FROM hive_follows WHERE follower =
- (SELECT id FROM hive_accounts WHERE name = :observer)
- AND state = 2
- UNION ALL
- SELECT following, 'my_followed_mutes' AS source FROm hive_follows WHERE follower IN
- (SELECT following FROM hive_follows WHERE follower =
- (SELECT id FROM hive_accounts WHERE name = :observer)
- AND follow_muted) AND state = 2
)
SELECT following, source FROM blacklisted_users
"""
@@ -105,7 +96,6 @@ class Mutes:
if account_name not in blacklisted_users:
blacklisted_users[account_name] = []
blacklisted_users[account_name].append(row['source'])
- print('blacklist for user', blacklisted_users)
return blacklisted_users
@classmethod
diff --git a/hive/server/condenser_api/call.py b/hive/server/condenser_api/call.py
index 694e5cb63..71f27d59f 100644
--- a/hive/server/condenser_api/call.py
+++ b/hive/server/condenser_api/call.py
@@ -82,7 +82,6 @@ async def call(context, api, method, params):
"params":["database_api","get_state",["trending"]]}
```"""
# pylint: disable=too-many-return-statements, too-many-branches, no-else-return
- print("api is: ", api)
assert api == 'condenser_api', "`call` requires condenser_api"
# Follows
diff --git a/hive/server/serve.py b/hive/server/serve.py
index a70bb0fa8..ad75d2c0d 100644
--- a/hive/server/serve.py
+++ b/hive/server/serve.py
@@ -138,7 +138,6 @@ def build_methods():
bridge_api.get_profile,
bridge_api.get_trending_topics,
bridge_api.get_relationship_between_accounts,
- bridge_api.get_follow_list,
hive_api_notify.post_notifications,
hive_api_notify.account_notifications,
hive_api_notify.unread_notifications,
--
GitLab