fix issue #5

Author: klercke

activity.py

@@ -16,6 +16,7 @@
 #################################
                                 #
 USER_DATABSE = 'data/users.csv' #
+MAX_SCORE = 250                 #
                                 #
 #################################
 
@@ -37,16 +38,20 @@ def __str__(self):
 
 
     def change_score(self, delta):
-        if (self.score + delta > 0 and self.score + delta < 250):
+        if (self.score + delta > MAX_SCORE):
+            self.score = MAX_SCORE
+        elif (self.score + delta < 0):
+            self.score = 0
+        else:
             self.score += delta
+
         write_database()
-        return self.score
 
 
 def change_all_scores(delta):
     for user in USERS.values():
-        if (user.score + delta > 0 and user.score + delta < 250):
-            user.score += delta
+        user.change_score(delta)
+        
 
     write_database()
 

protobot.py

@@ -145,7 +145,7 @@ async def on_message(message):
 
         return
 
-    else:
+    elif message.content[0] != "!":
         change_user_score(message.author.id, POINTS_PER_MESSAGE)
 
     if 'happy birthday' in message.content.lower():
@@ -201,9 +201,6 @@ async def check_user_score(ctx):
     uuid = ctx.message.author.id
     score = get_user_score(uuid)
 
-    # Take away the points the user gets for running the command
-    change_user_score(uuid, -POINTS_PER_MESSAGE)
-
     await ctx.message.channel.send(f"Score for <@{uuid}>: {score}")