From 02b1a256447649f5bdc87d76620aad8311333df3 Mon Sep 17 00:00:00 2001
From: Yizhe Shen <brrr@live.ca>
Date: Sun, 22 Jun 2014 19:19:51 -0400
Subject: [PATCH] Added a timer for joining the game. (issue #20)

- Usage: set a non-zero value for var.JOIN_TIMER_LIMIT in seconds
- Added kill_join() to handle game cancellations
- Join timers set on first join and canceled if everybody quits or when a
  game starts
---
 modules/wolfgame.py  | 27 +++++++++++++++++++++++++++
 settings/wolfgame.py |  1 +
 2 files changed, 28 insertions(+)

diff --git a/modules/wolfgame.py b/modules/wolfgame.py
index b257aae..789722f 100644
--- a/modules/wolfgame.py
+++ b/modules/wolfgame.py
@@ -89,6 +89,7 @@ if botconfig.DEBUG_MODE:
     var.SHORT_DAY_LIMIT_CHANGE = 0
     var.KILL_IDLE_TIME = 0 #300
     var.WARN_IDLE_TIME = 0 #180
+    var.JOIN_TIME_LIMIT = 0
 
         
 def connect_callback(cli):
@@ -425,6 +426,14 @@ def join(cli, nick, chann_, rest):
         cli.msg(chan, ('\u0002{0}\u0002 has started a game of Werewolf. '+
                       'Type "{1}join" to join. Type "{1}start" to start the game. '+
                       'Type "{1}wait" to increase start wait time.').format(nick, botconfig.CMD_CHAR))
+        
+        # Set join timer
+        if var.JOIN_TIME_LIMIT:
+            t = threading.Timer(var.JOIN_TIME_LIMIT, kill_join, [cli, chan])
+            var.TIMERS['join'] = t
+            t.daemon = True
+            t.start()
+        
     elif nick in pl:
         cli.notice(nick, "You're already playing!")
     elif len(pl) >= var.MAX_PLAYERS:
@@ -456,6 +465,19 @@ def join(cli, nick, chann_, rest):
         var.LAST_PSTATS = None
         var.LAST_TIME = None
 
+        
+def kill_join(cli, chan):
+    pl = var.list_players()
+    pl.sort(key=lambda x: x.lower())
+    msg = 'PING: {0}'.format(", ".join(pl))
+    reset_modes_timers(cli)
+    reset(cli)
+    cli.msg(chan, msg)
+    cli.msg(chan, 'The current game took too long to start and ' +
+                  'has been canceled. If you are still active, ' +
+                  'please join again to start a new game.')
+    var.LOGGER.logMessage('Game canceled.')
+    
 
 @cmd("fjoin", admin_only=True)
 def fjoin(cli, nick, chann_, rest):
@@ -2438,6 +2460,11 @@ def start(cli, nick, chann_, rest):
         cli.msg(chan, "{0}: No game settings are defined for \u0002{1}\u0002 player games.".format(nick, len(villagers)))
         return
 
+    # Cancel join timer
+    if 'join' in var.TIMERS:
+        var.TIMERS['join'].cancel()
+        del var.TIMERS['join']
+        
     if var.ORIGINAL_SETTINGS:  # Custom settings
         while True:
             wvs = (addroles[var.INDEX_OF_ROLE["wolf"]] +
diff --git a/settings/wolfgame.py b/settings/wolfgame.py
index d71a72c..08379f2 100644
--- a/settings/wolfgame.py
+++ b/settings/wolfgame.py
@@ -19,6 +19,7 @@ NIGHT_TIME_LIMIT = 120
 NIGHT_TIME_WARN = 90  # should be less than NIGHT_TIME_LIMIT
 DAY_TIME_LIMIT_WARN = 600
 DAY_TIME_LIMIT_CHANGE = 120  # seconds after DAY_TIME_LIMIT_WARN has passed
+JOIN_TIME_LIMIT = 0
 # May only be set if the above are also set
 SHORT_DAY_PLAYERS = 6 # Number of players left to have a short day
 SHORT_DAY_LIMIT_WARN = 400