Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-17 06:00:42 +01:00
Code Issues Projects Releases Wiki Activity

DDG: expand redirect links in search results

Browse Source 
Some links on DuckDuckGo's site are now shown going through a redirect service.
These links are in the format "/l/?kh=-1&uddg=https%3A%2F%2Fduckduckgo.com%2F" instead of simply being "https://duckduckgo.com", and we should decode these here.

From: 8187d51cef
This commit is contained in:
James Lu 2017-01-20 18:14:07 -08:00
parent 98600b26e8
commit c92bc0ca0c
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugin.py
View File

@ -43,9 +43,10 @@ except ImportError:
try: # Python 3 try: # Python 3
from urllib.parse import urlencode from urllib.parse import urlencode, parse_qs
except ImportError: # Python 2 except ImportError: # Python 2
from urllib import urlencode from urllib import urlencode
from urlparse import parse_qs
try: try:
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
except ImportError: except ImportError:
@ -99,7 +100,20 @@ class DDG(callbacks.Plugin):
# 2) Fetch the link title. # 2) Fetch the link title.
title = res.a.text.strip() title = res.a.text.strip()
# 3) Fetch the result link. # 3) Fetch the result link.
link = res.a.get('href') origlink = link = res.a.get('href')
# As of 2017-01-20, some links on DuckDuckGo's site are shown going through
# a redirect service. The links are in the format "/l/?kh=-1&uddg=https%3A%2F%2Fduckduckgo.com%2F"
# instead of simply being "https://duckduckgo.com". So, we decode these links here.
if link.startswith('/l/'):
linkparse = utils.web.urlparse(link)
try:
link = parse_qs(linkparse.query)['uddg'][0]
except (IndexError, KeyError):
self.log.exception("DDG: failed to expand redirected result URL %s", origlink)
else:
self.log.debug("DDG: expanded result URL from %s to %s", origlink, link)
s = format("%s - %s %u", ircutils.bold(title), snippet, s = format("%s - %s %u", ircutils.bold(title), snippet,
link) link)
replies.append(s) replies.append(s)