Merge branch 'master' into custom_domain

Author: Soxasora

api/paidAction/itemCreate.js

@@ -20,18 +20,15 @@ export async function getBaseCost ({ models, bio, parentId, subName }) {
 
   if (parentId) {
     // the subname is stored in the root item of the thread
-    const parent = await models.item.findFirst({
-      where: { id: Number(parentId) },
-      include: {
-        root: { include: { sub: true } },
-        sub: true
-      }
-    })
-
-    const root = parent.root ?? parent
-
-    if (!root.sub) return DEFAULT_ITEM_COST
-    return satsToMsats(root.sub.replyCost)
+    const [sub] = await models.$queryRaw`
+      SELECT s."replyCost"
+      FROM "Item" i
+      LEFT JOIN "Item" r ON r.id = i."rootId"
+      LEFT JOIN "Sub" s ON s.name = COALESCE(r."subName", i."subName")
+      WHERE i.id = ${Number(parentId)}`
+
+    if (sub?.replyCost) return satsToMsats(sub.replyCost)
+    return DEFAULT_ITEM_COST
   }
 
   const sub = await models.sub.findUnique({ where: { name: subName } })

awards.csv

@@ -175,17 +175,17 @@ SatsAllDay,issue,#1820,#1819,easy,,,1,9k,[email protected],2025-01-27
 Soxasora,pr,#1814,#1736,easy,,,,100k,[email protected],2025-01-27
 jason-me,pr,#1857,,easy,,,,100k,[email protected],2025-02-08
 ed-kung,pr,#1901,#323,good-first-issue,,,,20k,[email protected],2025-02-14
-Scroogey-SN,pr,#1911,#1905,good-first-issue,,,1,18k,[email protected],???
-Scroogey-SN,pr,#1928,#1924,good-first-issue,,,,20k,[email protected],???
+Scroogey-SN,pr,#1911,#1905,good-first-issue,,,1,18k,[email protected],2025-03-10
+Scroogey-SN,pr,#1928,#1924,good-first-issue,,,,20k,[email protected],2025-03-10
 dtonon,issue,#1928,#1924,good-first-issue,,,,2k,???,???
-ed-kung,pr,#1926,#1914,medium-hard,,,,500k,[email protected],???
-ed-kung,issue,#1926,#1914,medium-hard,,,,50k,[email protected],???
-ed-kung,pr,#1926,#1927,easy,,,,100k,[email protected],???
-ed-kung,issue,#1926,#1927,easy,,,,10k,[email protected],???
-ed-kung,issue,#1913,#1890,good-first-issue,,,,2k,[email protected],???
-Scroogey-SN,pr,#1930,#1167,good-first-issue,,,,20k,[email protected],???
+ed-kung,pr,#1926,#1914,medium-hard,,,,500k,[email protected],2025-03-10
+ed-kung,issue,#1926,#1914,medium-hard,,,,50k,[email protected],2025-03-10
+ed-kung,pr,#1926,#1927,easy,,,,100k,[email protected],2025-03-10
+ed-kung,issue,#1926,#1927,easy,,,,10k,[email protected],2025-03-10
+ed-kung,issue,#1913,#1890,good-first-issue,,,,2k,[email protected],2025-03-10
+Scroogey-SN,pr,#1930,#1167,good-first-issue,,,,20k,[email protected],2025-03-10
 itsrealfake,issue,#1930,#1167,good-first-issue,,,,2k,[email protected],???
-Scroogey-SN,pr,#1948,#1849,medium,urgent,,,750k,[email protected],???
-felipebueno,issue,#1947,#1945,good-first-issue,,,,2k,[email protected],???
-ed-kung,pr,#1952,#1951,easy,,,,100k,[email protected],???
-ed-kung,issue,#1952,#1951,easy,,,,10k,[email protected],???
+Scroogey-SN,pr,#1948,#1849,medium,urgent,,,750k,[email protected],2025-03-10
+felipebueno,issue,#1947,#1945,good-first-issue,,,,2k,[email protected],2025-03-10
+ed-kung,pr,#1952,#1951,easy,,,,100k,[email protected],2025-03-10
+ed-kung,issue,#1952,#1951,easy,,,,10k,[email protected],2025-03-10

components/account.js

@@ -51,7 +51,7 @@ export const AccountProvider = ({ children }) => {
   }, [])
 
   const multiAuthSignout = useCallback(async () => {
-    const { status } = await fetch('/api/signout', { credentials: 'include' })
+    const { status } = await fetch('/api/next-account', { credentials: 'include' })
     // if status is 302, this means the server was able to switch us to the next available account
     // and the current account was simply removed from the list of available accounts including the corresponding JWT.
     const switchSuccess = status === 302

docs/user/faq.md

@@ -8,7 +8,7 @@ sub: meta
 
 _To quickly browse through this FAQ page, click the chapters icon in the top-right corner. This will let you scroll through all chapters or search for a particular topic within this page._
 
-last updated: February 7, 2025
+last updated: March 12, 2025
 
 ---
 
@@ -174,6 +174,26 @@ This can happen for any of the following reasons:
 
 You cannot disable receiving CCs but we might change that in the future. For now, you can donate any CCs you received [here](/rewards).
 
+### If I attach a wallet, do I always pay with sats?
+
+No. We will only try to pay with sats from your wallet when you zap other stackers. In any other case, you're paying us, Stacker News, and we will thus try to first use any CCs you already have. If you don't have enough CCs, we will fallback to your attached wallet.
+
+### Can I pay only the remainder with sats?
+
+No. Payments can currently only be made entirely in CCs or sats.
+
+### Which wallet is used if I attached multiple wallets for send or receive?
+
+All of them! The wallet that is the furthest to the top-right will be attempted first. If it fails, we will attempt the next wallet in order. On desktop, you can drag the wallets around to rearrange their priority. On mobile, you need to click on a wallet and then select where you want the wallet to be.
+
+These sender and receiver fallbacks happen if the payment failed for any reason. The sender will attempt the next wallet if the error was caused by the sender side and the same is true for the receiver.
+
+The only limitation is that we will currently not attempt to pay with CCs at the end once we started to try paying with sats but all wallets failed. This will change in the future.
+
+### Are payments retried in the background?
+
+Yes. We try each payment three times in total with all sender and receiver fallbacks. If a payment still wasn't successful after that, you will receive a notification allowing you to retry the payment manually.
+
 ---
 
 ## Territories
@@ -249,7 +269,7 @@ The info text mentions that you will inherit all existing content.
 
 Other than that, the process to bring back an archived territory is the same as founding a new territory.
 
-### I want to share the costs and revenue of a territory with someone. How do I do that?
+### Can I share the costs and revenue of a territory with someone?
 
 You can't do that yet but this is planned. Currently, territories can only have a single founder.
 

fragments/items.js

@@ -108,6 +108,7 @@ export const ITEM_FULL_FIELDS = gql`
         moderated
         meMuteSub
         meSubscription
+        replyCost
       }
     }
     forwards {

pages/api/signout.js pages/api/next-account.js

@@ -1,5 +1,5 @@
 import * as cookie from 'cookie'
-import { datePivot } from '../../lib/time'
+import { datePivot } from '@/lib/time'
 
 /**
  * @param  {NextApiRequest}  req

prisma/migrations/20250312223725_check_reply_cost_positive/migration.sql

@@ -0,0 +1,2 @@
+-- Add constraint to ensure replyCost is positive
+ALTER TABLE "Sub" ADD CONSTRAINT "Sub_replyCost_positive" CHECK ("replyCost" > 0);

wallets/index.js

@@ -236,6 +236,7 @@ function RetryHandler ({ children }) {
   const waitForWalletPayment = useWalletPayment()
   const invoiceHelper = useInvoice()
   const [getFailedInvoices] = useLazyQuery(FAILED_INVOICES, { fetchPolicy: 'network-only', nextFetchPolicy: 'network-only' })
+  const { me } = useMe()
 
   const retry = useCallback(async (invoice) => {
     const newInvoice = await invoiceHelper.retry({ ...invoice, newAttempt: true })
@@ -255,6 +256,8 @@ function RetryHandler ({ children }) {
     // we always retry failed invoices, even if the user has no wallets on any client
     // to make sure that failed payments will always show up in notifications eventually
 
+    if (!me) return
+
     const retryPoll = async () => {
       let failedInvoices
       try {
@@ -298,7 +301,7 @@ function RetryHandler ({ children }) {
 
     queuePoll()
     return stopPolling
-  }, [wallets, getFailedInvoices, retry])
+  }, [me?.id, wallets, getFailedInvoices, retry])
 
   return children
 }