partybot/pnutbot.py

@@ -103,7 +103,7 @@ def optout(msg):
         db_session.add(entry)
         db_session.commit()
 
-    reply = "@" + msg.user.username
+    reply = "@" + msg.user.username 
     reply += " you have been removed from the karma table"
     send(msg.channel_id, reply)
 
@@ -154,18 +154,8 @@ def karma(room):
     reply = "Karma standings\n\n"
     results = Karma.query.filter(Karma.chanid == room).order_by(Karma.karma.desc()).all()
     for entry in results:
-        try:
-            user, meta = pnutpy.api.get_user(entry.userid)
-            reply += user.username + ": " + str(entry.karma) + "\n"
-
-        except pnutpy.errors.PnutMissing:
-            del_karma = Karma.query.filter(Karma.userid == entry.userid).one_or_none()
-            if del_karma:
-                db_session.delete(del_karma)
-            del_counter = MdnpRequests.query.filter(MdnpRequests.userid == entry.userid).one_or_none()
-            if del_counter:
-                db_session.delete(del_counter)
-            db_session.commit()
+        user, meta = pnutpy.api.get_user(entry.userid)
+        reply += user.username + ": " + str(entry.karma) + "\n"
     send(room, reply)
 
 def chimpnut(msg):
@@ -173,7 +163,7 @@ def chimpnut(msg):
     if prefs is None:
         prefs = Preferences(userid=msg.user.id, chimpnut=False)
         db_session.add(prefs)
-
+    
     if prefs.chimpnut:
         prefs.chimpnut = False
         reply = "@" + msg.user.username + " ChimPnut alert is now disabled"
@@ -192,16 +182,16 @@ def on_command(msg):
 
     elif args[0] == "!botsnack":
         botsnack(msg.channel_id)
-
+    
     elif args[0] == "!botdrink":
         botdrink(msg.channel_id)
-
+    
     elif args[0] == "!optout":
         optout(msg)
-
+    
     elif args[0] == "!optin":
         optin(msg)
-
+    
     elif args[0] == "!chimpnut":
         chimpnut(msg)
 
@@ -225,7 +215,7 @@ def on_vote(msg, matcher):
             reply += " silly human, your karma must be decided by others!"
             send(msg.channel_id, reply)
             return
-
+    
     except pnutpy.errors.PnutMissing:
         reply = "@" + msg.user.username
         reply += " I do not know who that is"
@@ -277,7 +267,7 @@ def on_mndp(msg):
 
     if "NowPlaying" not in tags:
         return
-
+    
     for m in mentions:
         addkarma = False
         try:
@@ -317,7 +307,7 @@ def on_message(ws, message):
         logger.debug("connection_id: " + msg['meta']['connection_id'])
         subscribe(msg['meta']['connection_id'])
         return
-
+    
     if 'data' in msg:
 
         if "channel_type" in msg['meta'] and msg['meta']['channel_type'] == "io.pnut.core.chat":
@@ -377,7 +367,7 @@ def on_open(ws):
                 step += 1
             time.sleep(5)
         logger.debug("*** terminate ***")
-
+    
     t = threading.Thread(target=run)
     t.start()
 
@@ -430,7 +420,7 @@ def main():
     ws_url += "?access_token=" + config['ACCESS_TOKEN']
 
     # setup the websocket connection
-    ws = websocket.WebSocketApp(ws_url, on_message=on_message,
+    ws = websocket.WebSocketApp(ws_url, on_message=on_message, 
         on_error=on_error, on_close=on_close)
     ws.on_open = on_open
     r = True