Merge branch 'master' into daily_sats_summary_notifications

stackernews · Jan 11, 2025 · f832aff · f832aff
2 parents a789e7d + 7daf688
commit f832aff
Show file tree

Hide file tree

Showing 11 changed files with 864 additions and 141 deletions.
diff --git a/api/paidAction/zap.js b/api/paidAction/zap.js
@@ -206,7 +206,17 @@ export async function nonCriticalSideEffects ({ invoice, actIds }, { models }) {
     where: invoice ? { invoiceId: invoice.id } : { id: { in: actIds } },
     include: { item: true }
   })
-  notifyZapped({ models, item: itemAct.item }).catch(console.error)
+  // avoid duplicate notifications with the same zap amount
+  // by checking if there are any other pending acts on the item
+  const pendingActs = await models.itemAct.count({
+    where: {
+      itemId: itemAct.itemId,
+      createdAt: {
+        gt: itemAct.createdAt
+      }
+    }
+  })
+  if (pendingActs === 0) notifyZapped({ models, item: itemAct.item }).catch(console.error)
 }
 
 export async function onFail ({ invoice }, { tx }) {

diff --git a/api/resolvers/user.js b/api/resolvers/user.js
@@ -441,26 +441,6 @@ export default {
       }
 
       if (user.noteWithdrawals) {
-        const p2pZap = await models.invoice.findFirst({
-          where: {
-            confirmedAt: {
-              gt: lastChecked
-            },
-            invoiceForward: {
-              withdrawl: {
-                userId: me.id,
-                status: 'CONFIRMED',
-                updatedAt: {
-                  gt: lastChecked
-                }
-              }
-            }
-          }
-        })
-        if (p2pZap) {
-          foundNotes()
-          return true
-        }
         const wdrwl = await models.withdrawl.findFirst({
           where: {
             userId: me.id,

diff --git a/components/badge.js b/components/badge.js
@@ -75,7 +75,7 @@ export function BadgeTooltip ({ children, overlayText, placement }) {
     <OverlayTrigger
       placement={placement || 'bottom'}
       overlay={
-        <Tooltip>
+        <Tooltip style={{ position: 'fixed' }}>
           {overlayText}
         </Tooltip>
       }

diff --git a/docs/generating-seed.md → docs/dev/generating-seed.md b/docs/generating-seed.md → docs/dev/generating-seed.md
diff --git a/docs/semantic-search.md → docs/dev/semantic-search.md b/docs/semantic-search.md → docs/dev/semantic-search.md
diff --git a/docs/time-is-a-bitch.md → docs/dev/time-is-a-bitch.md b/docs/time-is-a-bitch.md → docs/dev/time-is-a-bitch.md
diff --git a/docs/useful-dev-commands.md → docs/dev/useful-dev-commands.md b/docs/useful-dev-commands.md → docs/dev/useful-dev-commands.md