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

merge conflicts

Browse source
This commit is contained in:
Jack Robison 2021-09-13 11:56:44 -04:00
parent 1ff7b77ee0
commit 6231861dd6
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ FIELDS = {
TEXT_FIELDS = {'author', 'canonical_url', 'channel_id', 'description', 'claim_id', 'censoring_channel_id', TEXT_FIELDS = {'author', 'canonical_url', 'channel_id', 'description', 'claim_id', 'censoring_channel_id',
'media_type', 'normalized', 'public_key_bytes', 'public_key_id', 'short_url', 'signature', 'media_type', 'normalized', 'public_key_bytes', 'public_key_id', 'short_url', 'signature',
'name', 'signature_digest', 'stream_type', 'title', 'tx_id', 'fee_currency', 'reposted_claim_id', 'name', 'signature_digest', 'title', 'tx_id', 'fee_currency', 'reposted_claim_id',
'tags'} 'tags'}
RANGE_FIELDS = { RANGE_FIELDS = {
@ -78,7 +78,7 @@ REPLACEMENTS = {
'trending_mixed': 'trending_score', 'trending_mixed': 'trending_score',
'normalized_name': 'normalized', 'normalized_name': 'normalized',
'reposted': 'repost_count', 'reposted': 'repost_count',
# 'stream_types': 'stream_type', 'stream_types': 'stream_type',
# 'media_types': 'media_type', 'media_types': 'media_type',
'valid_channel_signature': 'is_signature_valid' 'valid_channel_signature': 'is_signature_valid'
} }

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

@ -9,7 +9,6 @@ from typing import Optional, List, Iterable, Union
from elasticsearch import AsyncElasticsearch, NotFoundError, ConnectionError from elasticsearch import AsyncElasticsearch, NotFoundError, ConnectionError
from elasticsearch.helpers import async_streaming_bulk from elasticsearch.helpers import async_streaming_bulk
from lbry.error import ResolveCensoredError, TooManyClaimSearchParametersError from lbry.error import ResolveCensoredError, TooManyClaimSearchParametersError
from lbry.schema.result import Outputs, Censor from lbry.schema.result import Outputs, Censor
from lbry.schema.tags import clean_tags from lbry.schema.tags import clean_tags
@ -503,8 +502,8 @@ def expand_query(**kwargs):
value = CLAIM_TYPES[value] value = CLAIM_TYPES[value]
else: else:
value = [CLAIM_TYPES[claim_type] for claim_type in value] value = [CLAIM_TYPES[claim_type] for claim_type in value]
# elif key == 'stream_type': elif key == 'stream_type':
# value = STREAM_TYPES[value] if isinstance(value, str) else list(map(STREAM_TYPES.get, value)) value = [STREAM_TYPES[value]] if isinstance(value, str) else list(map(STREAM_TYPES.get, value))
if key == '_id': if key == '_id':
if isinstance(value, Iterable): if isinstance(value, Iterable):
value = [item[::-1].hex() for item in value] value = [item[::-1].hex() for item in value]
@ -512,8 +511,6 @@ def expand_query(**kwargs):
value = value[::-1].hex() value = value[::-1].hex()
if not many and key in ('_id', 'claim_id') and len(value) < 20: if not many and key in ('_id', 'claim_id') and len(value) < 20:
partial_id = True partial_id = True
if key == 'public_key_id':
value = Base58.decode(value)[1:21].hex()
if key in ('signature_valid', 'has_source'): if key in ('signature_valid', 'has_source'):
continue # handled later continue # handled later
if key in TEXT_FIELDS: if key in TEXT_FIELDS: