diff --git a/plugin.py b/plugin.py index fac3467..69c6868 100644 --- a/plugin.py +++ b/plugin.py @@ -2314,16 +2314,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 @@ -2365,12 +2365,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 @@ -2378,9 +2379,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)