bugfixes

rotbot/common/queries.py

@@ -242,7 +242,7 @@ def punish_user(self, user_id, coin, karma):
     self.db.run('UPDATE website_users SET coin=coin-%(coin)s, karma_correction=karma_correction-%(karma)s WHERE id=%(user_id)s', coin=coin, karma=karma, user_id=user_id)
 
 def payday(self, coin):
-    self.db.run('UPDATE rotbot_user SET coin=coin+%(coin)s WHERE level>0', user_id=user.id)
+    self.db.run('UPDATE rotbot_user SET coin=coin+%(coin)s WHERE level>0')
 
 def cointransfer(self, sender_id, receiver_id, coin):
     self.db.run('UPDATE rotbot_user SET coin=coin-%(coin)s, coin_spent=coin_spent+%(coin)s, coin_given=coin_given+%(coin)s, ap_spent=ap_spent+1 WHERE id=%(sender_id)s', coin=coin, sender_id=sender_id)

rotbot/events/on_kick.py

@@ -15,7 +15,11 @@ def process_event(self, connection, event):
     queries.increment_kick(self, channel.id, kicker.id, kicked.id)
 
     if kicked.name == connection.get_nickname() or kicked.name == self.network.nickname:
-        connection.action(self.network.home_channel, 'just got kicked from: %s%s' % (font.red, event.target))
+        connection.action(self.network.home_channel, 'just got kicked from %s%s %sby %s%s' % (font.red, event.target, font.reset, font.red, event.source.nick))
+        connection.privmsg(event.source.nick, 'Sorry you needed to kick me. Bot\'s should serve those who enjoy it, without annoying anyone. Any channelOP can use the !settings command to change my settings.')
+        temp_key = queries.create_tempchannelkey(self, channel.id)
+        connection.privmsg(event.source.nick, 'Here is a temp 10 minute link for %s%s%s:%s %schannelsettings/%s' % (event.target, font.red, event.target, font.reset, self.webgui['base_ur'], temp_key))
+        connection.privmsg(event.source.nick, 'If you have any complaints, suggestions or want me back in %s%s%s contact an operator of: %s%s' % (font.red, event.target, font.reset, font.red, self.network.home_channel))
 
     # # Update protectees if needed.
     # if channel == self.homechannel: # Kicked from home channel