From 80fb33361a5d06cf81f74aa5bfe7c18729e7b24e Mon Sep 17 00:00:00 2001
From: Adam Mcgrath <adamjmcgrath@gmail.com>
Date: Wed, 10 Jun 2015 22:18:15 +0100
Subject: [PATCH 1/8] add .idea

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 4dc7acc..adf6b8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ src/pylib
 src/secrets.py
 npm-debug.log
 node_modules
+.idea
\ No newline at end of file

From 60eeded6b37170f5620dfce69c651f2068c71810 Mon Sep 17 00:00:00 2001
From: Adam Mcgrath <adamjmcgrath@gmail.com>
Date: Wed, 10 Jun 2015 23:04:30 +0100
Subject: [PATCH 2/8] add editorconfig fix env path

---
 .editorconfig | 11 +++++++++++
 .gitignore    |  4 +++-
 .travis.yml   |  2 +-
 fabfile.py    |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..26d30f9
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+# EditorConfig
+
+# top-most EditorConfig file
+root = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js,py}]
+charset = utf-8
+indent_style = space
+indent_size = 2
diff --git a/.gitignore b/.gitignore
index adf6b8a..97eae2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,6 @@ src/pylib
 src/secrets.py
 npm-debug.log
 node_modules
-.idea
\ No newline at end of file
+.idea
+.env
+
diff --git a/.travis.yml b/.travis.yml
index 90bea9c..ef9f1fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ python:
 env:
   global:
     - secure: KTWs8jE9COxyuULlAiynxrI61wKfZhz56B99zT75e4tdcCSGRIIWut8Skm1thAUSQsEymXhvhhmgND3qbjChyw90F/hAiA8xgo/QxpESvI48AXi9CLPfB9kyaf9SPqXokKxj0yYqCCYLLfmCu/glO66S69+5iQbwn8M+9WHdeHwYffJrFJonUt/E0HAuaNdmJIDCd3nuAp7Ol7JAuUsg8971SoeDqk+wBPNzN4UWYtpWGvxUas51w7YjIPwG7cr6C3XvP/G1x2YPU6yP0gQBtgKt3X3+W6FJqO1GZaiQ1iTK+nRhaU1SecjmkHJJKQjQDX+0CLVWW5Y98SrbtKYht/Ez3/3GG4NyHTtmBZ67F4cC3ikdTRDp3ixTAoay7M4osIgvkdNsCeiYGz8dXvIbOsh+bebCPHwYfdsVk0656XS3V2G5EnXMhqaOzDqdwdCMCUR/LUm4GOmZ2BqNAQT/CnsWugE7BZwyN9I8S1bVMfU0a4soXNAlXbr6Kzr01cdX7Po43y7GOe4QgQHMJuNrFzbJ24IT/OOKJKkgRRfUQoX3LQHH++EHUnKpeTDrT72MRp095jiRW5gjUVjidTtYG0YruZ4PFv66ICKHEmVEm57ATxjupea/goESWslp1/Vj2XV3mKhVcGwJ52WHV2czh8EEu/G16XZMHqwFDjIOg6c=
-    - APPENGINE_SDK=google_appengine_1.9.19
+    - APPENGINE_SDK=google_appengine_1.9.21
 
 cache:
   directories:
diff --git a/fabfile.py b/fabfile.py
index c05fd90..f34e22e 100755
--- a/fabfile.py
+++ b/fabfile.py
@@ -14,7 +14,7 @@
 import sys
 from fabric.api import *
 
-APPENGINE_PATH = os.environ['APPENGINE_SRC']
+APPENGINE_PATH = os.path.abspath(os.environ['APPENGINE_SRC'])
 APPENGINE_DEV_APPSERVER =  os.path.join(APPENGINE_PATH, 'dev_appserver.py')
 APPENGINE_APP_CFG =  os.path.join(APPENGINE_PATH, 'appcfg.py')
 

From 9b07a822c638e49307cabd2d1e999d313965351d Mon Sep 17 00:00:00 2001
From: Adam Mcgrath <adamjmcgrath@gmail.com>
Date: Sat, 13 Jun 2015 18:46:39 +0100
Subject: [PATCH 3/8] Script to add active_questions_answered for calculating a
 fairer average score

---
 scripts/fix_average_score.py | 63 ++++++++++++++++++++++++++++++++++++
 src/models.py                |  1 +
 2 files changed, 64 insertions(+)
 create mode 100755 scripts/fix_average_score.py

diff --git a/scripts/fix_average_score.py b/scripts/fix_average_score.py
new file mode 100755
index 0000000..7a0a410
--- /dev/null
+++ b/scripts/fix_average_score.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+# coding=utf-8
+#
+# Copyright Friday Film Club. All Rights Reserved.
+
+"""Update average score so that archive questions aren't included."""
+
+import os
+import sys
+import getpass
+
+
+APPENGINE_PATH = os.path.abspath(os.environ['APPENGINE_SRC'])
+APPENGINE_DEV_APPSERVER =  os.path.join(APPENGINE_PATH, 'dev_appserver.py')
+APPENGINE_APP_CFG =  os.path.join(APPENGINE_PATH, 'appcfg.py')
+
+sys.path.append(APPENGINE_PATH)
+import dev_appserver
+dev_appserver.fix_sys_path()
+
+from google.appengine.ext import ndb
+from google.appengine.ext.remote_api import remote_api_stub
+
+import models
+
+APP_NAME = 's~ffcapp'
+os.environ['AUTH_DOMAIN'] = 'gmail.com'
+os.environ['USER_EMAIL'] = 'adamjmcgrath@gmail.com'
+
+
+def auth_func():
+  return os.environ['USER_EMAIL'], getpass.getpass('Password:')
+
+
+def fix_user(u):
+  uqs = [uq for uq in models.UserQuestion.query(
+    models.UserQuestion.user==u.key,
+    models.UserQuestion.complete==True,
+   ndb.OR(models.UserQuestion.score==0, models.UserQuestion.score==None))]
+
+  correction = 0
+
+  for uq in uqs:
+    if (uq.created and
+       (uq.created - uq.question.get().posed).total_seconds() > 20000):
+      correction += 1
+
+  u.active_questions_answered = u.questions_answered - correction
+  print '%s: old: %d, new: %d' % (u.username, u.questions_answered, u.active_questions_answered)
+  if correction > 1:
+    u.put()
+
+
+def main():
+  # Use 'localhost:8080' for dev server.
+  remote_api_stub.ConfigureRemoteDatastore(APP_NAME, '/_ah/remote_api',
+      auth_func, servername='ffcapp.appspot.com')
+
+  for u in models.User.query():
+    fix_user(u)
+
+if __name__ == '__main__':
+  main()
diff --git a/src/models.py b/src/models.py
index a1a7320..6aef162 100755
--- a/src/models.py
+++ b/src/models.py
@@ -187,6 +187,7 @@ class User(AuthUser):
   overall_score = ndb.IntegerProperty(default=0)
   overall_clues = ndb.IntegerProperty(default=0)
   questions_answered = ndb.IntegerProperty(default=0)
+  active_questions_answered = ndb.IntegerProperty(default=0)
   invited_by = ndb.KeyProperty(kind='User')
   joined = ndb.DateTimeProperty(auto_now_add=True)
   leagues = ndb.KeyProperty(repeated=True)

From dac5d03c36b796d3e86d3a843f1747e541299903 Mon Sep 17 00:00:00 2001
From: Adam Mcgrath <adamjmcgrath@gmail.com>
Date: Sat, 13 Jun 2015 18:50:39 +0100
Subject: [PATCH 4/8] question is current for 7 days

---
 scripts/fix_average_score.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/fix_average_score.py b/scripts/fix_average_score.py
index 7a0a410..06dff1d 100755
--- a/scripts/fix_average_score.py
+++ b/scripts/fix_average_score.py
@@ -8,7 +8,7 @@
 import os
 import sys
 import getpass
-
+import datetime
 
 APPENGINE_PATH = os.path.abspath(os.environ['APPENGINE_SRC'])
 APPENGINE_DEV_APPSERVER =  os.path.join(APPENGINE_PATH, 'dev_appserver.py')
@@ -42,7 +42,7 @@ def fix_user(u):
 
   for uq in uqs:
     if (uq.created and
-       (uq.created - uq.question.get().posed).total_seconds() > 20000):
+       (uq.created - uq.question.get().posed) > datetime.timedelta(days=7)):
       correction += 1
 
   u.active_questions_answered = u.questions_answered - correction
@@ -56,7 +56,8 @@ def main():
   remote_api_stub.ConfigureRemoteDatastore(APP_NAME, '/_ah/remote_api',
       auth_func, servername='ffcapp.appspot.com')
 
-  for u in models.User.query():
+  for u in models.User.query(models.User.name=='Tom Johnson'):
+  # for u in models.User.query():
     fix_user(u)
 
 if __name__ == '__main__':

From 7565f96dba856de7ccfe8ebc0897a02facca606b Mon Sep 17 00:00:00 2001
From: Adam Mcgrath <adamjmcgrath@gmail.com>
Date: Sat, 13 Jun 2015 18:50:58 +0100
Subject: [PATCH 5/8] for all users

---
 scripts/fix_average_score.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/fix_average_score.py b/scripts/fix_average_score.py
index 06dff1d..31f58e6 100755
--- a/scripts/fix_average_score.py
+++ b/scripts/fix_average_score.py
@@ -56,8 +56,7 @@ def main():
   remote_api_stub.ConfigureRemoteDatastore(APP_NAME, '/_ah/remote_api',
       auth_func, servername='ffcapp.appspot.com')
 
-  for u in models.User.query(models.User.name=='Tom Johnson'):
-  # for u in models.User.query():
+  for u in models.User.query():
     fix_user(u)
 
 if __name__ == '__main__':

From 767e535a1013597c718eac080beb292cb1f5a107 Mon Sep 17 00:00:00 2001
From: Adam Mcgrath <adamjmcgrath@gmail.com>
Date: Sat, 13 Jun 2015 19:03:06 +0100
Subject: [PATCH 6/8] Update active_questions_answered when user completes a
 current question

---
 src/api/question.py            | 6 ++++--
 src/tests/helpers.py           | 1 +
 src/tests/test_api_question.py | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/api/question.py b/src/api/question.py
index bea8451..5ff45e8 100644
--- a/src/api/question.py
+++ b/src/api/question.py
@@ -31,10 +31,12 @@ def update_question(question):
     deferred.defer(leaderboard.delete_leaderboard_cache)
 
 
-def update_users_score(user, score, num_guesses):
+def update_users_score(user, score, num_guesses, is_current):
   user.overall_score += score
   user.overall_clues += num_guesses - 1
   user.questions_answered += 1
+  if is_current:
+    user.active_questions_answered += 1
 
 
 def update_users_season_score(user_season, score, num_guesses):
@@ -118,7 +120,7 @@ def get_or_post(self, question_id):
         user_season = None
 
         # Update the users score and stats.
-        update_users_score(user, score, num_guesses)
+        update_users_score(user, score, num_guesses, question.is_current)
 
         # Update the question answer count and reset the leaderboard cache.
         update_question(question)
diff --git a/src/tests/helpers.py b/src/tests/helpers.py
index 4e5e3b1..91d2917 100644
--- a/src/tests/helpers.py
+++ b/src/tests/helpers.py
@@ -48,6 +48,7 @@ def user(id=None,
          overall_score=0,
          overall_clues=0,
          questions_answered=0,
+         active_questions_answered=0,
          invited_by=None,
          joined=None,
          leagues=None):
diff --git a/src/tests/test_api_question.py b/src/tests/test_api_question.py
index dfba367..120c8ed 100644
--- a/src/tests/test_api_question.py
+++ b/src/tests/test_api_question.py
@@ -221,11 +221,13 @@ def testUpdateUserScore(self):
       overall_score=10,
       overall_clues=10,
       questions_answered=10,
+      active_questions_answered=5,
     )
-    question_api.update_users_score(user, 5, 5)
+    question_api.update_users_score(user, 5, 5, True)
     self.assertEqual(user.overall_score, 15)
     self.assertEqual(user.overall_clues, 14)
     self.assertEqual(user.questions_answered, 11)
+    self.assertEqual(user.active_questions_answered, 6)
 
   def testUpdateUsersLeagueScore(self):
     user = helpers.user()

From 23294c3b665f9c2108c69b356601bd1064a52bac Mon Sep 17 00:00:00 2001
From: Adam Mcgrath <adamjmcgrath@gmail.com>
Date: Sat, 13 Jun 2015 19:41:02 +0100
Subject: [PATCH 7/8] Don't use os environ host, get host from request

---
 .travis.yml            |   2 +-
 src/api/contacts.py    |   4 ++--
 src/auth.py            |   3 ++-
 src/secrets.example.py |   9 +++++----
 src/secrets.py.enc     | Bin 2528 -> 2576 bytes
 src/settings.py        |  12 +++++++-----
 src/twitter.py         |   3 ++-
 7 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ef9f1fe..d7d8c92 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ cache:
     - bower_components
 
 before_install:
-  - openssl aes-256-cbc -K $encrypted_aac91bacce06_key -iv $encrypted_aac91bacce06_iv -in src/secrets.py.enc -out src/secrets.py -d
+  - openssl aes-256-cbc -K $encrypted_1d9196d3864d_key -iv $encrypted_1d9196d3864d_iv -in src/secrets.py.enc -out src/secrets.py -d
 
 install:
   - pip install -r requirements.txt
diff --git a/src/api/contacts.py b/src/api/contacts.py
index addffdb..5f31728 100644
--- a/src/api/contacts.py
+++ b/src/api/contacts.py
@@ -53,7 +53,7 @@ def get_google_contacts(self):
     if refresh_token:
 
       #  Convert the access token to refresh_token
-      app_id, app_secret, app_scope = secrets.AUTH_CONFIG['google']
+      app_id, app_secret, app_scope = secrets.get_auth_config('google', 'prod')
       data = urllib.urlencode({
             'client_id': app_id,
             'client_secret': app_secret,
@@ -99,7 +99,7 @@ def get_google_contacts(self):
 
   def get_facebook_friends(self):
     u = self.current_user
-    app_id, app_secret, app_scope = secrets.AUTH_CONFIG['facebook']
+    app_id, app_secret, app_scope = secrets.get_auth_config('facebook', 'prod')
     # facebook_token = u.facebook_token
     facebook_token = app_id + '|' + app_secret
     facebook_uid = u.facebook_uid
diff --git a/src/auth.py b/src/auth.py
index 00bf7b3..8c30803 100644
--- a/src/auth.py
+++ b/src/auth.py
@@ -162,7 +162,8 @@ def _callback_uri_for(self, provider):
 
   def _get_consumer_info_for(self, provider):
     """Returns a tuple (key, secret) for auth init requests."""
-    return secrets.AUTH_CONFIG[provider]
+    return secrets.get_auth_config(
+      provider, settings.get_environment(self.request.host))
 
   def _to_user_model_attrs(self, data, provider, new_user):
     attrs_map = self.USER_ATTRS[provider]
diff --git a/src/secrets.example.py b/src/secrets.example.py
index 8f848cf..69125cc 100644
--- a/src/secrets.example.py
+++ b/src/secrets.example.py
@@ -61,7 +61,8 @@
   'twitter': (TWITTER_CONSUMER_KEY_STAGING, TWITTER_CONSUMER_SECRET_STAGING),
 }
 
-AUTH_CONFIG = ({
-  'local': _CONFIG_DEV,
-  'staging': _CONFIG_STAGING,
-}).get(settings.ENVIRONMENT, _CONFIG)
+def get_auth_config(provider, environment):
+  return ({
+    'local': _CONFIG_DEV,
+    'staging': _CONFIG_STAGING,
+  }).get(environment, _CONFIG)[provider]
\ No newline at end of file
diff --git a/src/secrets.py.enc b/src/secrets.py.enc
index 68eb5f0863d3b73fa01ffc1ec26f5c03e050ce89..55b741ec3602f76652b7b7b4cce8cb37590f174a 100644
GIT binary patch
literal 2576
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

literal 2528
zcmV<62_N<a$~V-uAQ#a{WnJw;yuKrn%Sy^Sl&gFrzV}}#?@f$f&$km_n3l``=N1C=
zg8rbVh51X6c4ghFJ(SwWGG%-HpDDV;&qptC6F!QfhJ4&7;R*w#FWZ#O@xAB8%P}T+
z+o3Co_sz8C%5%hHh5H7)cjxdWZFcPfU=6@U{&f&zdGlqy12M{Vs4q7>yd=t$_sNX4
z1kssjNdWo?svr3f)W2o4n&h#1(CPW34mu%i|NU4nQoTStBoDKV{%O|g(NcJJ0eut3
z-5yafkb5=8h|`(6)g+TQ3+iEZpZnEV&oGv~k$q(|925hTKed*hMo4QKw2cXwHafW!
z?{4-%9_TLEC?T!l{`D|}V4|ON1nKpJqt=F~2z0=RG6Ttf9%GRtQ~z>50@ObM6Kx`a
z_3V;_Q@S&8Py6d_nV~ARvu#J*&3PzXk9T9H1721oaIN4pM+`}sM)r%~__R*;4+UZP
zr<dT`1gSx!g;xsa->b1_B7Zm7pOauc^DT|k2aI?^ptr*z+)8k(`0yZD_S0pqIs&js
zL<n#_p+Ow-;o*Uw&v*mamQ>B5x|4eR1E(Jy?~F|E0$N=&!@!-Px)GL~j`N#^o(W~#
zYaI)_55r~e2E9aaDK-6;H5W5pd~(nnuRt{|-K(j5l$Fq`S8Scjz72+$Q{XXs?ZR;&
z8@jfKsI!FY?=={F<>L^?EKEN$7;=fV@IqzZFZcuMj=p|QBC^<174*;h52Ub6KjfLa
zSy&`S<beb5?Dyp9yp~j0m7Xu0k^EV#tJ+~<3w52B&Bj;_*!*J1ZV+^E+!FcMQ7Hcq
z*<S%&KfJs3gX{i97J4h?cM0hd>%lx`QFKCfsXO~C_Z-|2(!)rZYJN+PtKXVfI-+NT
z6{zht21#0w9?XG>ZtyFln6bGGeLqtT^A`y#pD3HDO*aFLyFF7XASnJwl#n=e2wJQD
zU8ZcO0P`>_gE=PTs~<9b4~HrIhUxR^EHkksT)MJ6YwtSVz*qJO=P@^SgpWJBox$g>
ze^-QeEQ!9L5?4a{@d`je`tSW)X993hflP^>83QNkXrDdci1Et^*x@QKIeN5Me!hik
zX03C%lS2d8<uitrra77D?t;Uu2d%{=h>+1=o#~#uyME4c2r^(!#iCWk$CcCEB1TUr
zsU$TFeJ|)?_t(Y8ZHVMx^=L13M_;SL{MOGau)%?*hV7j?RY?n~13Q}V`6xaf=bA$}
zwSK4`tde;8UOxbpNiQX1d5?FEw-=SzqFfrqC!))q=S&$71s#P;iho#O^4M`zRuX)u
zC3rg@SbKL<eH_=x&L(~_>1Va^M9xc8&z$|*!*NjU%)NqLE4+-lI2VTwX>qj61CwjK
zR)wK|YZ1fXd{GoQmooUVTqQ>5b#}qc^O<N@G+$~)B{BhS3=0Yk40i@QTdT|fPyu+8
zHAeTY)D{Y)EJe$2^><W5aTgJO6lHYrxzbq>O^lDd^WT}j^a&>?%0WXLLe05bzS_l$
zE>;HkF6S5EUy9-ohY}jBV5m(WMJRP{f74e+`A=x-BX4{?!`!wdKR=>)+@1N_mCV3;
z0M(k+#8ffOs#}`!DtlbFS9%=KouR`d#W$Tu>#chhs*Yi@svc-k+^BLy91^&=EVq!Q
z0xwN<4%p|m9xch;hhq<q?C@01{1+S3-=sVnf1b7JKx~q?(d~tZ$Hmn8o%KvQBlM&k
zLE9%GfCwaF(%{T)dx#wUHa4>w7>5FAe0W3pB1T8HYGf^QP-;~p`_HuXB&JMtNdTT<
zI1?p#CU!^+UCgBpM4E^#R^xbOB<mV|V{&<(90mQS3qtBlANdFr<Cbrl3F8liOj4M4
z%(Apw(5xt^+88-y%-fa714M|*CX+1-ePT0OzcBU`G{q0$BNLwF5LhI%b7E>Gz{Yo3
zZqd&VW2lOqZJ(l3t^~3z599pNpK`=uOQ@Fz?T{>FLgOodoafZD;SB0PTOpHDUuiH(
zh-o~!R9y;7<}k1~z*8K|{fv{oZZkgO;yXw><47XQ0S$#+4}cl2ghnj$M~w!izTXf0
z33fYip2J0@p2Dz%O$#xt-CUQd?kD(7V`*KDzbwzMxx}X7gb*n&<~LjKzM}F%ln&^6
zjzk}!8c#GDn`K!Gf06j>YiHMX#Nk-gv?W3_yinr1dMf#%Z4mP7Qq#(paNk=UN*=5K
zxntDe1>NG6++RO{lB`XkWhhS((KtQ(0hW{2YANk1Ub-G7Z)x)w)dqK!>ak!%1cTEd
z8YSj=&-?7#sS3GtJ>xPN4UR4|7&JLYqa`*bg)SEONOCQq5)WUV@&krOylj(rcE-(Q
zO~=6$E*(mT5zd};7K+h2NJQ7oz1w<X#LLE({Pc|hL<;l5!pC<-MVLz;8Kn?|G@ErU
z(U!JK5kh67ItkqmuR)WL`ti+nDHcIK;(-&@1e6LtpH+$Z)$BtVI)-74GP4_fzb~ic
zUedTk1BYl!3-pp6*2g!u?~?yzzOu9rF#=g8USw;dL{n%7_Q#B*2ofH1IRR!hVgH3Y
zP&2G%8*GfAmES#U`HDC*r}MFyW;5oq!S=U-`UT~l^V=9=$YlvF^p0j5>agH~V0}qF
zObQ!23@!<mLQ)|T)nWg(f}XpB?UU0Afb{2Pex<T8^oB3iv!10`5?<BM3)`;hD`3L1
zA?piDN9i%W=A;X+2|3D7l$VSlQL;MiwlRESqCgw@i%%<ZbsPN2+ctHBdkIp4<q2to
zR<m@Ah1=)y1~I;Tixx5cV{u4GdFc%HlF<kof^876gynv%B<cyal~nElFY`V~M|iE4
z>lO}?X$@GlW26f4`(KFXRuoq{)T`fG^VWcW2qxf3!K=X?#Fk_aly?EpTfDfp@8N5o
zMySDqQT_&}&Z#!Zqa>tJQB?8X5KV4kNLR8()&rS*imcB?WFJ>BcUh89j~L9U>e^8I
z`||@XR0*CAxL)&KKosO(+^;_wzOzTSnvYBjnLiiVha^<8IApnq%T*NsJ1@^cMi<%Y
zwT6lA5FK?nBS~S)wzHtY27wa4*#HPYA6r<p&zHz5kSfXL#f^eU=%;)fVKhfd1T#kz
z(x6uftcW%*ZEnD4VPoIg0j01*_8!K_<n0W0u1&_ajeYm=^R=Bo{LMjMh>?n64EOaJ
zqD^l^)T_~ov?|}T06G)M0$kV;;blg+k(r6NdMq@qG>QCmg$Wa1s808t&n0I_L`~Hy
zt@Pnz0`+(}9|pUPn!aty%^UsLr1C;*>Bt)5KRy|ExWD;8+0f0lY&PnpwV+LySs1=p
qJ+<DdDHu0P@wvl+){nvxB@T7QH~Ls@B^fb?S%jHx>g#E7k)wqao7VmS

diff --git a/src/settings.py b/src/settings.py
index ef1df24..cd4f02c 100755
--- a/src/settings.py
+++ b/src/settings.py
@@ -11,8 +11,10 @@
 DEBUG = os.environ.get('SERVER_SOFTWARE', '').startswith('Dev')
 FMJ_EMAIL_SHORT = 'fmj@fridayfilmclub.com'
 FMJ_EMAIL = 'Film Master Jack <%s>' % FMJ_EMAIL_SHORT
-ENVIRONMENT = ({
-  'www.fridayfilmclub.com': 'prod',
-  'ffcapp.appspot.com': 'prod',
-  'dev.ffcapp.appspot.com': 'staging',
-}).get(os.environ.get('HTTP_HOST'), 'local')
+
+def get_environment(host):
+  return ({
+    'www.fridayfilmclub.com': 'prod',
+    'ffcapp.appspot.com': 'prod',
+    'dev.ffcapp.appspot.com': 'staging',
+  }).get(host, 'local')
\ No newline at end of file
diff --git a/src/twitter.py b/src/twitter.py
index 0702e08..ce26ae1 100644
--- a/src/twitter.py
+++ b/src/twitter.py
@@ -17,7 +17,8 @@
 from google.appengine.api import urlfetch
 
 
-consumer_token, consumer_token_secret = secrets.AUTH_CONFIG['twitter']
+# TODO (adamjmcgrath) don't hardcode environment.
+consumer_token, consumer_token_secret = secrets.get_auth_config('twitter', 'prod')
 
 
 def timestamp():

From 006495e7045db806ebe6abdcdae61944212bb9f9 Mon Sep 17 00:00:00 2001
From: Adam Mcgrath <adamjmcgrath@gmail.com>
Date: Sat, 13 Jun 2015 19:42:40 +0100
Subject: [PATCH 8/8] Fix cron

---
 src/cron.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cron.yaml b/src/cron.yaml
index e45e5f6..14158a4 100644
--- a/src/cron.yaml
+++ b/src/cron.yaml
@@ -14,8 +14,8 @@ cron:
   url: /tasks/cleanupanonymoususers
   schedule: every 24 hours
 
-- description: delete obsolete anonymous users
-  url: /tasks/cleanupanonymoususers
+- description: clean up obsolete user tokens
+  url: /tasks/cleanupusertokens
   schedule: every monday 05:00
 
 - description: weekly backup