Deferrable call after update to fetch is replaced with a message

	modified:   bot_core/irc_bot.py

Author: sentenza

bot_core/irc_bot.py

@@ -139,15 +139,19 @@ def karma_update(self, user, channel, msg):
         if limit == 1:
             # Penalize User
             self.msg(channel, "%s: I warned you... Now you have lost karma. :(" % user )
-            threads.deferToThread(self.karma_manager.update_karma, user, plus=False)
+            deferred_update = threads.deferToThread(self.karma_manager.update_karma, user, plus=False)
             return
         if msg.endswith('++'):
-            threads.deferToThread(self.karma_manager.update_karma, receiver_nickname, plus=True)
+            deferred_update = threads.deferToThread(self.karma_manager.update_karma, receiver_nickname, plus=True)
         if msg.endswith('--'):
-            threads.deferToThread( self.karma_manager.update_karma, receiver_nickname, plus=False)
+            deferred_update = threads.deferToThread( self.karma_manager.update_karma, receiver_nickname, plus=False)
+
+        deferred_update.addCallback(self.threadSafeMsg)
 
-        deferred_fetch_update = threads.deferToThread(self.karma_manager.fetch_karma, nick=receiver_nickname)
-        deferred_fetch_update.addCallback(self.threadSafeMsg)
+        # TODO (sentenza) add a callback with the fetch operation after a deferred_update ? See #3
+        # Not synchronized!
+        # deferred_fetch_update = threads.deferToThread(self.karma_manager.fetch_karma, nick=receiver_nickname)
+        # deferred_fetch_update.addCallback(self.threadSafeMsg)
 
         #self.msg(channel, self.karma_manager.fetch_karma(receiver_nickname)) 
         self.logger.log("%s modified Karma: %s" % (user, receiver_nickname))

karma/karma_manager.py

@@ -40,7 +40,7 @@ def create_table(self, cursor):
     @db_commit 
     def fetch_karma(self, cursor, nick=None):
 
-        """Returns a message with the value of Karma for a specific user"""
+        """Returns a message with the value of Karma for a specific user (fetched by his nickname)"""
 
         if nick:
             cursor.execute("SELECT score FROM %s WHERE nick=?" % self.karma_table, (nick,))
@@ -53,7 +53,7 @@ def fetch_karma(self, cursor, nick=None):
     @db_commit
     def update_karma(self, cursor, nick, plus=True):
 
-        """Updates the karma value of a user via its nickname"""
+        """Updates the karma value of a user via his nickname"""
 
         score = 1 if plus else -1
         timestamp = int(time.time())
@@ -64,3 +64,4 @@ def update_karma(self, cursor, nick, plus=True):
             cursor.execute("""
                 INSERT INTO %s values (?,?,?)
                 """ % self.karma_table, (timestamp, nick, score))
+        return "Karma hits %s" % nick