Merge branch 'master' into schedule_posts

Author: m0wer

.env.development

@@ -184,6 +184,7 @@ grpc_proxy=http://tor:7050/
 
 # lnbits
 LNBITS_WEB_PORT=5001
+LNBITS_WEB_PORT_V1=5002
 
 # CPU shares for each category
 CPU_SHARES_IMPORTANT=1024

.github/pull_request_template.md

@@ -10,8 +10,9 @@ _Was anything unclear during your work on this PR? Anything we should definitely
 
 ## Checklist
 
-**Are your changes backwards compatible? Please answer below:**
+**Are your changes backward compatible? Please answer below:**
 
+_For example, a change is not backward compatible if you removed a GraphQL field or dropped a database column._
 
 **On a scale of 1-10 how well and how have you QA'd this change and any features it might affect? Please answer below:**
 

api/paidAction/README.md

@@ -103,7 +103,7 @@ stateDiagram-v2
 | donations         | x           |            | x           | x        | x          |             |              | x           |            |
 | update posts      | x           |            | x           |          | x          |             | x            | x           |            |
 | update comments   | x           |            | x           |          | x          |             | x            | x           |            |
-| receive           |             | x          |             |          | x          | x           | x            |             | x          |
+| receive           |             |            |             |          | x          | x           | x            |             | x          |
 | buy fee credits   |             |            | x           |          | x          |             |              | x           |            |
 | invite gift       | x           |            |             |          |            |             | x            | x           |            |
 

api/paidAction/receive.js

@@ -16,7 +16,9 @@ export async function getCost ({ msats }) {
 
 export async function getInvoiceablePeer (_, { me, models, cost, paymentMethod }) {
   if (paymentMethod === PAID_ACTION_PAYMENT_METHODS.P2P && !me?.proxyReceive) return null
-  if (paymentMethod === PAID_ACTION_PAYMENT_METHODS.DIRECT && !me?.directReceive) return null
+
+  // don't fallback to direct if proxy is enabled to always hide stacker's node pubkey
+  if (paymentMethod === PAID_ACTION_PAYMENT_METHODS.DIRECT && me?.proxyReceive) return null
 
   const wallets = await getInvoiceableWallets(me.id, { models })
   if (wallets.length === 0) {
@@ -54,24 +56,6 @@ export async function describe ({ description }, { me, cost, paymentMethod, sybi
   return description ?? `SN: ${me?.name ?? ''} receives ${numWithUnits(msatsToSats(cost - fee))}`
 }
 
-export async function onPaid ({ invoice }, { tx }) {
-  if (!invoice) {
-    throw new Error('invoice is required')
-  }
-
-  // P2P lnurlp does not need to update the user's balance
-  if (invoice?.invoiceForward) return
-
-  await tx.user.update({
-    where: { id: invoice.userId },
-    data: {
-      mcredits: {
-        increment: invoice.msatsReceived
-      }
-    }
-  })
-}
-
 export async function nonCriticalSideEffects ({ invoice }, { models }) {
   await notifyDeposit(invoice.userId, invoice)
   await models.$executeRaw`

api/paidAction/territoryUnarchive.js

@@ -78,9 +78,16 @@ export async function perform ({ name, invoiceId, ...data }, { me, cost, tx }) {
     }
   })
 
-  await tx.userSubTrust.createMany({
-    data: initialTrust({ name: updatedSub.name, userId: updatedSub.userId })
-  })
+  const trust = initialTrust({ name: updatedSub.name, userId: updatedSub.userId })
+  for (const t of trust) {
+    await tx.userSubTrust.upsert({
+      where: {
+        userId_subName: { userId: t.userId, subName: t.subName }
+      },
+      update: t,
+      create: t
+    })
+  }
 
   return updatedSub
 }

api/resolvers/search.js

@@ -512,8 +512,8 @@ export default {
         item.searchTitle = e.highlight?.title?.[0] || e.highlight?.['title.exact']?.[0] || item.title
 
         // prefer the exact highlight for text
-        const searchTextHighlight = [...(e.highlight?.['text.exact'] || []), ...(e.highlight?.text || [])]
-        item.searchText = searchTextHighlight?.slice(0, 5)?.join(' ... ')
+        const searchTextHighlight = e.highlight?.['text.exact'] || e.highlight?.text || []
+        item.searchText = searchTextHighlight?.join(' ... ')
 
         return item
       })

api/resolvers/sub.js

@@ -127,7 +127,7 @@ export default {
         subs
       }
     },
-    userSubs: async (_parent, { name, cursor, when, by, from, to, limit = LIMIT }, { models }) => {
+    userSubs: async (_parent, { name, cursor, when, by, from, to, limit = LIMIT }, { models, me }) => {
       if (!name) {
         throw new GqlInputError('must supply user name')
       }
@@ -150,26 +150,56 @@ export default {
       }
 
       const subs = await models.$queryRawUnsafe(`
-          SELECT "Sub".*,
-            "Sub".created_at as "createdAt",
-            COALESCE(floor(sum(msats_revenue)/1000), 0) as revenue,
-            COALESCE(floor(sum(msats_stacked)/1000), 0) as stacked,
-            COALESCE(floor(sum(msats_spent)/1000), 0) as spent,
-            COALESCE(sum(posts), 0) as nposts,
-            COALESCE(sum(comments), 0) as ncomments
-          FROM ${viewGroup(range, 'sub_stats')}
-          JOIN "Sub" on "Sub".name = u.sub_name
-          WHERE "Sub"."userId" = $3
-            AND "Sub".status = 'ACTIVE'
-          GROUP BY "Sub".name
-          ORDER BY ${column} DESC NULLS LAST, "Sub".created_at ASC
-          OFFSET $4
-          LIMIT $5`, ...range, user.id, decodedCursor.offset, limit)
+        SELECT "Sub".*,
+          "Sub".created_at as "createdAt",
+          COALESCE(floor(sum(msats_revenue)/1000), 0) as revenue,
+          COALESCE(floor(sum(msats_stacked)/1000), 0) as stacked,
+          COALESCE(floor(sum(msats_spent)/1000), 0) as spent,
+          COALESCE(sum(posts), 0) as nposts,
+          COALESCE(sum(comments), 0) as ncomments,
+          ss."userId" IS NOT NULL as "meSubscription",
+          ms."userId" IS NOT NULL as "meMuteSub"
+        FROM ${viewGroup(range, 'sub_stats')}
+        JOIN "Sub" on "Sub".name = u.sub_name
+        LEFT JOIN "SubSubscription" ss ON ss."subName" = "Sub".name AND ss."userId" IS NOT DISTINCT FROM $4
+        LEFT JOIN "MuteSub" ms ON ms."subName" = "Sub".name AND ms."userId" IS NOT DISTINCT FROM $4
+        WHERE "Sub"."userId" = $3
+          AND "Sub".status = 'ACTIVE'
+        GROUP BY "Sub".name, ss."userId", ms."userId"
+        ORDER BY ${column} DESC NULLS LAST, "Sub".created_at ASC
+        OFFSET $5
+        LIMIT $6
+      `, ...range, user.id, me?.id, decodedCursor.offset, limit)
 
       return {
         cursor: subs.length === limit ? nextCursorEncoded(decodedCursor, limit) : null,
         subs
       }
+    },
+    mySubscribedSubs: async (parent, { cursor }, { models, me }) => {
+      if (!me) {
+        throw new GqlAuthenticationError()
+      }
+
+      const decodedCursor = decodeCursor(cursor)
+      const subs = await models.$queryRaw`
+        SELECT "Sub".*,
+          "MuteSub"."userId" IS NOT NULL as "meMuteSub",
+          TRUE as "meSubscription"
+        FROM "SubSubscription"
+        JOIN "Sub" ON "SubSubscription"."subName" = "Sub".name
+        LEFT JOIN "MuteSub" ON "MuteSub"."subName" = "Sub".name AND "MuteSub"."userId" = ${me.id}
+        WHERE "SubSubscription"."userId" = ${me.id}
+          AND "Sub".status <> 'STOPPED'
+        ORDER BY "Sub".name ASC
+        OFFSET ${decodedCursor.offset}
+        LIMIT ${LIMIT}
+      `
+
+      return {
+        cursor: subs.length === LIMIT ? nextCursorEncoded(decodedCursor, LIMIT) : null,
+        subs
+      }
     }
   },
   Mutation: {

api/resolvers/wallet.js

@@ -5,16 +5,15 @@ import {
 import crypto, { timingSafeEqual } from 'crypto'
 import { decodeCursor, LIMIT, nextCursorEncoded } from '@/lib/cursor'
 import { SELECT, itemQueryWithMeta } from './item'
-import { formatMsats, msatsToSats, msatsToSatsDecimal, satsToMsats } from '@/lib/format'
+import { formatMsats, msatsToSats, msatsToSatsDecimal } from '@/lib/format'
 import {
   USER_ID, INVOICE_RETENTION_DAYS,
-  PAID_ACTION_PAYMENT_METHODS,
   WALLET_CREATE_INVOICE_TIMEOUT_MS,
   WALLET_RETRY_AFTER_MS,
   WALLET_RETRY_BEFORE_MS,
   WALLET_MAX_RETRIES
 } from '@/lib/constants'
-import { amountSchema, validateSchema, withdrawlSchema, lnAddrSchema } from '@/lib/validate'
+import { validateSchema, withdrawlSchema, lnAddrSchema } from '@/lib/validate'
 import assertGofacYourself from './ofac'
 import assertApiKeyNotPermitted from './apiKey'
 import { bolt11Tags } from '@/lib/bolt11'
@@ -475,20 +474,6 @@ const resolvers = {
     __resolveType: invoiceOrDirect => invoiceOrDirect.__resolveType
   },
   Mutation: {
-    createInvoice: async (parent, { amount }, { me, models, lnd, headers }) => {
-      await validateSchema(amountSchema, { amount })
-      await assertGofacYourself({ models, headers })
-
-      const { invoice, paymentMethod } = await performPaidAction('RECEIVE', {
-        msats: satsToMsats(amount)
-      }, { models, lnd, me })
-
-      return {
-        ...invoice,
-        __resolveType:
-          paymentMethod === PAID_ACTION_PAYMENT_METHODS.DIRECT ? 'Direct' : 'Invoice'
-      }
-    },
     createWithdrawl: createWithdrawal,
     sendToLnAddr,
     cancelInvoice: async (parent, { hash, hmac, userCancel }, { me, models, lnd, boss }) => {

api/typeDefs/sub.js

@@ -7,6 +7,7 @@ export default gql`
     subs: [Sub!]!
     topSubs(cursor: String, when: String, from: String, to: String, by: String, limit: Limit): Subs
     userSubs(name: String!, cursor: String, when: String, from: String, to: String, by: String, limit: Limit): Subs
+    mySubscribedSubs(cursor: String): Subs
     subSuggestions(q: String!, limit: Limit): [Sub!]!
   }
 

api/typeDefs/user.js

@@ -125,7 +125,6 @@ export default gql`
     wildWestMode: Boolean!
     withdrawMaxFeeDefault: Int!
     proxyReceive: Boolean
-    directReceive: Boolean
     receiveCreditsBelowSats: Int!
     sendCreditsBelowSats: Int!
   }
@@ -209,7 +208,7 @@ export default gql`
     vaultKeyHash: String
     walletsUpdatedAt: Date
     proxyReceive: Boolean
-    directReceive: Boolean
+    directReceive: Boolean @deprecated
     receiveCreditsBelowSats: Int!
     sendCreditsBelowSats: Int!
   }