diff options
| author | Noémi Ványi <kvch@users.noreply.github.com> | 2019-01-29 11:03:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 11:03:35 +0100 |
| commit | 83342a2878d4e677c98736c424eec85ff3a9cb4e (patch) | |
| tree | 3b33d3626dd94418f16a3cd3bc0627ae1a4fff91 /searx | |
| parent | 36790168a14a0de44697dc38e6a71b16433e2a12 (diff) | |
| parent | 0ac117770d43b61b0e7f05ea5df2fe9500dd1f2b (diff) | |
Merge branch 'master' into fix-engine-suspend-time
Diffstat (limited to 'searx')
| -rw-r--r-- | searx/engines/asksteem.py | 44 | ||||
| -rw-r--r-- | searx/settings.yml | 4 | ||||
| -rw-r--r-- | searx/webapp.py | 3 |
3 files changed, 3 insertions, 48 deletions
diff --git a/searx/engines/asksteem.py b/searx/engines/asksteem.py deleted file mode 100644 index 6738780fa..000000000 --- a/searx/engines/asksteem.py +++ /dev/null @@ -1,44 +0,0 @@ -""" - Asksteem (general) - - @website https://asksteem.com/ - @provide-api yes - - @using-api yes - @results JSON (https://github.com/Hoxly/asksteem-docs/wiki) - @stable yes - @parse url, title, content -""" - -from json import loads -from searx.url_utils import urlencode - -# engine dependent config -categories = ['general'] -paging = True -language_support = False -disabled = True - -# search-url -search_url = 'https://api.asksteem.com/search?{params}' -result_url = 'https://steemit.com/@{author}/{title}' - - -# do search-request -def request(query, params): - url = search_url.format(params=urlencode({'q': query, 'pg': params['pageno']})) - params['url'] = url - return params - - -# get response from search-request -def response(resp): - json = loads(resp.text) - - results = [] - - for result in json.get('results', []): - results.append({'url': result_url.format(author=result['author'], title=result['permlink']), - 'title': result['title'], - 'content': result['summary']}) - return results diff --git a/searx/settings.yml b/searx/settings.yml index f4d6e537c..ff7782b65 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -70,10 +70,6 @@ engines: categories : science timeout : 4.0 - - name : asksteem - engine : asksteem - shortcut : as - - name : base engine : base shortcut : bs diff --git a/searx/webapp.py b/searx/webapp.py index 977e7e675..727259774 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -295,6 +295,9 @@ def image_proxify(url): if not request.preferences.get_value('image_proxy'): return url + if url.startswith('data:image/jpeg;base64,'): + return url + if settings.get('result_proxy'): return proxify(url) |