Make team_size configurable in config.json

config.json.example

@@ -1,3 +1,4 @@
 {
-  "token": "longtesttokenfromdiscordapi"
+  "token": "longtesttokenfromdiscordapi",
+  "team_size": 5
 }

gather/gatherbot.py

@@ -8,10 +8,10 @@
 
 
 class GatherBot(ListenerBot):
-    def __init__(self):
+    def __init__(self, team_size):
         super().__init__()
 
-        self.organiser = Organiser()
+        self.organiser = Organiser(team_size)
         self.client = discord.Client()
 
         @self.client.event
@@ -44,7 +44,7 @@ async def announce_players(self, channel):
             channel,
             'Currently signed in players ({0}/{1}): {2}.'.format(
                 len(self.organiser.queues[channel]),
-                self.organiser.TEAM_SIZE * 2,
+                self.organiser.team_size * 2,
                 ', '.join([str(p) for p in self.organiser.queues[channel]])
             )
         )

gather/main.py

@@ -14,7 +14,7 @@ def main():
     with open('config.json') as f:
         config = json.load(f)
 
-    bot = GatherBot()
+    bot = GatherBot(config.get('team_size', 5))
     bot.register_action('^!help$', commands.bot_help)
     bot.register_action('^!(?:add|s)$', commands.add)
     bot.register_action('^!(?:remove|so)$', commands.remove)

gather/organiser.py

@@ -7,9 +7,8 @@ class NotEnoughPlayersError(Exception):
 
 
 class Organiser:
-    TEAM_SIZE = 5
-
-    def __init__(self):
+    def __init__(self, team_size):
+        self.team_size = team_size
         self.queues = defaultdict(lambda: set())
 
     def add(self, queue, player):
@@ -19,17 +18,17 @@ def remove(self, queue, player):
         self.queues[queue].remove(player)
 
     def ready(self, queue):
-        return len(self.queues[queue]) >= Organiser.TEAM_SIZE * 2
+        return len(self.queues[queue]) >= self.team_size * 2
 
     def pop_teams(self, queue):
-        if len(self.queues[queue]) < Organiser.TEAM_SIZE * 2:
+        if len(self.queues[queue]) < self.team_size * 2:
             raise NotEnoughPlayersError('Not enough players!')
 
         candidates = list(self.queues[queue])
         random.shuffle(candidates)
-        players = candidates[:Organiser.TEAM_SIZE * 2]
-        team_one = players[Organiser.TEAM_SIZE:]
-        team_two = players[:Organiser.TEAM_SIZE]
+        players = candidates[:self.team_size * 2]
+        team_one = players[self.team_size:]
+        team_two = players[:self.team_size]
         for player in players:
             self.queues[queue].remove(player)
         return team_one, team_two