From 838eb08f54c508e50224009f001c271ad8750946 Mon Sep 17 00:00:00 2001 From: rootcoma Date: Sat, 16 Nov 2013 09:54:31 -0800 Subject: [PATCH] Fixing .transferpoints, was broken after adding username_canonical --- plugin.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/plugin.py b/plugin.py index 7d7408e..464bbef 100644 --- a/plugin.py +++ b/plugin.py @@ -2293,16 +2293,16 @@ class TriviaTime(callbacks.Plugin): c.close() def removeUserLogs(self, username): - username = ircutils.toLower(username) + usernameCanonical = ircutils.toLower(username) c = self.conn.cursor() c.execute('''delete from triviauserlog - where username_canonical=?''', (username,)) + where username_canonical=?''', (usernameCanonical,)) self.conn.commit() c.close() def transferUserLogs(self, userFrom, userTo): - userFrom = ircutils.toLower(userFrom) - userTo = ircutils.toLower(userTo) + userFromCanonical = ircutils.toLower(userFrom) + userToCanonical = ircutils.toLower(userTo) c = self.conn.cursor() c.execute(''' update triviauserlog @@ -2344,12 +2344,13 @@ class TriviaTime(callbacks.Plugin): and username_canonical=? ) ) - ''', (userFrom,userFrom,userTo,userFrom)) + ''', (userFromCanonical,userFromCanonical,userToCanonical,userFromCanonical)) c.execute(''' update triviauserlog - set username=? - where username=? + set username=?, + username_canonical=? + where username_canonical=? and not exists ( select 1 from triviauserlog tl @@ -2357,9 +2358,9 @@ class TriviaTime(callbacks.Plugin): and tl.month=triviauserlog.month and tl.year=triviauserlog.year and tl.channel_canonical=triviauserlog.channel_canonical - and tl.username=? + and tl.username_canonical=? ) - ''',(userTo, userFrom, userTo)) + ''',(userTo, userToCanonical, userFromCanonical, userToCanonical)) self.conn.commit() self.removeUserLogs(userFrom)