tBKwtWS 6 anni fa
parent
commit
4b3cf696df
3 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 1 1
      rotbot/common/queries.py
  2. 2 2
      rotbot/events/on_nick.py
  3. 1 1
      website/rotbot/forms.py

+ 1 - 1
rotbot/common/queries.py

@@ -159,7 +159,7 @@ def get_top_users(self, sort):
 
 def levelup_user(self, user, xp):
     self.db.run('UPDATE rotbot_user SET level=level+1, xp_spent=xp_spent+%(xp)s, ap_spent=ap_spent+1 WHERE id=%(user_id)s', xp=xp, user_id=user.id)
-    self.db.run('UPDATE rotbot_user SET coin=coin+0.3 WHERE level>0 AND network_id=%(network_id)s', (self.network.id))
+    self.db.run('UPDATE rotbot_user SET coin=coin+0.3 WHERE level>0 AND user_id=%(user_id)s', (self.user.id))
 
 def get_user_gamestats(self, user):
     return self.db.one('SELECT xp_spent, level, coin, coin_given, coin_spent, ap_spent, karma_correction FROM rotbot_user WHERE id=%(id)s', id=user.id)

+ 2 - 2
rotbot/events/on_nick.py

@@ -5,8 +5,8 @@ def process_event(self, connection, event):
     log.info(event)
 
     # Get and update resources.
-    old_user = queries.create_or_get_and_update_last_event(self, 'user', 'nc', user_name=event.source.nick, event_subject=event.target)
-    new_user = queries.create_or_get_and_update_last_event(self, 'user', 'nc', user_name=event.target, event_subject=event.source.nick)
+    old_user = queries.create_or_get_and_update_last_event(self, 'user', 'nc', user_name=event.source.nick, event_subject_name=event.target)
+    new_user = queries.create_or_get_and_update_last_event(self, 'user', 'nc', user_name=event.target, event_subject_name=event.source.nick)
 
     # Keep preferred nick.
     if event.source.nick == connection.nickname:    # Preffered nick being changed.

+ 1 - 1
website/rotbot/forms.py

@@ -61,7 +61,7 @@ class OwnerForm(ModelForm):
 class ChannelForm(ModelForm):
     class Meta:
         model=Channel
-        fields=['autojoin', 'statistic_commands', 'games']
+        fields=['autojoin', 'statistic_commands', 'games', 'chat']
         labels={
             'autojoin': '<i class="power icon"></i>Auto join',
             'statistic_commands': '<i class="chart pie icon"></i>Statistic commands',