LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

show channels regardless of no_source

Browse source
This commit is contained in:
Victor Shyba 2021-03-26 00:27:05 -03:00 committed by Lex Berezhny
parent b8c9a99f20
commit aa727cb9b1
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lbry/wallet/server/db/elasticsearch/constants.py
View file

@ -42,7 +42,7 @@ FIELDS = {'is_controlling', 'last_take_over_height', 'claim_id', 'claim_name', '
'claims_in_channel', 'channel_join', 'signature_valid', 'effective_amount', 'support_amount', 'claims_in_channel', 'channel_join', 'signature_valid', 'effective_amount', 'support_amount',
'trending_group', 'trending_mixed', 'trending_local', 'trending_global', 'channel_id', 'tx_id', 'tx_nout', 'trending_group', 'trending_mixed', 'trending_local', 'trending_global', 'channel_id', 'tx_id', 'tx_nout',
'signature', 'signature_digest', 'public_key_bytes', 'public_key_hash', 'public_key_id', '_id', 'tags', 'signature', 'signature_digest', 'public_key_bytes', 'public_key_hash', 'public_key_id', '_id', 'tags',
'reposted_claim_id', 'has_source'} 'reposted_claim_id'}
TEXT_FIELDS = {'author', 'canonical_url', 'channel_id', 'claim_name', 'description', 'claim_id', TEXT_FIELDS = {'author', 'canonical_url', 'channel_id', 'claim_name', 'description', 'claim_id',
'media_type', 'normalized', 'public_key_bytes', 'public_key_hash', 'short_url', 'signature', 'media_type', 'normalized', 'public_key_bytes', 'public_key_hash', 'short_url', 'signature',
'signature_digest', 'stream_type', 'title', 'tx_id', 'fee_currency', 'reposted_claim_id', 'tags'} 'signature_digest', 'stream_type', 'title', 'tx_id', 'fee_currency', 'reposted_claim_id', 'tags'}

6
lbry/wallet/server/db/elasticsearch/search.py
View file

@ -432,8 +432,10 @@ def expand_query(**kwargs):
if 'has_source' in kwargs: if 'has_source' in kwargs:
query.setdefault('should', []) query.setdefault('should', [])
query["minimum_should_match"] = 1 query["minimum_should_match"] = 1
query['should'].append({"bool": {"must": [{"match": {"has_source": kwargs['has_source']}}, {"match": {"claim_type": CLAIM_TYPES['stream']}}]}}) is_stream_or_repost = {"terms": {"claim_type": [CLAIM_TYPES['stream'], CLAIM_TYPES['repost']]}}
query['should'].append({"bool": {"must_not": [{"match": {"claim_type": CLAIM_TYPES['stream']}}]}}) query['should'].append(
{"bool": {"must": [{"match": {"has_source": kwargs['has_source']}}, is_stream_or_repost]}})
query['should'].append({"bool": {"must_not": [is_stream_or_repost]}})
if kwargs.get('text'): if kwargs.get('text'):
query['must'].append( query['must'].append(
{"simple_query_string": {"simple_query_string":

7
tests/integration/blockchain/test_claim_commands.py
View file

@ -180,13 +180,14 @@ class ClaimSearchCommand(ClaimTestCase):
await self.assertFindsClaims([three], claim_id=self.get_claim_id(three), text='*') await self.assertFindsClaims([three], claim_id=self.get_claim_id(three), text='*')
async def test_source_filter(self): async def test_source_filter(self):
channel = await self.channel_create('@abc')
no_source = await self.stream_create('no-source', data=None) no_source = await self.stream_create('no-source', data=None)
normal = await self.stream_create('normal', data=b'normal') normal = await self.stream_create('normal', data=b'normal')
normal_repost = await self.stream_repost(self.get_claim_id(normal), 'normal-repost') normal_repost = await self.stream_repost(self.get_claim_id(normal), 'normal-repost')
no_source_repost = await self.stream_repost(self.get_claim_id(no_source), 'no-source-repost') no_source_repost = await self.stream_repost(self.get_claim_id(no_source), 'no-source-repost')
await self.assertFindsClaims([no_source_repost, no_source], has_no_source=True) await self.assertFindsClaims([no_source_repost, no_source, channel], has_no_source=True)
await self.assertFindsClaims([normal_repost, normal], has_source=True) await self.assertFindsClaims([normal_repost, normal, channel], has_source=True)
await self.assertFindsClaims([no_source_repost, normal_repost, normal, no_source]) await self.assertFindsClaims([no_source_repost, normal_repost, normal, no_source, channel])
async def test_pagination(self): async def test_pagination(self):
await self.create_channel() await self.create_channel()