@@ -136,6 +142,10 @@ export default function Comment ({
{timeSince(new Date(item.createdAt))}
{includeParent &&
}
+ {bountyPaid &&
+
+
+ }
{me && !item.meSats && !item.meDontLike && !item.mine && !item.deletedAt &&
}
{(item.outlawed &&
{' '}OUTLAWED) ||
(item.freebie && !item.mine && (me?.greeterMode) &&
{' '}FREEBIE)}
@@ -198,9 +208,9 @@ export default function Comment ({
: (
{!noReply &&
-
}
+
+ {item.root?.bounty && !bountyPaid && }
+ }
{children}
{item.comments && !noComments
diff --git a/components/comment.module.css b/components/comment.module.css
index 047a00d4..23fe064a 100644
--- a/components/comment.module.css
+++ b/components/comment.module.css
@@ -78,6 +78,12 @@
padding-bottom: .5rem;
}
+.replyContainer {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+}
+
.comment {
border-radius: .4rem;
padding-top: .5rem;
@@ -85,6 +91,12 @@
background-color: var(--theme-commentBg);
}
+.bountyIcon {
+ margin-left: 5px;
+ margin-right: 5px;
+ margin-top: -4px;
+}
+
.hunk {
margin-bottom: 0;
margin-top: 0.15rem;
diff --git a/components/item-full.js b/components/item-full.js
index 4ab0d60f..9ee71dbc 100644
--- a/components/item-full.js
+++ b/components/item-full.js
@@ -15,6 +15,8 @@ import { useEffect, useState } from 'react'
import Poll from './poll'
import { commentsViewed } from '../lib/new-comments'
import Related from './related'
+import PastBounties from './past-bounties'
+import Check from '../svgs/check-double-line.svg'
function BioItem ({ item, handleClick }) {
const me = useMe()
@@ -97,10 +99,23 @@ function TopLevelItem ({ item, noReply, ...props }) {
{item.text &&
}
{item.url &&
}
{item.poll &&
}
+ {item.bounty &&
+
+ {item.bountyPaid
+ ? (
+
+ {item.bounty} sats paid
+
)
+ : (
+
+ {item.bounty} sats bounty
+
)}
+
}
{!noReply &&
<>
- {!item.position && !item.isJob && !item.parentId &&
}
+ {!item.position && !item.isJob && !item.parentId && !item.bounty > 0 &&
}
+ {item.bounty > 0 &&
}
}
)
diff --git a/components/item.js b/components/item.js
index dc4d2b81..8ebf3c5a 100644
--- a/components/item.js
+++ b/components/item.js
@@ -9,6 +9,8 @@ import Pin from '../svgs/pushpin-fill.svg'
import reactStringReplace from 'react-string-replace'
import Toc from './table-of-contents'
import PollIcon from '../svgs/bar-chart-horizontal-fill.svg'
+import BountyIcon from '../svgs/bounty-bag.svg'
+import ActionTooltip from './action-tooltip'
import { Badge } from 'react-bootstrap'
import { newComments } from '../lib/new-comments'
import { useMe } from './me'
@@ -74,6 +76,12 @@ export default function Item ({ item, rank, showFwdUser, toc, children }) {
{item.searchTitle ? : item.title}
{item.pollCost && }
+ {item.bounty > 0 &&
+
+
+
+
+ }
{item.url &&
diff --git a/components/item.module.css b/components/item.module.css
index 470934c8..9a9bcf77 100644
--- a/components/item.module.css
+++ b/components/item.module.css
@@ -89,6 +89,12 @@ a.link:visited {
line-height: 1.06rem;
}
+.bountyIcon {
+ margin-left: 5px;
+ margin-right: 5px;
+ margin-top: -2px;
+}
+
/* .itemJob .hunk {
align-self: center;
}
diff --git a/components/past-bounties.js b/components/past-bounties.js
new file mode 100644
index 00000000..f687e3ce
--- /dev/null
+++ b/components/past-bounties.js
@@ -0,0 +1,46 @@
+import React from 'react'
+import { useQuery } from '@apollo/client'
+import AccordianItem from './accordian-item'
+import Item, { ItemSkeleton } from './item'
+import { BOUNTY_ITEMS_BY_USER_NAME } from '../fragments/items'
+import Link from 'next/link'
+import styles from './items.module.css'
+
+export default function PastBounties ({ children, item }) {
+ const emptyItems = new Array(5).fill(null)
+
+ const { data, loading } = useQuery(BOUNTY_ITEMS_BY_USER_NAME, {
+ variables: {
+ name: item.user.name,
+ limit: 5
+ },
+ fetchPolicy: 'cache-first'
+ })
+
+ let items, cursor
+ if (data) {
+ ({ getBountiesByUserName: { items, cursor } } = data)
+ items = items.filter(i => i.id !== item.id)
+ }
+
+ return (
+
{item.user.name}'s bounties}
+ body={
+ <>
+
+ {loading
+ ? emptyItems.map((_, i) =>
)
+ : (items?.length
+ ? items.map(bountyItem => {
+ return
+ })
+ :
EMPTY
+ )}
+
+ {cursor &&
view all past bounties}
+
+ }
+ />
+ )
+}
diff --git a/components/pay-bounty.js b/components/pay-bounty.js
new file mode 100644
index 00000000..efe61795
--- /dev/null
+++ b/components/pay-bounty.js
@@ -0,0 +1,114 @@
+import React from 'react'
+import { Button } from 'react-bootstrap'
+import styles from './pay-bounty.module.css'
+import ActionTooltip from './action-tooltip'
+import ModalButton from './modal-button'
+import { useMutation, gql } from '@apollo/client'
+import { useMe } from './me'
+import { abbrNum } from '../lib/format'
+import { useShowModal } from './modal'
+import FundError from './fund-error'
+
+export default function PayBounty ({ children, item }) {
+ const me = useMe()
+ const showModal = useShowModal()
+
+ const [act] = useMutation(
+ gql`
+ mutation act($id: ID!, $sats: Int!) {
+ act(id: $id, sats: $sats) {
+ sats
+ }
+ }`, {
+ update (cache, { data: { act: { sats } } }) {
+ cache.modify({
+ id: `Item:${item.id}`,
+ fields: {
+ sats (existingSats = 0) {
+ return existingSats + sats
+ },
+ meSats (existingSats = 0) {
+ return existingSats + sats
+ }
+ }
+ })
+
+ // update all ancestor comment sats
+ item.path.split('.').forEach(id => {
+ if (Number(id) === Number(item.id)) return
+ cache.modify({
+ id: `Item:${id}`,
+ fields: {
+ commentSats (existingCommentSats = 0) {
+ return existingCommentSats + sats
+ }
+ }
+ })
+ })
+
+ // update root bounty status
+ cache.modify({
+ id: `Item:${item.root.id}`,
+ fields: {
+ bountyPaid () {
+ return true
+ },
+ bountyPaidTo (existingPaidTo = []) {
+ return [...existingPaidTo, Number(item.id)]
+ }
+ }
+ })
+ }
+ }
+ )
+
+ const handlePayBounty = async () => {
+ try {
+ await act({
+ variables: { id: item.id, sats: item.root.bounty },
+ optimisticResponse: {
+ act: {
+ id: `Item:${item.id}`,
+ sats: item.root.bounty
+ }
+ }
+ })
+ } catch (error) {
+ if (error.toString().includes('insufficient funds')) {
+ showModal(onClose => {
+ return
+ })
+ return
+ }
+ throw new Error({ message: error.toString() })
+ }
+ }
+
+ if (!me || item.root.user.name !== me.name || item.mine || item.root.bountyPaid) {
+ return null
+ }
+
+ return (
+
+
+ pay bounty
+
+ }
+ >
+
+ Pay this bounty to {item.user.name}?
+
+
+
+
+
+
+ )
+}
diff --git a/components/pay-bounty.module.css b/components/pay-bounty.module.css
new file mode 100644
index 00000000..2ff15246
--- /dev/null
+++ b/components/pay-bounty.module.css
@@ -0,0 +1,4 @@
+.pay {
+ color: var(--success);
+ margin-left: 1rem;
+}
\ No newline at end of file
diff --git a/components/recent-header.js b/components/recent-header.js
index b18938c9..17fdce5e 100644
--- a/components/recent-header.js
+++ b/components/recent-header.js
@@ -16,7 +16,7 @@ export default function RecentHeader ({ type }) {
className='w-auto'
name='type'
size='sm'
- items={['posts', 'comments', 'links', 'discussions', 'polls', 'bios']}
+ items={['posts', 'bounties', 'comments', 'links', 'discussions', 'polls', 'bios']}
onChange={(formik, e) => router.push(e.target.value === 'posts' ? '/recent' : `/recent/${e.target.value}`)}
/>
diff --git a/components/reply.js b/components/reply.js
index 29e86799..7dec45ab 100644
--- a/components/reply.js
+++ b/components/reply.js
@@ -22,7 +22,7 @@ export function ReplyOnAnotherPage ({ parentId }) {
)
}
-export default function Reply ({ item, onSuccess, replyOpen }) {
+export default function Reply ({ item, onSuccess, replyOpen, children }) {
const [reply, setReply] = useState(replyOpen)
const me = useMe()
const parentId = item.id
@@ -84,11 +84,14 @@ export default function Reply ({ item, onSuccess, replyOpen }) {
{replyOpen
?
setReply(!reply)}
- >
- {reply ? 'cancel' : 'reply'}
+
+
setReply(!reply)}
+ >
+ {reply ? 'cancel' : 'reply'}
+
+ {/* HACK if we need more items, we should probably do a comment toolbar */}
+ {children}
)}
@@ -47,8 +54,10 @@ export function PostForm () {
return
} else if (router.query.type === 'link') {
return
- } else {
+ } else if (router.query.type === 'poll') {
return
+ } else {
+ return
}
}
diff --git a/prisma/migrations/20221213203919_add_bounty/migration.sql b/prisma/migrations/20221213203919_add_bounty/migration.sql
new file mode 100644
index 00000000..d4f8b477
--- /dev/null
+++ b/prisma/migrations/20221213203919_add_bounty/migration.sql
@@ -0,0 +1,93 @@
+-- AlterTable
+ALTER TABLE "Item" ADD COLUMN "bounty" INTEGER;
+ALTER TABLE "Item" ADD CONSTRAINT "bounty" CHECK ("bounty" IS NULL OR "bounty" > 0) NOT VALID;
+
+CREATE OR REPLACE FUNCTION create_item(
+ title TEXT, url TEXT, text TEXT, boost INTEGER, bounty INTEGER,
+ parent_id INTEGER, user_id INTEGER, fwd_user_id INTEGER,
+ spam_within INTERVAL)
+RETURNS "Item"
+LANGUAGE plpgsql
+AS $$
+DECLARE
+ user_msats BIGINT;
+ cost_msats BIGINT;
+ free_posts INTEGER;
+ free_comments INTEGER;
+ freebie BOOLEAN;
+ item "Item";
+ med_votes FLOAT;
+BEGIN
+ PERFORM ASSERT_SERIALIZED();
+
+ SELECT msats, "freePosts", "freeComments"
+ INTO user_msats, free_posts, free_comments
+ FROM users WHERE id = user_id;
+
+ cost_msats := 1000 * POWER(10, item_spam(parent_id, user_id, spam_within));
+ -- it's only a freebie if it's a 1 sat cost, they have < 1 sat, boost = 0, and they have freebies left
+ freebie := (cost_msats <= 1000) AND (user_msats < 1000) AND (boost = 0) AND ((parent_id IS NULL AND free_posts > 0) OR (parent_id IS NOT NULL AND free_comments > 0));
+
+ IF NOT freebie AND cost_msats > user_msats THEN
+ RAISE EXCEPTION 'SN_INSUFFICIENT_FUNDS';
+ END IF;
+
+ -- get this user's median item score
+ SELECT COALESCE(percentile_cont(0.5) WITHIN GROUP(ORDER BY "weightedVotes" - "weightedDownVotes"), 0) INTO med_votes FROM "Item" WHERE "userId" = user_id;
+
+ -- if their median votes are positive, start at 0
+ -- if the median votes are negative, start their post with that many down votes
+ -- basically: if their median post is bad, presume this post is too
+ IF med_votes >= 0 THEN
+ med_votes := 0;
+ ELSE
+ med_votes := ABS(med_votes);
+ END IF;
+
+ INSERT INTO "Item" (title, url, text, bounty, "userId", "parentId", "fwdUserId", freebie, "weightedDownVotes", created_at, updated_at)
+ VALUES (title, url, text, bounty, user_id, parent_id, fwd_user_id, freebie, med_votes, now_utc(), now_utc()) RETURNING * INTO item;
+
+ IF freebie THEN
+ IF parent_id IS NULL THEN
+ UPDATE users SET "freePosts" = "freePosts" - 1 WHERE id = user_id;
+ ELSE
+ UPDATE users SET "freeComments" = "freeComments" - 1 WHERE id = user_id;
+ END IF;
+ ELSE
+ UPDATE users SET msats = msats - cost_msats WHERE id = user_id;
+
+ INSERT INTO "ItemAct" (msats, "itemId", "userId", act, created_at, updated_at)
+ VALUES (cost_msats, item.id, user_id, 'FEE', now_utc(), now_utc());
+ END IF;
+
+ IF boost > 0 THEN
+ PERFORM item_act(item.id, user_id, 'BOOST', boost);
+ END IF;
+
+ RETURN item;
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION update_item(item_id INTEGER,
+ item_title TEXT, item_url TEXT, item_text TEXT, boost INTEGER,item_bounty INTEGER,
+ fwd_user_id INTEGER)
+RETURNS "Item"
+LANGUAGE plpgsql
+AS $$
+DECLARE
+ user_msats INTEGER;
+ item "Item";
+BEGIN
+ PERFORM ASSERT_SERIALIZED();
+
+ UPDATE "Item" set title = item_title, url = item_url, text = item_text, bounty = item_bounty, "fwdUserId" = fwd_user_id
+ WHERE id = item_id
+ RETURNING * INTO item;
+
+ IF boost > 0 THEN
+ PERFORM item_act(item.id, item."userId", 'BOOST', boost);
+ END IF;
+
+ RETURN item;
+END;
+$$;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index d21a80d5..09961559 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -228,6 +228,7 @@ model Item {
pin Pin? @relation(fields: [pinId], references: [id])
pinId Int?
boost Int @default(0)
+ bounty Int?
uploadId Int?
upload Upload?
paidImgLink Boolean @default(false)
diff --git a/svgs/bounty-bag.svg b/svgs/bounty-bag.svg
new file mode 100644
index 00000000..022a80f7
--- /dev/null
+++ b/svgs/bounty-bag.svg
@@ -0,0 +1 @@
+
\ No newline at end of file