diff --git a/plugins/Http.py b/plugins/Http.py index 5714413a1..c5246555e 100644 --- a/plugins/Http.py +++ b/plugins/Http.py @@ -144,7 +144,9 @@ class Http(callbacks.Privmsg): _gkrating = re.compile(r'(\d+)') _gkgames = re.compile(r's:  (\d+)') - _gkrecord = re.compile(r'percentile(\d+), .*?%(\d+), .*?%(\d+)') + _gkrecord = re.compile(r'percentile(\d+), [^%]+%(\d+), [^%]+%(\d+)') + _gkteam = re.compile('Team:([^\s]+)') + _gkseen = re.compile('seen on GK: ([^\n]+)') def gkstats(self, irc, msg, args): "" name = privmsgs.getArgs(args) @@ -156,9 +158,13 @@ class Http(callbacks.Privmsg): rating = self._gkrating.search(profile).group(1) games = self._gkgames.search(profile).group(1) profile = stripHtml(profile) + team = self._gkteam.search(profile).group(1) + seen = self._gkseen.search(profile).group(1) (w, l, d) = self._gkrecord.search(profile).groups() - irc.reply(msg, '%s is rated %s and has %s active games; ' - 'W-%s, L-%s, D-%s' % (name, rating, games, w, l, d)) + irc.reply(msg, '%s (team %s) is rated %s and has %s active games ' + 'and a record of W-%s, L-%s, D-%s. ' \ + '%s was last seen on Gameknot %s' % \ + (name, team, rating, games, w, l, d, name, seen)) except AttributeError: if profile.find('User %s not found!' % name) != -1: irc.error(msg, 'No user %s exists.')