diff --git a/twoot.py b/twoot.py index b2ea65b..21209be 100755 --- a/twoot.py +++ b/twoot.py @@ -216,13 +216,14 @@ def main(argv): if m is not None: link_url = m.group(0) try: - r = requests.get(link_url) + r = requests.get(link_url, timeout=10) if r.status_code == 200: # Matches the first instance of either twitter:image or twitter:image:src meta tag match = re.search(r'', r.text) if match is not None: - photos.append(match.group(1)) - except (ConnectionError, requests.exceptions.ContentDecodingError): + url = match.group(1).replace('&', '&') # Remove HTML-safe encoding from URL if any + photos.append(url) + except (requests.exceptions.ConnectionError, requests.exceptions.Timeout): pass # Add dictionary with content of tweet to list