Merge branch 'master' into new-ep-stats

.gitignore

@@ -8,4 +8,5 @@ public/bundle.css
 *.sublime-workspace
 playground/*
 *.log
+this_season.txt
 

app/components/EpisodeList.jsx

@@ -116,7 +116,7 @@ export class EpisodeList extends React.Component {
         </div>
         {renderEpisode()}
 
-        { renderDisqus }
+        { process.env.NODE_ENV !== 'development' ? renderDisqus : '' }
 
 
       </div>

app/components/Leaderboard.jsx

@@ -66,14 +66,14 @@ export class Leaderboard extends React.Component {
 
       return leaders.sort(sortObjectsByKey(key, reverse)).map(
         leader => (
-          <LeaderboardEntry {...leader}
-            userId={leader.key}
-            value={leader[key]}
-            index={i++}
-            profileUser={leader.key === userId}
-            authUser={leader.key === authUserId}
-            renderKey={key}
-            season={season}
+          <LeaderboardEntry { ...leader }
+            userId={ leader.key }
+            value={ leader[key] }
+            index={ i++ }
+            profileUser={ leader.key === userId }
+            authUser={ leader.key === authUserId }
+            renderKey={ key }
+            season={ season }
           />
         )
       );

app/components/Score.jsx

@@ -18,7 +18,8 @@ export function Score(props) {
 function mapStateToProps(state, props) {
   const { seasonId } = props;
   const { login: { uid } } = state;
-  const userScore = getKey(state.leaderboard, `${seasonId}.${uid}`, {});
+  let userScore = getKey(state.leaderboard, `${seasonId}.${uid}`, {});
+  userScore.key = uid;
 
   return {
     authUserId: uid,

app/constants/strings.jsx

@@ -64,8 +64,8 @@ export const LABEL_PREVIEW_URI = 'URL to video preview:';
 export const LABEL_CONFIRMATION_URI = 'URL to results confirmation article (All Men Must Die feature):';
 export const LABEL_AIR_AT = 'Airs at (RFC3339 Datetime):';
 export const LABEL_LOCK_AT = 'Lock all betting at (RFC3339 Datetime):';
-export const LABEL_BET_ODDS_PAYOUT = <span>Odds Payout (e.g. <strong><em>3</em></strong> : 1):</span>;
-export const LABEL_BET_ODDS_WAGER = <span>Wager (e.g. 3 : <strong><em>1</em></strong>):</span>;
+export const LABEL_BET_ODDS_PAYOUT = 'Odds Payout:';
+export const LABEL_BET_ODDS_WAGER = 'Wager:';
 export const LABEL_BET_ORDER = 'Order in the list of bets:';
 export const LABEL_BET_NAME = 'Description of terms:';
 export const LABEL_BET_DESCRIPTION = 'Additional info (usually specific character names for group bets):';

scripts/generate-email-lists.jsx

@@ -6,8 +6,8 @@
  */
 const PAST_SEASON = 'gameofthrones-06';
 const CURRENT_SEASON = 'gameofthrones-07';
-const SEASON_EPISODES = ['gameofthrones-07-01', 'gameofthrones-07-02'];
-const CURRENT_EPISODE = 'gameofthrones-07-03';
+const SEASON_EPISODES = ['gameofthrones-07-01', 'gameofthrones-07-02', 'gameofthrones-07-03'];
+const CURRENT_EPISODE = 'gameofthrones-07-04';
 
 import fs from 'fs';
 import firebaseApp from './firebase-app';
@@ -53,23 +53,26 @@ function generateEmailLists(users, secure, bets) {
 
       const seasonsArr = Object.keys(seasons);
 
-      wageredLastSeason = seasonsArr.includes(PAST_SEASON) && !seasonsArr.includes(CURRENT_SEASON);
+      // wageredLastSeason = seasonsArr.includes(PAST_SEASON) && !seasonsArr.includes(CURRENT_SEASON);
+      // Don't recalculate last season emails.
+      wageredLastSeason = false;
       wageredThisSeason = !episodes[CURRENT_EPISODE] && SEASON_EPISODES.reduce((result, item) => episodes[item] || result, false);
 
-      console.log(seasons)
-      console.log('last season:', wageredLastSeason)
+      // console.log(seasons)
+      // console.log('last season:', wageredLastSeason)
       console.log(episodes)
       console.log('this season:', wageredThisSeason)
 
       if (wageredThisSeason) {
         emails_this_season.push(email);
-      } else if (wageredLastSeason) {
-        emails_last_season.push(email);
       }
+      // } else if (wageredLastSeason) {
+      //   emails_last_season.push(email);
+      // }
     }
   }
 
-  const emails_last_season_str = emails_last_season.sort().reduce((str, item) => { return str + item + '\n'}, '');
+  // const emails_last_season_str = emails_last_season.sort().reduce((str, item) => { return str + item + '\n'}, '');
   const emails_this_season_str = emails_this_season.sort().reduce((str, item) => { return str + item + '\n'}, '');
 
 
@@ -78,8 +81,9 @@ function generateEmailLists(users, secure, bets) {
     fs.writeFile('this_season.txt', emails_this_season_str, err);
   }
 
-  fs.writeFile('last_season.txt', emails_last_season_str, writeThisSeason);
-  console.log('EMAILS FROM LAST YEAR', emails_last_season.length)
+  writeThisSeason(false);
+  // fs.writeFile('last_season.txt', emails_last_season_str, writeThisSeason);
+  // console.log('EMAILS FROM LAST YEAR', emails_last_season.length)
   console.log('EMAILS FROM THIS YEAR', emails_this_season.length);
 }
 

scripts/reset-balances.jsx

@@ -64,7 +64,7 @@ db.ref('bets').once('value').then(snapshot => {
 
           // ... is not Marah Eakin
           if (id.indexOf('avclub') === -1 && id !== '0yomzuaZZRVJ1c4gzbL5M1ICWyf1') {
-            const newBalance = curBalance + 200;
+            const newBalance = curBalance + 200 < 200 ? 200 : curBalance + 200;
             console.log(`Updating ${id} (${displayName}, old balance ${curBalance}, locked up ${locked_up}, new balance ${newBalance}.)`);
             updateData[`users/${id}/balance/${seasonId}`] = newBalance;
             count++;

scripts/update.jsx

@@ -1,7 +1,10 @@
 import firebaseApp from './firebase-app';
 
 const updateData = {
-
+  ['users/Jr9wO5CW1uX2li5HLFepQL9w5bn2']: true,
+  ['secure/Jr9wO5CW1uX2li5HLFepQL9w5bn2']: true,
+  ['roles/datamanagers/Jr9wO5CW1uX2li5HLFepQL9w5bn2']: true,
+  ['roles/usermanagers/Jr9wO5CW1uX2li5HLFepQL9w5bn2']: true
 };
 
 console.log('Updating Firebase database', process.env.FIREBASE_DATABASE_URL);

scripts/user-health-stats.jsx

@@ -71,10 +71,10 @@ function generateStats(users, secure) {
 
 console.log('Watching season', CURRENT_SEASON);
 
-secureRef.on('value', (snapshot) => {
-  secure = snapshot.val();
-  userRef.once('value').then((snapshot) => {
-    users = snapshot.val();
+userRef.on('value', (snapshot) => {
+  users = snapshot.val();
+  secureRef.once('value').then((snapshot) => {
+    secure = snapshot.val();
     try {
       generateStats(users, secure);
     } catch (err) {