X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/acfe3d05a38cb59e55e2c19a4f075cc3ef948687..04d483534a020aca9f4879f11c743b775bbdb5f2:/modules/urls.py?ds=sidebyside

diff --git a/modules/urls.py b/modules/urls.py
index 6dfdeb2..72bdb99 100644
--- a/modules/urls.py
+++ b/modules/urls.py
@@ -99,11 +99,12 @@ def privmsg_hook(bot, textline):
 	except IndexError:
 		line = ''
 
+	responses = []
 	for match in url_regex.findall(line):
 		if match:
-			response = goturl(match)
-			if response is not None:
-				bot.msg(chan, response)
+			responses.append(goturl(match))
+	if len(responses) > 0:
+		bot.msg(chan, ' | '.join(responses), True)
 
 def unescape(line):
 	return re.sub('\s+', ' ', html_parser.unescape(line))
@@ -165,9 +166,9 @@ def goturl(url):
 	request = urllib2.Request(url)
 	opener = urllib2.build_opener(SmartRedirectHandler())
 	try:
-		soup = BeautifulSoup(opener.open(request, timeout=2))
+		soup = BeautifulSoup(opener.open(request, timeout=0.5))
 		return unescape('Title: %s' % (soup.title.string))
 	except urllib2.HTTPError as e:
 		return 'Error: %s %s' % (e.code, e.reason)
-	except:
-		return None
+	except Exception as e:
+		return 'Error: %r' % (e.message)