Merge branch 'main' into resolve-prob

functions/src/scripts/correct-bet-probability.ts

@@ -1,20 +1,14 @@
 import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
+import { initAdmin } from './script-init'
+initAdmin('stephen')
+
 import { Bet } from '../../../common/bet'
 import { getProbability } from '../../../common/calculate'
 import { Contract } from '../../../common/contract'
 
 type DocRef = admin.firestore.DocumentReference
-
-// Generate your own private key, and set the path below:
-// https://console.firebase.google.com/u/0/project/mantic-markets/settings/serviceaccounts/adminsdk
-// const serviceAccount = require('../../../../../../Downloads/dev-mantic-markets-firebase-adminsdk-sir5m-b2d27f8970.json')
-const serviceAccount = require('../../../../../../Downloads/mantic-markets-firebase-adminsdk-1ep46-351a65eca3.json')
-
-admin.initializeApp({
-  credential: admin.credential.cert(serviceAccount),
-})
 const firestore = admin.firestore()
 
 async function migrateContract(contractRef: DocRef, contract: Contract) {

functions/src/scripts/create-private-users.ts

@@ -1,17 +1,11 @@
 import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
+import { initAdmin } from './script-init'
+initAdmin('stephen')
+
 import { PrivateUser, STARTING_BALANCE, User } from '../../../common/user'
 
-// Generate your own private key, and set the path below:
-// https://console.firebase.google.com/u/0/project/mantic-markets/settings/serviceaccounts/adminsdk
-
-const serviceAccount = require('../../../../../../Downloads/dev-mantic-markets-firebase-adminsdk-sir5m-b2d27f8970.json')
-
-admin.initializeApp({
-  credential: admin.credential.cert(serviceAccount),
-})
-
 const firestore = admin.firestore()
 
 async function main() {

functions/src/scripts/make-contracts-public.ts

@@ -1,16 +1,11 @@
 import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
+import { initAdmin } from './script-init'
+initAdmin('james')
+
 import { Contract } from '../../../common/contract'
 
-// Generate your own private key, and set the path below:
-// https://console.firebase.google.com/u/0/project/mantic-markets/settings/serviceaccounts/adminsdk
-// const serviceAccount = require('../../../../Downloads/dev-mantic-markets-firebase-adminsdk-sir5m-b2d27f8970.json')
-const serviceAccount = require('../../../../../../Downloads/mantic-markets-firebase-adminsdk-1ep46-820891bb87.json')
-
-admin.initializeApp({
-  credential: admin.credential.cert(serviceAccount),
-})
 const firestore = admin.firestore()
 
 async function makeContractsPublic() {

functions/src/scripts/migrate-contract.ts

@@ -1,18 +1,14 @@
 import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
+import { initAdmin } from './script-init'
+initAdmin('james')
+
 import { Bet } from '../../../common/bet'
 import { Contract } from '../../../common/contract'
 
 type DocRef = admin.firestore.DocumentReference
 
-// Generate your own private key, and set the path below:
-// https://console.firebase.google.com/u/0/project/mantic-markets/settings/serviceaccounts/adminsdk
-const serviceAccount = require('../../../../Downloads/mantic-markets-firebase-adminsdk-1ep46-820891bb87.json')
-
-admin.initializeApp({
-  credential: admin.credential.cert(serviceAccount),
-})
 const firestore = admin.firestore()
 
 async function migrateBet(contractRef: DocRef, bet: Bet) {

functions/src/scripts/migrate-to-dpm-2.ts

@@ -1,6 +1,9 @@
 import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
+import { initAdmin } from './script-init'
+initAdmin('stephenDev')
+
 import { Contract } from '../../../common/contract'
 import { Bet } from '../../../common/bet'
 import { calculateShares, getProbability } from '../../../common/calculate'
@@ -9,15 +12,6 @@ import { User } from '../../../common/user'
 
 type DocRef = admin.firestore.DocumentReference
 
-// Generate your own private key, and set the path below:
-// https://console.firebase.google.com/u/0/project/mantic-markets/settings/serviceaccounts/adminsdk
-// const serviceAccount = require('../../../../../../Downloads/dev-mantic-markets-firebase-adminsdk-sir5m-b2d27f8970.json')
-const serviceAccount = require('../../../../../../Downloads/mantic-markets-firebase-adminsdk-1ep46-351a65eca3.json')
-
-admin.initializeApp({
-  credential: admin.credential.cert(serviceAccount),
-})
-
 const firestore = admin.firestore()
 
 async function recalculateContract(

functions/src/scripts/recalculate-contract-totals.ts

@@ -1,19 +1,14 @@
 import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
+import { initAdmin } from './script-init'
+initAdmin('james')
+
 import { Bet } from '../../../common/bet'
 import { Contract } from '../../../common/contract'
 
 type DocRef = admin.firestore.DocumentReference
 
-// Generate your own private key, and set the path below:
-// https://console.firebase.google.com/u/0/project/mantic-markets/settings/serviceaccounts/adminsdk
-// const serviceAccount = require('../../../../Downloads/dev-mantic-markets-firebase-adminsdk-sir5m-b2d27f8970.json')
-const serviceAccount = require('../../../../Downloads/mantic-markets-firebase-adminsdk-1ep46-820891bb87.json')
-
-admin.initializeApp({
-  credential: admin.credential.cert(serviceAccount),
-})
 const firestore = admin.firestore()
 
 async function recalculateContract(contractRef: DocRef, contract: Contract) {

functions/src/scripts/rename-user-contracts.ts

@@ -1,19 +1,12 @@
 import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
+import { initAdmin } from './script-init'
+initAdmin('stephenDev')
+
 import { Contract } from '../../../common/contract'
 import { getValues } from '../utils'
 
-// Generate your own private key, and set the path below:
-// https://console.firebase.google.com/u/0/project/mantic-markets/settings/serviceaccounts/adminsdk
-// James:
-const serviceAccount = require('../../../../Downloads/mantic-markets-firebase-adminsdk-1ep46-820891bb87.json')
-// Stephen:
-// const serviceAccount = require('../../../../Downloads/dev-mantic-markets-firebase-adminsdk-sir5m-b2d27f8970.json')
-
-admin.initializeApp({
-  credential: admin.credential.cert(serviceAccount),
-})
 const firestore = admin.firestore()
 
 async function renameUserContracts(

functions/src/scripts/script-init.ts

@@ -0,0 +1,32 @@
+import * as admin from 'firebase-admin'
+
+// Generate your own private key, and set the path below:
+// Prod:
+// https://console.firebase.google.com/u/0/project/mantic-markets/settings/serviceaccounts/adminsdk
+// Dev:
+// https://console.firebase.google.com/u/0/project/dev-mantic-markets/settings/serviceaccounts/adminsdk
+
+const pathsToPrivateKey = {
+  james:
+    '/Users/jahooma/mantic-markets-firebase-adminsdk-1ep46-820891bb87.json',
+  jamesDev:
+    '/Users/jahooma/dev-mantic-markets-firebase-adminsdk-sir5m-f38cdbee37.json',
+  stephen:
+    '../../../../../../Downloads/mantic-markets-firebase-adminsdk-1ep46-351a65eca3.json',
+  stephenDev:
+    '../../../../Downloads/dev-mantic-markets-firebase-adminsdk-sir5m-b2d27f8970.json',
+}
+
+export const initAdmin = (who: keyof typeof pathsToPrivateKey) => {
+  const serviceAccount = require(pathsToPrivateKey[who])
+
+  admin.initializeApp({
+    credential: admin.credential.cert(serviceAccount),
+  })
+}
+
+// Then:
+// yarn watch (or yarn build)
+// firebase use dev (or firebase use prod)
+// Run script:
+// node lib/functions/src/scripts/update-contract-tags.js

functions/src/scripts/update-contract-tags.ts

@@ -1,22 +1,15 @@
 import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
-// Generate your own private key, and set the path below:
-// https://console.firebase.google.com/u/0/project/mantic-markets/settings/serviceaccounts/adminsdk
-// James:
-const serviceAccount = require('/Users/jahooma/mantic-markets-firebase-adminsdk-1ep46-820891bb87.json')
-// Stephen:
-// const serviceAccount = require('../../../../Downloads/dev-mantic-markets-firebase-adminsdk-sir5m-b2d27f8970.json')
-admin.initializeApp({
-  credential: admin.credential.cert(serviceAccount),
-})
-const firestore = admin.firestore()
+import { initAdmin } from './script-init'
+initAdmin('jamesDev')
 
 import { Contract } from '../../../common/contract'
 import { parseTags } from '../../../common/util/parse'
 import { getValues } from '../utils'
 
 async function updateContractTags() {
+  const firestore = admin.firestore()
   console.log('Updating contracts tags')
 
   const contracts = await getValues<Contract>(firestore.collection('contracts'))
@@ -48,4 +41,6 @@ async function updateContractTags() {
   }
 }
 
-if (require.main === module) updateContractTags().then(() => process.exit())
+if (require.main === module) {
+  updateContractTags().then(() => process.exit())
+}

web/components/contracts-list.tsx

@@ -122,12 +122,13 @@ function CreatorContractsGrid(props: { contracts: Contract[] }) {
 function TagContractsGrid(props: { contracts: Contract[] }) {
   const { contracts } = props
 
-  const contractTags = _.flatMap(contracts, (contract) =>
-    parseTags(contract.question + ' ' + contract.description).map((tag) => ({
+  const contractTags = _.flatMap(contracts, (contract) => {
+    const { tags } = contract
+    return tags.map((tag) => ({
       tag,
       contract,
     }))
-  )
+  })
   const groupedByTag = _.groupBy(contractTags, ({ tag }) => tag)
   const byTag = _.mapValues(groupedByTag, (contractTags) =>
     contractTags.map(({ contract }) => contract)
@@ -210,7 +211,8 @@ export function SearchableGrid(props: {
       check(c.question) ||
       check(c.description) ||
       check(c.creatorName) ||
-      check(c.creatorUsername)
+      check(c.creatorUsername) ||
+      check(c.lowercaseTags.map((tag) => `#${tag}`).join(' '))
   )
 
   if (sort === 'newest' || sort === 'all') {