diff --git a/plugins/Forums.py b/plugins/Forums.py index 2915111cc..5629d298e 100644 --- a/plugins/Forums.py +++ b/plugins/Forums.py @@ -48,11 +48,11 @@ import callbacks class Forums(callbacks.PrivmsgRegexp): threaded = True - _ggThread = re.compile(r'from thread "(.*?)"') - _ggGroup = re.compile(r'Newsgroups: (.*?)') + _ggThread = re.compile(r'
Subject: ([^<]+)
') + _ggGroup = re.compile(r'Newsgroups: ]+>([^<]+)') def googlegroups(self, irc, msg, match): r"http://groups.google.com/[^\s]+" - request = urllib2.Request(match.group(0), headers=\ + request = urllib2.Request(match.group(0)+'&frame=off', headers=\ {'User-agent': 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)'}) fd = urllib2.urlopen(request) text = fd.read()