Browse Source

Merge branch 'master' into fix-engine-suspend-time

Noémi Ványi 6 years ago
parent
commit
83342a2878
3 changed files with 3 additions and 48 deletions
  1. 0 44
      searx/engines/asksteem.py
  2. 0 4
      searx/settings.yml
  3. 3 0
      searx/webapp.py

+ 0 - 44
searx/engines/asksteem.py

@@ -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

+ 0 - 4
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

+ 3 - 0
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)