X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/9bd05cf6ce93e89492b5e239aeb7785879a57039..7a540f7cf9237aa129e5ce6a59412b65210dbe2f:/modules/youtube.py

diff --git a/modules/youtube.py b/modules/youtube.py
index 98145b5..538c91e 100644
--- a/modules/youtube.py
+++ b/modules/youtube.py
@@ -18,12 +18,14 @@ modstop = lib.modstop
 
 # module code
 import re
+import json
 import urllib2
+import urlparse
 import HTMLParser
 from BeautifulSoup import BeautifulSoup
 
 checkfor = "youtube"
-url_regex = re.compile('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+')
+yturl_regex = re.compile(r'https?://(?:www\.)?youtube\.com/watch\?[a-zA-Z0-9=&_\-]+')
 
 @lib.hooknum("PRIVMSG")
 def privmsg_hook(bot, line):
@@ -35,9 +37,18 @@ def privmsg_hook(bot, line):
 	if checkfor not in line:
 		return # doesn't concern us
 
-	for url in url_regex.findall(linetx):
-		if checkfor in url:
-			html_parser = HTMLParser.HTMLParser()
-			respdata = urllib2.urlopen(url).read()
-			soup = BeautifulSoup(respdata)
-			bot.msg(line.split()[2], BeautifulSoup(soup.title.string, convertEntities=BeautifulSoup.HTML_ENTITIES))
+	for url in yturl_regex.findall(linetx):
+		url_data = urlparse.urlparse(url)
+		query = urlparse.parse_qs(url_data.query)
+		video = query["v"][0]
+		api_url = 'http://gdata.youtube.com/feeds/api/videos/%s?alt=json&v=2' % video
+		try:
+			respdata = urllib2.urlopen(api_url).read()
+			video_info = json.loads(respdata)
+
+			title = video_info['entry']['title']["$t"]
+			author = video_info['entry']['author'][0]['name']['$t']
+
+			bot.msg(line.split()[2], "Youtube: %s (%s)" % (title, author))
+		except:
+			pass