Merge branch 'master' into subscribe_unarchiver

Author: huumn

api/resolvers/item.js

@@ -26,7 +26,7 @@ import { verifyHmac } from './wallet'
 
 function commentsOrderByClause (me, models, sort) {
   if (sort === 'recent') {
-    return 'ORDER BY ("Item"."deletedAt" IS NULL) DESC, ("Item".cost > 0 OR "Item"."weightedVotes" - "Item"."weightedDownVotes" > 0) DESC, "Item".created_at DESC, "Item".id DESC'
+    return 'ORDER BY ("Item"."deletedAt" IS NULL) DESC, ("Item".cost > 0 OR "Item"."weightedVotes" - "Item"."weightedDownVotes" > 0) DESC, COALESCE("Item"."invoicePaidAt", "Item".created_at) DESC, "Item".id DESC'
   }
 
   if (me && sort === 'hot') {
@@ -412,10 +412,10 @@ export default {
                 typeClause(type),
                 muteClause(me)
               )}
-              ORDER BY "Item".created_at DESC
+              ORDER BY COALESCE("Item"."invoicePaidAt", "Item".created_at) DESC
               OFFSET $2
               LIMIT $3`,
-            orderBy: 'ORDER BY "Item"."createdAt" DESC'
+            orderBy: 'ORDER BY COALESCE("Item"."invoicePaidAt", "Item".created_at) DESC'
           }, decodedCursor.time, decodedCursor.offset, limit, ...subArr)
           break
         case 'top':
@@ -536,8 +536,8 @@ export default {
                     LEFT JOIN "Sub" ON "Sub"."name" = "Item"."subName"
                     ${joinZapRankPersonalView(me, models)}
                     ${whereClause(
-                      // in "home" (sub undefined), we want to show pinned items (but without the pin icon)
-                      sub ? '"Item"."pinId" IS NULL' : '',
+                      // in home (sub undefined), filter out global pinned items since we inject them later
+                      sub ? '"Item"."pinId" IS NULL' : 'NOT ("Item"."pinId" IS NOT NULL AND "Item"."subName" IS NULL)',
                       '"Item"."deletedAt" IS NULL',
                       '"Item"."parentId" IS NULL',
                       '"Item".outlawed = false',
@@ -565,8 +565,8 @@ export default {
                       ${whereClause(
                         subClause(sub, 3, 'Item', me, showNsfw),
                         muteClause(me),
-                        // in "home" (sub undefined), we want to show pinned items (but without the pin icon)
-                        sub ? '"Item"."pinId" IS NULL' : '',
+                        // in home (sub undefined), filter out global pinned items since we inject them later
+                        sub ? '"Item"."pinId" IS NULL' : 'NOT ("Item"."pinId" IS NOT NULL AND "Item"."subName" IS NULL)',
                         '"Item"."deletedAt" IS NULL',
                         '"Item"."parentId" IS NULL',
                         '"Item".bio = false',

api/typeDefs/item.js

@@ -107,6 +107,7 @@ export default gql`
     id: ID!
     createdAt: Date!
     updatedAt: Date!
+    invoicePaidAt: Date
     deletedAt: Date
     deleteScheduledAt: Date
     reminderScheduledAt: Date

components/item-info.js

@@ -135,8 +135,8 @@ export default function ItemInfo ({
             {embellishUser}
           </Link>}
         <span> </span>
-        <Link href={`/items/${item.id}`} title={item.createdAt} className='text-reset' suppressHydrationWarning>
-          {timeSince(new Date(item.createdAt))}
+        <Link href={`/items/${item.id}`} title={item.invoicePaidAt || item.createdAt} className='text-reset' suppressHydrationWarning>
+          {timeSince(new Date(item.invoicePaidAt || item.createdAt))}
         </Link>
         {item.prior &&
           <>
@@ -250,6 +250,11 @@ function InfoDropdownItem ({ item }) {
           <div>{item.id}</div>
           <div>created at</div>
           <div>{item.createdAt}</div>
+          {item.invoicePaidAt &&
+            <>
+              <div>paid at</div>
+              <div>{item.invoicePaidAt}</div>
+            </>}
           <div>cost</div>
           <div>{item.cost}</div>
           <div>stacked</div>

fragments/comments.js

@@ -18,6 +18,7 @@ export const COMMENT_FIELDS = gql`
     position
     parentId
     createdAt
+    invoicePaidAt
     deletedAt
     text
     user {

fragments/items.js

@@ -18,6 +18,7 @@ export const ITEM_FIELDS = gql`
     id
     parentId
     createdAt
+    invoicePaidAt
     deletedAt
     title
     url

lib/webPush.js

@@ -4,6 +4,7 @@ import { COMMENT_DEPTH_LIMIT, FOUND_BLURBS, LOST_BLURBS } from './constants'
 import { msatsToSats, numWithUnits } from './format'
 import models from '@/api/models'
 import { isMuted } from '@/lib/user'
+import { Prisma } from '@prisma/client'
 
 const webPushEnabled = process.env.NODE_ENV === 'production' ||
   (process.env.VAPID_MAILTO && process.env.NEXT_PUBLIC_VAPID_PUBKEY && process.env.VAPID_PRIVKEY)
@@ -123,21 +124,36 @@ export async function replyToSubscription (subscriptionId, notification) {
 export const notifyUserSubscribers = async ({ models, item }) => {
   try {
     const isPost = !!item.title
-    const userSubsExcludingMutes = await models.$queryRawUnsafe(`
-    SELECT "UserSubscription"."followerId", "UserSubscription"."followeeId", users.name as "followeeName"
-    FROM "UserSubscription"
-    INNER JOIN users ON users.id = "UserSubscription"."followeeId"
-    WHERE "followeeId" = $1 AND ${isPost ? '"postsSubscribedAt"' : '"commentsSubscribedAt"'} IS NOT NULL
-    AND NOT EXISTS (SELECT 1 FROM "Mute" WHERE "Mute"."muterId" = "UserSubscription"."followerId" AND "Mute"."mutedId" = $1)
-    -- ignore subscription if user was already notified of item as a reply
-    AND NOT EXISTS (
-      SELECT 1 FROM "Reply"
-      INNER JOIN users follower ON follower.id = "UserSubscription"."followerId"
-      WHERE "Reply"."itemId" = $2
-      AND "Reply"."ancestorUserId" = follower.id
-      AND follower."noteAllDescendants"
-    )
-    `, Number(item.userId), Number(item.id))
+
+    const userSubsExcludingMutes = await models.$queryRaw`
+      SELECT "UserSubscription"."followerId", "UserSubscription"."followeeId", users.name as "followeeName"
+      FROM "UserSubscription"
+      INNER JOIN users ON users.id = "UserSubscription"."followeeId"
+      WHERE "followeeId" = ${Number(item.userId)}::INTEGER
+        AND ${isPost ? Prisma.sql`"postsSubscribedAt"` : Prisma.sql`"commentsSubscribedAt"`} IS NOT NULL
+        -- ignore muted users
+        AND NOT EXISTS (
+          SELECT 1
+          FROM "Mute"
+          WHERE "Mute"."muterId" = "UserSubscription"."followerId"
+          AND "Mute"."mutedId" = ${Number(item.userId)}::INTEGER)
+        -- ignore subscription if user was already notified of item as a reply
+        AND NOT EXISTS (
+          SELECT 1 FROM "Reply"
+          INNER JOIN users follower ON follower.id = "UserSubscription"."followerId"
+          WHERE "Reply"."itemId" = ${Number(item.id)}::INTEGER
+          AND "Reply"."ancestorUserId" = follower.id
+          AND follower."noteAllDescendants"
+        )
+        -- ignore subscription if user has posted to a territory the recipient is subscribed to
+        ${isPost
+          ? Prisma.sql`AND NOT EXISTS (
+            SELECT 1
+            FROM "SubSubscription"
+            WHERE "SubSubscription"."userId" = "UserSubscription"."followerId"
+            AND "SubSubscription"."subName" = ${item.subName}
+          )`
+          : Prisma.empty}`
     const subType = isPost ? 'POST' : 'COMMENT'
     const tag = `FOLLOW-${item.userId}-${subType}`
     await Promise.allSettled(userSubsExcludingMutes.map(({ followerId, followeeName }) => sendUserNotification(followerId, {

prisma/migrations/20250122114228_recent_sort_by_invoice_paid_at/migration.sql

@@ -0,0 +1,3 @@
+-- CreateIndex
+CREATE INDEX "Item_invoicePaidAt_idx" ON "Item"("invoicePaidAt");
+CREATE INDEX "Item_paid_created_idx" ON "Item" (COALESCE("invoicePaidAt", created_at) DESC);

prisma/schema.prisma

@@ -598,6 +598,7 @@ model Item {
   @@index([cost])
   @@index([url])
   @@index([boost])
+  @@index([invoicePaidAt])
 }
 
 // we use this to denormalize a user's aggregated interactions (zaps) with an item