Merge branch 'master' into bolt12a

Author: riccardobl

api/paidAction/inviteGift.js

@@ -21,7 +21,7 @@ export async function perform ({ id, userId }, { me, cost, tx }) {
     where: { id, userId: me.id, revoked: false }
   })
 
-  if (invite.giftedCount >= invite.limit) {
+  if (invite.limit && invite.giftedCount >= invite.limit) {
     throw new Error('invite limit reached')
   }
 
@@ -45,7 +45,7 @@ export async function perform ({ id, userId }, { me, cost, tx }) {
   })
 
   return await tx.invite.update({
-    where: { id, userId: me.id, giftedCount: { lt: invite.limit }, revoked: false },
+    where: { id, userId: me.id, revoked: false, ...(invite.limit ? { giftedCount: { lt: invite.limit } } : {}) },
     data: {
       giftedCount: {
         increment: 1

api/paidAction/itemCreate.js

@@ -2,6 +2,7 @@ import { ANON_ITEM_SPAM_INTERVAL, ITEM_SPAM_INTERVAL, PAID_ACTION_PAYMENT_METHOD
 import { notifyItemMention, notifyItemParents, notifyMention, notifyTerritorySubscribers, notifyUserSubscribers } from '@/lib/webPush'
 import { getItemMentions, getMentions, performBotBehavior } from './lib/item'
 import { msatsToSats, satsToMsats } from '@/lib/format'
+import { GqlInputError } from '@/lib/error'
 
 export const anonable = true
 
@@ -137,7 +138,15 @@ export async function perform (args, context) {
       }
     })).bio
   } else {
-    item = await tx.item.create({ data: itemData })
+    try {
+      item = await tx.item.create({ data: itemData })
+    } catch (err) {
+      if (err.message.includes('violates exclusion constraint \\"Item_unique_time_constraint\\"')) {
+        const message = `you already submitted this ${itemData.title ? 'post' : 'comment'}`
+        throw new GqlInputError(message)
+      }
+      throw err
+    }
   }
 
   // store a reference to the item in the invoice
@@ -223,7 +232,7 @@ export async function onPaid ({ invoice, id }, context) {
       ), ancestors AS (
         UPDATE "Item"
         SET ncomments = "Item".ncomments + 1,
-          "lastCommentAt" = now(),
+          "lastCommentAt" = GREATEST("Item"."lastCommentAt", comment.created_at),
           "weightedComments" = "Item"."weightedComments" +
             CASE WHEN comment."userId" = "Item"."userId" THEN 0 ELSE comment.trust END
         FROM comment

api/typeDefs/invite.js

@@ -7,7 +7,7 @@ export default gql`
   }
 
   extend type Mutation {
-    createInvite(id: String, gift: Int!, limit: Int, description: String): Invite
+    createInvite(id: String, gift: Int!, limit: Int!, description: String): Invite
     revokeInvite(id: ID!): Invite
   }
 

components/bookmark.js

@@ -17,7 +17,8 @@ export default function BookmarkDropdownItem ({ item: { id, meBookmark } }) {
           id: `Item:${id}`,
           fields: {
             meBookmark: () => bookmarkItem.meBookmark
-          }
+          },
+          optimistic: true
         })
       }
     }

components/comment-edit.js

@@ -18,7 +18,8 @@ export default function CommentEdit ({ comment, editThreshold, onSuccess, onCanc
             text () {
               return result.text
             }
-          }
+          },
+          optimistic: true
         })
       }
     },

components/delete.js

@@ -30,7 +30,8 @@ export default function Delete ({ itemId, children, onDelete, type = 'post' }) {
             url: () => deleteItem.url,
             pollCost: () => deleteItem.pollCost,
             deletedAt: () => deleteItem.deletedAt
-          }
+          },
+          optimistic: true
         })
       }
     }

components/dont-link-this.js

@@ -84,7 +84,8 @@ export function OutlawDropdownItem ({ item }) {
           id: `Item:${item.id}`,
           fields: {
             outlawed: () => true
-          }
+          },
+          optimistic: true
         })
       }
     }

components/item-act.js

@@ -181,7 +181,7 @@ export default function ItemAct ({ onClose, item, act = 'TIP', step, children, a
 
 function modifyActCache (cache, { result, invoice }) {
   if (!result) return
-  const { id, sats, path, act } = result
+  const { id, sats, act } = result
   cache.modify({
     id: `Item:${id}`,
     fields: {
@@ -209,9 +209,16 @@ function modifyActCache (cache, { result, invoice }) {
         }
         return existingBoost
       }
-    }
+    },
+    optimistic: true
   })
+}
 
+// doing this onPaid fixes issue #1695 because optimistically updating all ancestors
+// conflicts with the writeQuery on navigation from SSR
+function updateAncestors (cache, { result, invoice }) {
+  if (!result) return
+  const { id, sats, act, path } = result
   if (act === 'TIP') {
     // update all ancestors
     path.split('.').forEach(aId => {
@@ -222,7 +229,8 @@ function modifyActCache (cache, { result, invoice }) {
           commentSats (existingCommentSats = 0) {
             return existingCommentSats + sats
           }
-        }
+        },
+        optimistic: true
       })
     })
   }
@@ -259,6 +267,7 @@ export function useAct ({ query = ACT_MUTATION, ...options } = {}) {
     onPaid: (cache, { data }) => {
       const response = getPaidActionResult(data)
       if (!response) return
+      updateAncestors(cache, response)
       options?.onPaid?.(cache, { data })
     }
   })

components/nav/common.js

@@ -227,7 +227,7 @@ export function SignUpButton ({ className = 'py-0', width }) {
 
   return (
     <Button
-      className={classNames('align-items-center ps-2 py-1 pe-3', className)}
+      className={classNames('align-items-center ps-2 pe-3', className)}
       style={{ borderWidth: '2px', width: width || '150px' }}
       id='signup'
       onClick={() => handleLogin('/signup')}
@@ -359,7 +359,7 @@ export function LoginButtons ({ handleClose }) {
         <LoginButton />
       </Dropdown.Item>
       <Dropdown.Item className='py-1'>
-        <SignUpButton />
+        <SignUpButton className='py-1' />
       </Dropdown.Item>
       <Dropdown.Item className='py-1'>
         <SwitchAccountButton handleClose={handleClose} />

components/notifications.js

@@ -344,7 +344,7 @@ function getPayerSig (lud18Data) {
 
 function InvoicePaid ({ n }) {
   const payerSig = getPayerSig(n.invoice.lud18Data)
-  let actionString = 'desposited to your account'
+  let actionString = 'deposited to your account'
   let sats = n.earnedSats
   if (n.invoice.forwardedSats) {
     actionString = 'sent directly to your attached wallet'