nakidai
/
whoogle-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove "/" before endpoints & tags (#734) 

Removes the leading slash before imgres and other endpoints

Fix #733
main
invis-z 2022-04-28 04:25:14 +08:00 committed by GitHub
parent ad112e236e
commit b4d9f1f5e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/filter.py
View File

@ -72,7 +72,7 @@ def clean_css(css: str, page_url: str) -> str:
continue continue
css = css.replace( css = css.replace(
url, url,
f'/element?type=image/png&url={abs_url}' f'{Endpoint.element}?type=image/png&url={abs_url}'
) )
return css return css
@ -466,7 +466,8 @@ class Filter:
if href.startswith(MAPS_URL): if href.startswith(MAPS_URL):
# Maps links don't work if a site filter is applied # Maps links don't work if a site filter is applied
link['href'] = MAPS_URL + "?q=" + clean_query(q) link['href'] = MAPS_URL + "?q=" + clean_query(q)
elif href.startswith('/?') or href.startswith('/search?'): elif (href.startswith('/?') or href.startswith('/search?') or
href.startswith('/imgres?')):
# make sure that tags can be clicked as relative URLs # make sure that tags can be clicked as relative URLs
link['href'] = href[1:] link['href'] = href[1:]
elif href.startswith('/intl/'): elif href.startswith('/intl/'):
@ -528,7 +529,7 @@ class Filter:
continue continue
img_url = urlparse.unquote(urls[0].replace( img_url = urlparse.unquote(urls[0].replace(
f'/{Endpoint.imgres}?imgurl=', '')) f'{Endpoint.imgres}?imgurl=', ''))
try: try:
# Try to strip out only the necessary part of the web page link # Try to strip out only the necessary part of the web page link

4
app/utils/results.py
View File

@ -186,7 +186,7 @@ def append_nojs(result: BeautifulSoup) -> None:
""" """
nojs_link = BeautifulSoup(features='html.parser').new_tag('a') nojs_link = BeautifulSoup(features='html.parser').new_tag('a')
nojs_link['href'] = f'/{Endpoint.window}?nojs=1&location=' + result['href'] nojs_link['href'] = f'{Endpoint.window}?nojs=1&location=' + result['href']
nojs_link.string = ' NoJS Link' nojs_link.string = ' NoJS Link'
result.append(nojs_link) result.append(nojs_link)
@ -206,7 +206,7 @@ def append_anon_view(result: BeautifulSoup, config: Config) -> None:
av_link = BeautifulSoup(features='html.parser').new_tag('a') av_link = BeautifulSoup(features='html.parser').new_tag('a')
nojs = 'nojs=1' if config.nojs else 'nojs=0' nojs = 'nojs=1' if config.nojs else 'nojs=0'
location = f'location={result["href"]}' location = f'location={result["href"]}'
av_link['href'] = f'/{Endpoint.window}?{nojs}&{location}' av_link['href'] = f'{Endpoint.window}?{nojs}&{location}'
translation = current_app.config['TRANSLATIONS'][ translation = current_app.config['TRANSLATIONS'][
config.get_localization_lang() config.get_localization_lang()
] ]