botfixes

rotbot/common/queries.py

@@ -81,7 +81,7 @@ def create_or_get_and_update_last_event(self, table, event_type, channel_name=No
             fields += ', last_event_subject_id'
             values += ', %(last_event_subject_id)s'
         if table == 'channel':
-            self.db.run('INSERT INTO rotbot_' + table + ' (' + fields + ', autojoin, key, games) VALUES (' + values + ', %(autojoin)s, %(key)s, %(games)s)', name=name, network_id=self.network.id, slug=new_slug, last_event_type=event_type, last_event_datetime=datetime.datetime.now(), last_event_channel_id=event_channel_id, last_event_user_id=event_user_id, last_event_content=event_content, last_event_subject_id=event_subject_id, autojoin=False, key='', games=False)  # Create record.
+            self.db.run('INSERT INTO rotbot_' + table + ' (' + fields + ', autojoin, key, games, statistic_commands) VALUES (' + values + ', %(autojoin)s, %(key)s, %(games)s, %(statistic_commands)s)', name=name, network_id=self.network.id, slug=new_slug, last_event_type=event_type, last_event_datetime=datetime.datetime.now(), last_event_channel_id=event_channel_id, last_event_user_id=event_user_id, last_event_content=event_content, last_event_subject_id=event_subject_id, autojoin=False, key='', games=False, statistic_commands=False)  # Create record.
         else:
             self.db.run('INSERT INTO rotbot_' + table + ' (' + fields + ') VALUES (' + values + ')', name=name, network_id=self.network.id, slug=new_slug, last_event_type=event_type, last_event_datetime=datetime.datetime.now(), last_event_channel_id=event_channel_id, last_event_user_id=event_user_id, last_event_content=event_content, last_event_subject_id=event_subject_id)  # Create record.
         record = self.db.one('SELECT * FROM rotbot_' + table + ' WHERE slug=%(slug)s', slug=new_slug)   # Lookup newly created record to return to call.

website/rotbot/models.py

@@ -160,28 +160,6 @@ class Channel(models.Model):
         max_length=2,
         choices=EVENT_TYPE_CHOICES,
     )
-    EVENT_TYPE_CHOICES = [
-        ('pm', 'private message'),
-        ('pa', 'private action'),
-        ('pn', 'private notice'),
-        ('cm', 'channel message'),
-        ('ca', 'channel action'),
-        ('cn', 'channel notice'),
-        ('ct', 'channel topic'),
-        ('ck', 'channel password'),
-        ('ci', 'channel invite'),
-        ('cj', 'channel join'),
-        ('cp', 'channel part'),
-        ('ck', 'channel kick'),
-        ('kd', 'channel kicked'),
-        ('mc', 'mode change'),
-        ('nc', 'nick change'),
-        ('sq', 'quit'),
-    ]
-    last_event_type = models.CharField(
-        max_length=2,
-        choices=EVENT_TYPE_CHOICES,
-    )
     last_event_datetime = models.DateTimeField(
         auto_now=True,
     )