refactor /home logic to useActiveContracts

web/hooks/use-active-contracts.ts

@@ -0,0 +1,99 @@
+import _ from 'lodash'
+
+import { Fold } from '../../common/fold'
+import { User } from '../../common/user'
+import { filterDefined } from '../../common/util/array'
+import { Bet, getRecentBets } from '../lib/firebase/bets'
+import { Comment, getRecentComments } from '../lib/firebase/comments'
+import { Contract, listAllContracts } from '../lib/firebase/contracts'
+import { listAllFolds } from '../lib/firebase/folds'
+import { findActiveContracts } from '../pages/activity'
+import { useUpdatedContracts } from './use-contracts'
+import { useFollowedFolds } from './use-fold'
+import { useUserBetContracts } from './use-user-bets'
+
+// used in static props
+export const getAllContractInfo = async () => {
+  let [contracts, folds] = await Promise.all([
+    listAllContracts().catch((_) => []),
+    listAllFolds().catch(() => []),
+  ])
+
+  const [recentBets, recentComments] = await Promise.all([
+    getRecentBets(),
+    getRecentComments(),
+  ])
+
+  return { contracts, recentBets, recentComments, folds }
+}
+
+export const useActiveContracts = (
+  props: {
+    contracts: Contract[]
+    folds: Fold[]
+    recentBets: Bet[]
+    recentComments: Comment[]
+  },
+  user: User | undefined | null
+) => {
+  const contracts = useUpdatedContracts(props.contracts)
+
+  const followedFoldIds = useFollowedFolds(user)
+
+  const followedFolds = filterDefined(
+    (followedFoldIds ?? []).map((id) =>
+      props.folds.find((fold) => fold.id === id)
+    )
+  )
+
+  const followedFoldSlugs =
+    followedFoldIds === undefined ? undefined : followedFolds.map((f) => f.slug)
+
+  const tagSet = new Set(
+    _.flatten(followedFolds.map((fold) => fold.lowercaseTags))
+  )
+
+  const yourBetContractIds = useUserBetContracts(user?.id)
+  const yourBetContracts = yourBetContractIds
+    ? new Set(yourBetContractIds)
+    : undefined
+
+  // Show no contracts before your info is loaded.
+  let feedContracts: Contract[] = []
+  if (yourBetContracts && followedFoldIds) {
+    // Show all contracts if no folds are followed.
+    if (followedFoldIds.length === 0) feedContracts = contracts
+    else
+      feedContracts = contracts.filter(
+        (contract) =>
+          contract.lowercaseTags.some((tag) => tagSet.has(tag)) ||
+          yourBetContracts.has(contract.id)
+      )
+  }
+
+  const { recentComments, recentBets } = props
+
+  const activeContracts = findActiveContracts(
+    feedContracts,
+    recentComments,
+    recentBets,
+    365
+  )
+
+  const betsByContract = _.groupBy(recentBets, (bet) => bet.contractId)
+
+  const activeBets = activeContracts.map(
+    (contract) => betsByContract[contract.id] ?? []
+  )
+
+  const commentsByContract = _.groupBy(
+    recentComments,
+    (comment) => comment.contractId
+  )
+
+  const activeComments = activeContracts.map(
+    (contract) => commentsByContract[contract.id] ?? []
+  )
+
+  return { activeContracts, activeBets, activeComments, followedFoldSlugs }
+}

web/pages/home.tsx

@@ -1,46 +1,30 @@
 import React from 'react'
 import Router from 'next/router'
-import _ from 'lodash'
 
-import { Contract, listAllContracts } from '../lib/firebase/contracts'
+import { Contract } from '../lib/firebase/contracts'
 import { Page } from '../components/page'
-import { ActivityFeed, findActiveContracts } from './activity'
+import { ActivityFeed } from './activity'
-import { Comment, getRecentComments } from '../lib/firebase/comments'
+import { Comment } from '../lib/firebase/comments'
-import { Bet, getRecentBets } from '../lib/firebase/bets'
+import { Bet } from '../lib/firebase/bets'
 import FeedCreate from '../components/feed-create'
 import { Spacer } from '../components/layout/spacer'
 import { Col } from '../components/layout/col'
 import { useUser } from '../hooks/use-user'
-import { useUpdatedContracts } from '../hooks/use-contracts'
-import { listAllFolds } from '../lib/firebase/folds'
 import { Fold } from '../../common/fold'
-import { filterDefined } from '../../common/util/array'
-import { useUserBetContracts } from '../hooks/use-user-bets'
 import { LoadingIndicator } from '../components/loading-indicator'
 import { Row } from '../components/layout/row'
 import { SparklesIcon } from '@heroicons/react/solid'
-import { useFollowedFolds } from '../hooks/use-fold'
 import { FastFoldFollowing } from '../components/fast-fold-following'
+import {
+  getAllContractInfo,
+  useActiveContracts,
+} from '../hooks/use-active-contracts'
 
 export async function getStaticProps() {
-  let [contracts, folds] = await Promise.all([
+  const contractInfo = await getAllContractInfo()
-    listAllContracts().catch((_) => []),
-    listAllFolds().catch(() => []),
-  ])
-
-  const [recentBets, recentComments] = await Promise.all([
-    getRecentBets(),
-    getRecentComments(),
-  ])
 
   return {
-    props: {
+    props: contractInfo,
-      contracts,
-      recentBets,
-      recentComments,
-      folds,
-    },
-
     revalidate: 60, // regenerate after a minute
   }
 }
@@ -51,57 +35,10 @@ const Home = (props: {
   recentBets: Bet[]
   recentComments: Comment[]
 }) => {
-  const { folds, recentBets, recentComments } = props
-
   const user = useUser()
 
-  const contracts = useUpdatedContracts(props.contracts)
+  const { activeContracts, activeBets, activeComments, followedFoldSlugs } =
-
+    useActiveContracts(props, user)
-  const followedFoldIds = useFollowedFolds(user)
-  const followedFolds = filterDefined(
-    (followedFoldIds ?? []).map((id) => folds.find((fold) => fold.id === id))
-  )
-  const tagSet = new Set(
-    _.flatten(followedFolds.map((fold) => fold.lowercaseTags))
-  )
-
-  const yourBetContractIds = useUserBetContracts(user?.id)
-  const yourBetContracts = yourBetContractIds
-    ? new Set(yourBetContractIds)
-    : undefined
-
-  // Show no contracts before your info is loaded.
-  let feedContracts: Contract[] = []
-  if (yourBetContracts && followedFoldIds) {
-    // Show all contracts if no folds are followed.
-    if (followedFoldIds.length === 0) feedContracts = contracts
-    else
-      feedContracts = contracts.filter(
-        (contract) =>
-          contract.lowercaseTags.some((tag) => tagSet.has(tag)) ||
-          yourBetContracts.has(contract.id)
-      )
-  }
-
-  const activeContracts = findActiveContracts(
-    feedContracts,
-    recentComments,
-    recentBets,
-    365
-  )
-
-  const betsByContract = _.groupBy(recentBets, (bet) => bet.contractId)
-  const activeBets = activeContracts.map(
-    (contract) => betsByContract[contract.id] ?? []
-  )
-
-  const commentsByContract = _.groupBy(
-    recentComments,
-    (comment) => comment.contractId
-  )
-  const activeComments = activeContracts.map(
-    (contract) => commentsByContract[contract.id] ?? []
-  )
 
   if (user === null) {
     Router.replace('/')
@@ -115,10 +52,11 @@ const Home = (props: {
           <FeedCreate user={user ?? undefined} />
           <Spacer h={6} />
 
-          {followedFoldIds !== undefined && followedFolds.length === 0 && (
+          {followedFoldSlugs !== undefined &&
+            followedFoldSlugs.length === 0 && (
               <FastFoldFollowing
                 user={user}
-              followedFoldSlugs={followedFolds.map((f) => f.slug)}
+                followedFoldSlugs={followedFoldSlugs}
               />
             )}