From 7e9007aad1c7d481752292f555c683cf23554b88 Mon Sep 17 00:00:00 2001
From: James Grugett
Date: Fri, 29 Apr 2022 09:53:51 -0400
Subject: [PATCH 01/68] Fetch markets client side on explore page (to avoid
vercel 5MB limit for static props)
---
web/pages/markets.tsx | 29 +++++++++--------------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/web/pages/markets.tsx b/web/pages/markets.tsx
index 6149c8b5..81032199 100644
--- a/web/pages/markets.tsx
+++ b/web/pages/markets.tsx
@@ -2,26 +2,16 @@ import {
ContractsGrid,
SearchableGrid,
} from '../components/contract/contracts-list'
+import { LoadingIndicator } from '../components/loading-indicator'
import { Page } from '../components/page'
import { SEO } from '../components/SEO'
import { Title } from '../components/title'
import { useContracts } from '../hooks/use-contracts'
-import { Contract, listAllContracts } from '../lib/firebase/contracts'
-
-export async function getStaticProps() {
- const contracts = await listAllContracts().catch((_) => [])
- return {
- props: {
- contracts,
- },
-
- revalidate: 60, // regenerate after a minute
- }
-}
+import { Contract } from '../lib/firebase/contracts'
// TODO: Rename endpoint to "Explore"
-export default function Markets(props: { contracts: Contract[] }) {
- const contracts = useContracts() ?? props.contracts ?? []
+export default function Markets() {
+ const contracts = useContracts()
return (
@@ -30,12 +20,11 @@ export default function Markets(props: { contracts: Contract[] }) {
description="Discover what's new, trending, or soon-to-close. Or search among our hundreds of markets."
url="/markets"
/>
- {/*
-
-
- */}
-
-
+ {contracts === undefined ? (
+
+ ) : (
+
+ )}
)
}
From fa8ebe36bd8dd6dfd512ebc2e0283fd938e3ca83 Mon Sep 17 00:00:00 2001
From: James Grugett
Date: Fri, 29 Apr 2022 10:05:32 -0400
Subject: [PATCH 02/68] Move loading indicator into SearchableGrid.
---
web/components/contract/contracts-list.tsx | 9 ++++++---
web/pages/markets.tsx | 7 +------
web/pages/tag/[tag].tsx | 7 ++-----
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/web/components/contract/contracts-list.tsx b/web/components/contract/contracts-list.tsx
index d6bef2e7..dab8613d 100644
--- a/web/components/contract/contracts-list.tsx
+++ b/web/components/contract/contracts-list.tsx
@@ -18,6 +18,7 @@ import {
useQueryAndSortParams,
} from '../../hooks/use-sort-and-query-params'
import { Answer } from '../../../common/answer'
+import { LoadingIndicator } from '../loading-indicator'
export function ContractsGrid(props: {
contracts: Contract[]
@@ -213,7 +214,7 @@ function TagContractsGrid(props: { contracts: Contract[] }) {
const MAX_CONTRACTS_DISPLAYED = 99
export function SearchableGrid(props: {
- contracts: Contract[]
+ contracts: Contract[] | undefined
byOneCreator?: boolean
querySortOptions?: {
defaultSort: Sort
@@ -230,7 +231,7 @@ export function SearchableGrid(props: {
return queryWords.every((word) => corpus.toLowerCase().includes(word))
}
- let matches = contracts.filter(
+ let matches = (contracts ?? []).filter(
(c) =>
check(c.question) ||
check(c.description) ||
@@ -324,7 +325,9 @@ export function SearchableGrid(props: {
- {sort === 'tag' ? (
+ {contracts === undefined ? (
+
+ ) : sort === 'tag' ? (
) : !byOneCreator && sort === 'creator' ? (
diff --git a/web/pages/markets.tsx b/web/pages/markets.tsx
index 81032199..23ff2adf 100644
--- a/web/pages/markets.tsx
+++ b/web/pages/markets.tsx
@@ -2,7 +2,6 @@ import {
ContractsGrid,
SearchableGrid,
} from '../components/contract/contracts-list'
-import { LoadingIndicator } from '../components/loading-indicator'
import { Page } from '../components/page'
import { SEO } from '../components/SEO'
import { Title } from '../components/title'
@@ -20,11 +19,7 @@ export default function Markets() {
description="Discover what's new, trending, or soon-to-close. Or search among our hundreds of markets."
url="/markets"
/>
- {contracts === undefined ? (
-
- ) : (
-
- )}
+
)
}
diff --git a/web/pages/tag/[tag].tsx b/web/pages/tag/[tag].tsx
index 34c8f138..cabc6c80 100644
--- a/web/pages/tag/[tag].tsx
+++ b/web/pages/tag/[tag].tsx
@@ -3,27 +3,24 @@ import { useRouter } from 'next/router'
import { SearchableGrid } from '../../components/contract/contracts-list'
import { Page } from '../../components/page'
import { Title } from '../../components/title'
-import { useContracts } from '../../hooks/use-contracts'
import {
Contract,
listTaggedContractsCaseInsensitive,
} from '../../lib/firebase/contracts'
-export default function TagPage(props: { contracts: Contract[] }) {
+export default function TagPage() {
const router = useRouter()
const { tag } = router.query as { tag: string }
// mqp: i wrote this in a panic to make the page literally work at all so if you
// want to e.g. listen for new contracts you may want to fix it up
- const [contracts, setContracts] = useState('loading')
+ const [contracts, setContracts] = useState()
useEffect(() => {
if (tag != null) {
listTaggedContractsCaseInsensitive(tag).then(setContracts)
}
}, [tag])
- if (contracts === 'loading') return <>>
-
return (
From c59e444d0ad5d70bd744b259d369a67597c54e10 Mon Sep 17 00:00:00 2001
From: mantikoros
Date: Fri, 29 Apr 2022 13:30:27 -0400
Subject: [PATCH 03/68] Manifold CLA
---
functions/.github/CONTRIBUTING.md | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 functions/.github/CONTRIBUTING.md
diff --git a/functions/.github/CONTRIBUTING.md b/functions/.github/CONTRIBUTING.md
new file mode 100644
index 00000000..4651b133
--- /dev/null
+++ b/functions/.github/CONTRIBUTING.md
@@ -0,0 +1,27 @@
+# Manifold CLA
+
+**Manifold Markets Contributor License Agreement**
+
+(Thanks to Beeminder and Discourse.org whose CLA we modeled this on!)
+
+## Unofficial Summary
+
+- Manifold can use your contributions
+- Manifold can sell things involving your contributions
+- You’re legally able to agree to the above
+- You’re the one who created these contributions
+- Manifold decides what gets included in Manifold
+- Manifold does not promise any support
+
+## Official Agreement
+
+The document below clarifies the terms under which You (the copyright owner or legal entity authorized by the copyright owner), may make "The Contributions" (software, bug fixes, configuration changes, documentation, or any other materials) to "The Work" (Manifold Markets). This license protects You, "The Company" (Manifold Markets, Inc.) and licensees; it does not change your rights to use your own contributions for any other purpose.
+
+You and "The Company" (Manifold Markets, Inc.) agree:
+
+- You grant to "The Company" (Manifold Markets, Inc.) a non-exclusive, irrevocable, worldwide, royalty-free, sublicenseable, relicenseable, transferable license under all of Your relevant intellectual property rights, to use, copy, prepare derivative works of, distribute and publicly perform and display "The Contributions" on any licensing terms, including without limitation: (a) open source licenses like the GNU General Public (v2.0) license; and (b) binary, proprietary, or commercial licenses. Except for the licenses granted herein, You reserve all right, title, and interest in and to "The Contributions".
+- You grant to "The Company" a non-exclusive, irrevocable (except as stated in this section), worldwide, royalty-free, sublicenseable, transferable patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer "The Work", where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with "The Work" to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or "The Work" to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
+- You are able to grant us these rights. You represent that You are legally entitled to grant the above license(s). If Your employer has rights to intellectual property that You create, You represent that You have received permission to make "The Contributions" on behalf of that employer, or that Your employer has waived such rights for "The Contributions".
+- "The Contributions" are your original work. You represent that "The Contributions" are Your original works of authorship, and to Your knowledge, no other person claims, or has the right to claim, any right in any invention or patent related to "The Contributions". You also represent that You are not legally obligated, whether by entering into an agreement or otherwise, in any way that conflicts with the terms of this license. For example, if you have signed an agreement requiring you to assign the intellectual property rights in "The Contributions" to an employer or customer, that would conflict with the terms of this license.
+- We, as authoritative representatives of "The Company" determine the code that is in "The Work". You understand that the decision to include "The Contribution(s)" in any project or source repository is entirely that of "The Company", and this agreement does not guarantee that "The Contributions" will be included in any product.
+- No Implied Warranties. "The Company" acknowledges that, except as explicitly described in this Agreement, the Contribution is provided on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
From be7e4a5c03927b6cb431109f31af1f5d6f77c514 Mon Sep 17 00:00:00 2001
From: mantikoros
Date: Fri, 29 Apr 2022 13:39:52 -0400
Subject: [PATCH 04/68] Manifold CLA: readme message, move to top level
---
{functions/.github => .github}/CONTRIBUTING.md | 0
README.md | 2 ++
2 files changed, 2 insertions(+)
rename {functions/.github => .github}/CONTRIBUTING.md (100%)
diff --git a/functions/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from functions/.github/CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
diff --git a/README.md b/README.md
index 56dceae0..98387abe 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,8 @@ Also: Our docs are currently in [a separate repo](https://github.com/manifoldmar
Since we are just now open-sourcing things, we will see how things go. Feel free to open issues, submit PRs, and chat about the process on [Discord][discord]. We would prefer [small PRs][small-prs] that we can effectively evaluate and review -- maybe check in with us first if you are thinking to work on a big change.
+By contributing to this codebase, you are agreeing to the terms of the [Manifold CLA](https://github.com/manifoldmarkets/manifold/.github/CONTRIBUTING.md).
+
If you need additional access to any infrastructure in order to work on something (e.g. Vercel, Firebase) let us know about that on Discord as well.
[vercel]: https://vercel.com/
From f078ce4fa9b8b607f2c783e708df58bc46f0ac1e Mon Sep 17 00:00:00 2001
From: mantikoros
Date: Fri, 29 Apr 2022 13:40:44 -0400
Subject: [PATCH 05/68] CLA: fix link
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 98387abe..b480f60c 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Also: Our docs are currently in [a separate repo](https://github.com/manifoldmar
Since we are just now open-sourcing things, we will see how things go. Feel free to open issues, submit PRs, and chat about the process on [Discord][discord]. We would prefer [small PRs][small-prs] that we can effectively evaluate and review -- maybe check in with us first if you are thinking to work on a big change.
-By contributing to this codebase, you are agreeing to the terms of the [Manifold CLA](https://github.com/manifoldmarkets/manifold/.github/CONTRIBUTING.md).
+By contributing to this codebase, you are agreeing to the terms of the [Manifold CLA](https://github.com/manifoldmarkets/manifold/blob/main/.github/CONTRIBUTING.md).
If you need additional access to any infrastructure in order to work on something (e.g. Vercel, Firebase) let us know about that on Discord as well.
From c2832039b8ee81b9b21970f1066e9960afa588eb Mon Sep 17 00:00:00 2001
From: Austin Chen
Date: Fri, 29 Apr 2022 13:45:10 -0400
Subject: [PATCH 06/68] Link to beeminder & discourse
---
.github/CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 4651b133..0d4dbd32 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -2,7 +2,7 @@
**Manifold Markets Contributor License Agreement**
-(Thanks to Beeminder and Discourse.org whose CLA we modeled this on!)
+(Thanks to [Beeminder](http://bmndr.co/cla) and [Discourse.org](https://cla-assistant.io/discourse/discourse) whose CLAs we modeled this on!)
## Unofficial Summary
From 5f86637ca56d16889bc3edd09d979196d825637e Mon Sep 17 00:00:00 2001
From: mantikoros
Date: Fri, 29 Apr 2022 15:53:13 -0400
Subject: [PATCH 07/68] raise ante to M$100
---
common/antes.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/antes.ts b/common/antes.ts
index 9a3f48c6..a443f508 100644
--- a/common/antes.ts
+++ b/common/antes.ts
@@ -5,7 +5,7 @@ import { User } from './user'
import { LiquidityProvision } from './liquidity-provision'
import { noFees } from './fees'
-export const FIXED_ANTE = 50
+export const FIXED_ANTE = 100
// deprecated
export const PHANTOM_ANTE = 0.001
From 5cb6ee3bca43a4ad071e1146a00805a75c482a5b Mon Sep 17 00:00:00 2001
From: mantikoros
Date: Fri, 29 Apr 2022 15:58:01 -0400
Subject: [PATCH 08/68] daily free markets' liquidity provided by
@ManifoldMarkets
---
common/antes.ts | 6 ++++--
functions/src/create-contract.ts | 5 ++++-
functions/src/scripts/migrate-to-cfmm.ts | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/common/antes.ts b/common/antes.ts
index a443f508..c77308f4 100644
--- a/common/antes.ts
+++ b/common/antes.ts
@@ -11,8 +11,10 @@ export const FIXED_ANTE = 100
export const PHANTOM_ANTE = 0.001
export const MINIMUM_ANTE = 50
+export const HOUSE_LIQUIDITY_PROVIDER_ID = 'IPTOzEqrpkWmEzh6hwvAyY9PqFb2' // @ManifoldMarkets' id
+
export function getCpmmInitialLiquidity(
- creator: User,
+ providerId: string,
contract: FullContract,
anteId: string,
amount: number
@@ -21,7 +23,7 @@ export function getCpmmInitialLiquidity(
const lp: LiquidityProvision = {
id: anteId,
- userId: creator.id,
+ userId: providerId,
contractId: contract.id,
createdTime,
isAnte: true,
diff --git a/functions/src/create-contract.ts b/functions/src/create-contract.ts
index 781337f7..ae7b0ad8 100644
--- a/functions/src/create-contract.ts
+++ b/functions/src/create-contract.ts
@@ -22,6 +22,7 @@ import {
getAnteBets,
getCpmmInitialLiquidity,
getFreeAnswerAnte,
+ HOUSE_LIQUIDITY_PROVIDER_ID,
MINIMUM_ANTE,
} from '../../common/antes'
import { getNoneAnswer } from '../../common/answer'
@@ -144,8 +145,10 @@ export const createContract = functions
.collection(`contracts/${contract.id}/liquidity`)
.doc()
+ const providerId = isFree ? HOUSE_LIQUIDITY_PROVIDER_ID : creator.id
+
const lp = getCpmmInitialLiquidity(
- creator,
+ providerId,
contract as FullContract,
liquidityDoc.id,
ante
diff --git a/functions/src/scripts/migrate-to-cfmm.ts b/functions/src/scripts/migrate-to-cfmm.ts
index cd9177a3..874011ca 100644
--- a/functions/src/scripts/migrate-to-cfmm.ts
+++ b/functions/src/scripts/migrate-to-cfmm.ts
@@ -106,7 +106,7 @@ async function recalculateContract(contractRef: DocRef, isCommit = false) {
const liquidityDocRef = contractRef.collection('liquidity').doc()
const lp = getCpmmInitialLiquidity(
- { id: 'IPTOzEqrpkWmEzh6hwvAyY9PqFb2' } as User, // use @ManifoldMarkets' id
+ 'IPTOzEqrpkWmEzh6hwvAyY9PqFb2', // use @ManifoldMarkets' id
{
...contract,
...contractUpdate,
From 78997c1e45afcbb8b10dc7198306af4eb342d253 Mon Sep 17 00:00:00 2001
From: Boa
Date: Fri, 29 Apr 2022 15:11:04 -0600
Subject: [PATCH 09/68] Show comments position (#110)
* Add betting activity back to feed
* Show position in bin. markets, no comments on bets
* Degroup bets on Bets tab
* Show users position or recent bet with comments
* Add tooltip on answer to FR comments
* Style improvements
* Only use bets by current user for comment input
---
web/components/feed/activity-items.ts | 91 ++++---
web/components/feed/feed-items.tsx | 328 +++++++++++++++++-------
web/components/outcome-label.tsx | 34 ++-
web/pages/[username]/[contractSlug].tsx | 2 +-
4 files changed, 308 insertions(+), 147 deletions(-)
diff --git a/web/components/feed/activity-items.ts b/web/components/feed/activity-items.ts
index a12c4e0a..7879b637 100644
--- a/web/components/feed/activity-items.ts
+++ b/web/components/feed/activity-items.ts
@@ -31,6 +31,8 @@ type BaseActivityItem = {
export type CommentInputItem = BaseActivityItem & {
type: 'commentInput'
+ betsByCurrentUser: Bet[]
+ comments: Comment[]
}
export type DescriptionItem = BaseActivityItem & {
@@ -48,12 +50,13 @@ export type BetItem = BaseActivityItem & {
bet: Bet
hideOutcome: boolean
smallAvatar: boolean
+ hideComment?: boolean
}
export type CommentItem = BaseActivityItem & {
type: 'comment'
comment: Comment
- bet: Bet | undefined
+ betsBySameUser: Bet[]
hideOutcome: boolean
truncate: boolean
smallAvatar: boolean
@@ -129,7 +132,7 @@ function groupBets(
type: 'comment' as const,
id: bet.id,
comment,
- bet,
+ betsBySameUser: [bet],
contract,
hideOutcome,
truncate: abbreviated,
@@ -280,7 +283,7 @@ function groupBetsAndComments(
id: comment.id,
contract: contract,
comment,
- bet: undefined,
+ betsBySameUser: [],
truncate: abbreviated,
hideOutcome: true,
smallAvatar,
@@ -308,6 +311,27 @@ function groupBetsAndComments(
return abbrItems
}
+function getCommentsWithPositions(
+ bets: Bet[],
+ comments: Comment[],
+ contract: Contract
+) {
+ const betsByUserId = _.groupBy(bets, (bet) => bet.userId)
+
+ const items = comments.map((comment) => ({
+ type: 'comment' as const,
+ id: comment.id,
+ contract: contract,
+ comment,
+ betsBySameUser: bets.length === 0 ? [] : betsByUserId[comment.userId] ?? [],
+ truncate: true,
+ hideOutcome: false,
+ smallAvatar: false,
+ }))
+
+ return items
+}
+
export function getAllContractActivityItems(
contract: Contract,
bets: Bet[],
@@ -361,6 +385,8 @@ export function getAllContractActivityItems(
type: 'commentInput',
id: 'commentInput',
contract,
+ betsByCurrentUser: [],
+ comments: [],
})
} else {
items.push(
@@ -385,6 +411,8 @@ export function getAllContractActivityItems(
type: 'commentInput',
id: 'commentInput',
contract,
+ betsByCurrentUser: [],
+ comments: [],
})
}
@@ -432,24 +460,13 @@ export function getRecentContractActivityItems(
)
)
} else {
- const onlyUsersBetsOrBetsWithComments = bets.filter((bet) =>
- comments.some(
- (comment) => comment.betId === bet.id || bet.userId === user?.id
- )
- )
items.push(
- ...groupBetsAndComments(
- onlyUsersBetsOrBetsWithComments,
- comments,
- contract,
- user?.id,
- {
- hideOutcome: false,
- abbreviated: true,
- smallAvatar: false,
- reversed: true,
- }
- )
+ ...groupBetsAndComments(bets, comments, contract, user?.id, {
+ hideOutcome: false,
+ abbreviated: true,
+ smallAvatar: false,
+ reversed: true,
+ })
)
}
@@ -471,37 +488,29 @@ export function getSpecificContractActivityItems(
switch (mode) {
case 'bets':
items.push(
- ...groupBets(bets, comments, contract, user?.id, {
+ ...bets.map((bet) => ({
+ type: 'bet' as const,
+ id: bet.id,
+ bet,
+ contract,
hideOutcome: false,
- abbreviated: false,
smallAvatar: false,
- reversed: false,
- })
+ hideComment: true,
+ }))
)
break
case 'comments':
- const onlyBetsWithComments = bets.filter((bet) =>
- comments.some((comment) => comment.betId === bet.id)
- )
- items.push(
- ...groupBetsAndComments(
- onlyBetsWithComments,
- comments,
- contract,
- user?.id,
- {
- hideOutcome: false,
- abbreviated: false,
- smallAvatar: false,
- reversed: false,
- }
- )
- )
+ items.push(...getCommentsWithPositions(bets, comments, contract))
+
items.push({
type: 'commentInput',
id: 'commentInput',
contract,
+ betsByCurrentUser: user
+ ? bets.filter((bet) => bet.userId === user.id)
+ : [],
+ comments: comments,
})
break
}
diff --git a/web/components/feed/feed-items.tsx b/web/components/feed/feed-items.tsx
index 7518c998..584907d9 100644
--- a/web/components/feed/feed-items.tsx
+++ b/web/components/feed/feed-items.tsx
@@ -39,7 +39,13 @@ import BetRow from '../bet-row'
import { Avatar } from '../avatar'
import { Answer } from '../../../common/answer'
import { ActivityItem } from './activity-items'
-import { FreeResponse, FullContract } from '../../../common/contract'
+import {
+ Binary,
+ CPMM,
+ DPM,
+ FreeResponse,
+ FullContract,
+} from '../../../common/contract'
import { BuyButton } from '../yes-no-selector'
import { getDpmOutcomeProbability } from '../../../common/calculate-dpm'
import { AnswerBetPanel } from '../answers/answer-bet-panel'
@@ -50,6 +56,7 @@ import { trackClick } from '../../lib/firebase/tracking'
import { firebaseLogin } from '../../lib/firebase/users'
import { DAY_MS } from '../../../common/util/time'
import NewContractBadge from '../new-contract-badge'
+import { calculateCpmmSale } from '../../../common/calculate-cpmm'
export function FeedItems(props: {
contract: Contract
@@ -123,21 +130,38 @@ function FeedItem(props: { item: ActivityItem }) {
export function FeedComment(props: {
contract: Contract
comment: Comment
- bet: Bet | undefined
+ betsBySameUser: Bet[]
hideOutcome: boolean
truncate: boolean
smallAvatar: boolean
}) {
- const { contract, comment, bet, hideOutcome, truncate, smallAvatar } = props
- let money: string | undefined
- let outcome: string | undefined
- let bought: string | undefined
- if (bet) {
- outcome = bet.outcome
- bought = bet.amount >= 0 ? 'bought' : 'sold'
- money = formatMoney(Math.abs(bet.amount))
- }
+ const {
+ contract,
+ comment,
+ betsBySameUser,
+ hideOutcome,
+ truncate,
+ smallAvatar,
+ } = props
const { text, userUsername, userName, userAvatarUrl, createdTime } = comment
+ let outcome: string | undefined,
+ bought: string | undefined,
+ money: string | undefined
+
+ const matchedBet = betsBySameUser.find((bet) => bet.id === comment.betId)
+ if (matchedBet) {
+ outcome = matchedBet.outcome
+ bought = matchedBet.amount >= 0 ? 'bought' : 'sold'
+ money = formatMoney(Math.abs(matchedBet.amount))
+ }
+
+ // Only calculated if they don't have a matching bet
+ const { userPosition, userPositionMoney, yesFloorShares, noFloorShares } =
+ getBettorsPosition(
+ contract,
+ comment.createdTime,
+ matchedBet ? [] : betsBySameUser
+ )
return (
<>
@@ -155,18 +179,33 @@ export function FeedComment(props: {
username={userUsername}
name={userName}
/>{' '}
- {bought} {money}
- {!hideOutcome && (
+ {!matchedBet && userPosition > 0 && (
<>
- {' '}
- of{' '}
-
+ {'with ' + userPositionMoney + ' '}
+ <>
+ {' of '}
+ noFloorShares ? 'YES' : 'NO'}
+ contract={contract}
+ truncate="short"
+ />
+ >
>
)}
+ <>
+ {bought} {money}
+ {outcome && !hideOutcome && (
+ <>
+ {' '}
+ of{' '}
+
+ >
+ )}
+ >
@@ -180,20 +219,12 @@ export function FeedComment(props: {
)
}
-function RelativeTimestamp(props: { time: number }) {
- const { time } = props
- return (
-
-
- {fromNow(time)}
-
-
- )
-}
-
-export function CommentInput(props: { contract: Contract }) {
- // see if we can comment input on any bet:
- const { contract } = props
+export function CommentInput(props: {
+ contract: Contract
+ betsByCurrentUser: Bet[]
+ comments: Comment[]
+}) {
+ const { contract, betsByCurrentUser, comments } = props
const user = useUser()
const [comment, setComment] = useState('')
@@ -206,14 +237,50 @@ export function CommentInput(props: { contract: Contract }) {
setComment('')
}
+ // Should this be oldest bet or most recent bet?
+ const mostRecentCommentableBet = betsByCurrentUser
+ .filter(
+ (bet) =>
+ canCommentOnBet(bet.userId, bet.createdTime, user) &&
+ !comments.some((comment) => comment.betId == bet.id)
+ )
+ .sort((b1, b2) => b1.createdTime - b2.createdTime)
+ .pop()
+
+ if (mostRecentCommentableBet) {
+ return (
+
+ )
+ }
+ const { userPosition, userPositionMoney, yesFloorShares, noFloorShares } =
+ getBettorsPosition(contract, Date.now(), betsByCurrentUser)
+
return (
<>
-
+
+ {user && userPosition > 0 && (
+ <>
+ {'You with ' + userPositionMoney + ' '}
+ <>
+ {' of '}
+
noFloorShares ? 'YES' : 'NO'}
+ contract={contract}
+ truncate="short"
+ />
+ >
+ >
+ )}