From acb59d8bc5df94729b09f33dd3a75c6b4e079451 Mon Sep 17 00:00:00 2001 From: neersighted Date: Tue, 28 Feb 2012 23:10:36 -0800 Subject: [PATCH] update youtube.py, remove references to skybot --- core/irc.py | 4 ++-- plugins/misc.py | 2 +- plugins/youtube.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/irc.py b/core/irc.py index 6dbbb0a..b14c828 100755 --- a/core/irc.py +++ b/core/irc.py @@ -147,8 +147,8 @@ class IRC(object): self.set_pass(self.conf.get('server_password')) self.set_nick(self.nick) self.cmd("USER", - [conf.get('user', 'skybot'), "3", "*", conf.get('realname', - 'Python bot - http://github.com/rmmh/skybot')]) + [conf.get('user', 'cloudbot'), "3", "*", conf.get('realname', + 'CloudBot - http://git.io/cloudbot')]) def parse_loop(self): while True: diff --git a/plugins/misc.py b/plugins/misc.py index bb1363d..736ee7e 100755 --- a/plugins/misc.py +++ b/plugins/misc.py @@ -47,7 +47,7 @@ def onjoin(paraml, conn=None, bot=None): time.sleep(1) # HTTP Useragent - http.ua_skybot = 'CloudBot - http://git.io/cloudbot' + http.ua_cloudbot = 'CloudBot - http://git.io/cloudbot' # Stay-alive code stayalive = conn.conf.get('stayalive') diff --git a/plugins/youtube.py b/plugins/youtube.py index 82f54a9..cd12256 100755 --- a/plugins/youtube.py +++ b/plugins/youtube.py @@ -8,7 +8,7 @@ from util import hook, http locale.setlocale(locale.LC_ALL, '') youtube_re = (r'(?:youtube.*?(?:v=|/v/)|youtu\.be/|yooouuutuuube.*?id=)' - '([-_a-z0-9]+)', re.I) + '([-_a-zA-Z0-9]+)', re.I) base_url = 'http://gdata.youtube.com/feeds/api/' url = base_url + 'videos/%s?v=2&alt=jsonc'