Merge pull request #12 from spherical-go/develop

Fix minor bugs like typeo and json convert

Author: mountain

polyclash/server.py

@@ -227,8 +227,8 @@ def on_join(data):
     logger.info(f'event join... {str(data)}')
     try:
         key = data['key']
-        if key not in rooms:
-            logger.error(f'error in event join... game({key}) not found')
+        if not storage.contains(key):
+            logger.error(f'error in event join... {key} was not found in rooms')
             emit('error', {'message': 'Game not found'})
             return
         game_id = storage.get_game_id(key)

polyclash/util/storage.py

@@ -1,3 +1,4 @@
+import json
 import secrets
 import redis
 
@@ -270,7 +271,7 @@ def get_key(self, game_id, role):
     def get_plays(self, game_id):
         if self.redis.exists(f'games:{game_id}:plays'):
             return list([
-               item.decode('utf-8') for item in self.redis.lrange(f'games:{game_id}:plays', 0, -1)
+               json.loads(item.decode('utf-8')) for item in self.redis.lrange(f'games:{game_id}:plays', 0, -1)
             ])
         else:
             return []
@@ -343,7 +344,7 @@ def is_started(self, game_id):
         return bool(self.redis.hget(f'games:{game_id}', 'started').decode('utf-8') == 'True')
 
     def add_play(self, game_id, play):
-        self.redis.rpush(f'games:{game_id}:plays', play)
+        self.redis.rpush(f'games:{game_id}:plays', json.dumps(play))
 
 
 def test_redis_connection(host='localhost', port=6379, db=0):