Merge branch 'master' into custom_domain

Author: Soxasora

.env.development

@@ -85,6 +85,7 @@ IMGPROXY_READ_TIMEOUT=10
 IMGPROXY_WRITE_TIMEOUT=10
 IMGPROXY_DOWNLOAD_TIMEOUT=9
 IMGPROXY_ENABLE_VIDEO_THUMBNAILS=1
+IMGPROXY_ALLOW_ORIGIN=http://localhost:3000
 # IMGPROXY_DEVELOPMENT_ERRORS_MODE=1
 # IMGPROXY_ENABLE_DEBUG_HEADERS=true
 

.github/workflows/extend-awards.yml

@@ -22,14 +22,36 @@ jobs:
         with:
           python-version: '3.13' 
       - run: pip install requests
+      - name: Check if branch exists
+        id: check_branch
+        run: |
+          git fetch origin extend-awards/patch || echo "Branch does not exist"
+          if git show-ref --verify --quiet refs/remotes/origin/extend-awards/patch; then
+            echo "exists=true" >> $GITHUB_ENV
+          else
+            echo "exists=false" >> $GITHUB_ENV
+          fi
+      - name: Checkout to existing branch
+        if: env.exists == 'true'
+        run: |
+          git checkout extend-awards/patch
+          git config user.name 'github-actions[bot]'
+          git config user.email 'github-actions[bot]@users.noreply.github.com'
       - run: python extend-awards.py
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_CONTEXT: ${{ toJson(github) }}
+      - name: Commit changes and push to existing branch
+        if: env.exists == 'true'
+        run: |
+          git commit -am "Extending awards.csv"
+          git push origin extend-awards/patch
       - uses: peter-evans/create-pull-request@v7
+        if: env.exists == 'false'
         with:
           add-paths: awards.csv
           branch: extend-awards/patch
           commit-message: Extending awards.csv
           title: Extending awards.csv
-          body: A PR was merged that solves an issue and awards.csv should be extended.
+          body: One or more PR's were merged that solve an issue(s) and awards.csv should be extended. Remembere to delete the branch after merging.
+          delete-branch: true

api/resolvers/item.js

@@ -26,6 +26,7 @@ import performPaidAction from '../paidAction'
 import { GqlAuthenticationError, GqlInputError } from '@/lib/error'
 import { verifyHmac } from './wallet'
 import { parse } from 'tldts'
+import { shuffleArray } from '@/lib/rand'
 
 function commentsOrderByClause (me, models, sort) {
   const sharedSortsArray = []
@@ -696,7 +697,11 @@ export default {
         status: 'ACTIVE',
         deletedAt: null,
         outlawed: false,
-        parentId: null
+        parentId: null,
+        OR: [
+          { invoiceActionState: 'PAID' },
+          { invoiceActionState: { is: null } }
+        ]
       }
       if (id) {
         where.id = { not: Number(id) }
@@ -833,8 +838,16 @@ export default {
       const data = { itemId: Number(id), userId: me.id }
       const old = await models.threadSubscription.findUnique({ where: { userId_itemId: data } })
       if (old) {
-        await models.threadSubscription.delete({ where: { userId_itemId: data } })
-      } else await models.threadSubscription.create({ data })
+        await models.$executeRaw`
+          DELETE FROM "ThreadSubscription" ts
+          USING "Item" i
+          WHERE ts."userId" = ${me.id}
+          AND i.path <@ (SELECT path FROM "Item" WHERE id = ${Number(id)})
+          AND ts."itemId" = i.id
+        `
+      } else {
+        await models.threadSubscription.create({ data })
+      }
       return { id }
     },
     deleteItem: async (parent, { id }, { me, models }) => {
@@ -1150,7 +1163,8 @@ export default {
         poll.meVoted = false
       }
 
-      poll.options = options
+      poll.randPollOptions = item?.randPollOptions
+      poll.options = poll.randPollOptions ? shuffleArray(options) : options
       poll.count = options.reduce((t, o) => t + o.count, 0)
 
       return poll

api/resolvers/notifications.js

@@ -316,13 +316,36 @@ export default {
 
       if (meFull.noteCowboyHat) {
         queries.push(
-          `(SELECT id::text, updated_at AS "sortTime", 0 as "earnedSats", 'Streak' AS type
+          `(SELECT id::text, updated_at AS "sortTime", 0 as "earnedSats", 'CowboyHat' AS type
           FROM "Streak"
           WHERE "userId" = $1
           AND updated_at < $2
+          AND type = 'COWBOY_HAT'
           ORDER BY "sortTime" DESC
           LIMIT ${LIMIT})`
         )
+        for (const type of ['HORSE', 'GUN']) {
+          const gqlType = type.charAt(0) + type.slice(1).toLowerCase()
+          queries.push(
+            `(SELECT id::text, "startedAt" AS "sortTime", 0 as "earnedSats", 'New${gqlType}' AS type
+            FROM "Streak"
+            WHERE "userId" = $1
+            AND updated_at < $2
+            AND type = '${type}'::"StreakType"
+            ORDER BY "sortTime" DESC
+            LIMIT ${LIMIT})`
+          )
+          queries.push(
+            `(SELECT id::text AS id, "endedAt" AS "sortTime", 0 as "earnedSats", 'Lost${gqlType}' AS type
+            FROM "Streak"
+            WHERE "userId" = $1
+            AND updated_at < $2
+            AND "endedAt" IS NOT NULL
+            AND type = '${type}'::"StreakType"
+            ORDER BY "sortTime" DESC
+            LIMIT ${LIMIT})`
+          )
+        }
       }
 
       queries.push(
@@ -500,23 +523,14 @@ export default {
       }
     }
   },
-  Streak: {
+  CowboyHat: {
     days: async (n, args, { models }) => {
       const res = await models.$queryRaw`
-        SELECT "endedAt" - "startedAt" AS days
+        SELECT "endedAt"::date - "startedAt"::date AS days
         FROM "Streak"
         WHERE id = ${Number(n.id)} AND "endedAt" IS NOT NULL
       `
-
       return res.length ? res[0].days : null
-    },
-    type: async (n, args, { models }) => {
-      const res = await models.$queryRaw`
-        SELECT "type"
-        FROM "Streak"
-        WHERE id = ${Number(n.id)}
-      `
-      return res.length ? res[0].type : null
     }
   },
   Earn: {

api/resolvers/search.js

@@ -1,6 +1,7 @@
 import { decodeCursor, LIMIT, nextCursorEncoded } from '@/lib/cursor'
 import { whenToFrom } from '@/lib/time'
 import { getItem, itemQueryWithMeta, SELECT } from './item'
+import { parse } from 'tldts'
 
 function queryParts (q) {
   const regex = /"([^"]*)"/gm
@@ -253,24 +254,17 @@ export default {
 
       // if search contains a url term, modify the query text
       if (url) {
-        const uri = url.slice(4)
-        let uriObj
-        try {
-          uriObj = new URL(uri)
-        } catch {
-          try {
-            uriObj = new URL(`https://${uri}`)
-          } catch {}
-        }
-
-        if (uriObj) {
-          termQueries.push({
-            wildcard: { url: `*${uriObj?.hostname ?? uri}${uriObj?.pathname ?? ''}*` }
-          })
-          termQueries.push({
-            match: { text: `${uriObj?.hostname ?? uri}${uriObj?.pathname ?? ''}` }
-          })
+        let uri = url.slice(4)
+        termQueries.push({
+          match_bool_prefix: { url: { query: uri, operator: 'and', boost: 1000 } }
+        })
+        const parsed = parse(uri)
+        if (parsed?.subdomain?.length > 0) {
+          uri = uri.replace(`${parsed.subdomain}.`, '')
         }
+        termQueries.push({
+          wildcard: { url: { value: `*${uri}*` } }
+        })
       }
 
       // if nym, items must contain nym

api/resolvers/user.js

@@ -11,6 +11,7 @@ import assertApiKeyNotPermitted from './apiKey'
 import { hashEmail } from '@/lib/crypto'
 import { isMuted } from '@/lib/user'
 import { GqlAuthenticationError, GqlAuthorizationError, GqlInputError } from '@/lib/error'
+import { processCrop } from '@/worker/imgproxy'
 
 const contributors = new Set()
 
@@ -727,6 +728,18 @@ export default {
 
       return true
     },
+    cropPhoto: async (parent, { photoId, cropData }, { me, models }) => {
+      if (!me) {
+        throw new GqlAuthenticationError()
+      }
+
+      const croppedUrl = await processCrop({ photoId: Number(photoId), cropData })
+      if (!croppedUrl) {
+        throw new GqlInputError('can\'t crop photo')
+      }
+
+      return croppedUrl
+    },
     setPhoto: async (parent, { photoId }, { me, models }) => {
       if (!me) {
         throw new GqlAuthenticationError()
@@ -898,6 +911,14 @@ export default {
 
       await models.user.update({ where: { id: me.id }, data: { hideWelcomeBanner: true } })
       return true
+    },
+    hideWalletRecvPrompt: async (parent, data, { me, models }) => {
+      if (!me) {
+        throw new GqlAuthenticationError()
+      }
+
+      await models.user.update({ where: { id: me.id }, data: { hideWalletRecvPrompt: true } })
+      return true
     }
   },
 
@@ -1082,27 +1103,25 @@ export default {
 
       return user.streak
     },
-    gunStreak: async (user, args, { models }) => {
+    hasSendWallet: async (user, args, { models }) => {
       if (user.hideCowboyHat) {
-        return null
+        return false
       }
-
-      return user.gunStreak
+      return user.hasSendWallet
     },
-    horseStreak: async (user, args, { models }) => {
+    hasRecvWallet: async (user, args, { models }) => {
       if (user.hideCowboyHat) {
-        return null
+        return false
       }
-
-      return user.horseStreak
+      return user.hasRecvWallet
     },
     maxStreak: async (user, args, { models }) => {
       if (user.hideCowboyHat) {
         return null
       }
 
       const [{ max }] = await models.$queryRaw`
-        SELECT MAX(COALESCE("endedAt", (now() AT TIME ZONE 'America/Chicago')::date) - "startedAt")
+        SELECT MAX(COALESCE("endedAt"::date, (now() AT TIME ZONE 'America/Chicago')::date) - "startedAt"::date)
         FROM "Streak" WHERE "userId" = ${user.id}`
       return max
     },

api/resolvers/vault.js

@@ -2,32 +2,10 @@ import { E_VAULT_KEY_EXISTS, GqlAuthenticationError, GqlInputError } from '@/lib
 
 export default {
   Query: {
-    getVaultEntry: async (parent, { key }, { me, models }, info) => {
+    getVaultEntries: async (parent, args, { me, models }) => {
       if (!me) throw new GqlAuthenticationError()
-      if (!key) throw new GqlInputError('must have key')
 
-      const k = await models.vault.findUnique({
-        where: {
-          key,
-          userId: me.id
-        }
-      })
-      return k
-    },
-    getVaultEntries: async (parent, { keysFilter }, { me, models }, info) => {
-      if (!me) throw new GqlAuthenticationError()
-
-      const entries = await models.vaultEntry.findMany({
-        where: {
-          userId: me.id,
-          key: keysFilter?.length
-            ? {
-                in: keysFilter
-              }
-            : undefined
-        }
-      })
-      return entries
+      return await models.vaultEntry.findMany({ where: { userId: me.id } })
     }
   },
   Mutation: {

api/resolvers/wallet.js

@@ -154,37 +154,6 @@ export function verifyHmac (hash, hmac) {
 const resolvers = {
   Query: {
     invoice: getInvoice,
-    wallet: async (parent, { id }, { me, models }) => {
-      if (!me) {
-        throw new GqlAuthenticationError()
-      }
-
-      return await models.wallet.findUnique({
-        where: {
-          userId: me.id,
-          id: Number(id)
-        },
-        include: {
-          vaultEntries: true
-        }
-      })
-    },
-    walletByType: async (parent, { type }, { me, models }) => {
-      if (!me) {
-        throw new GqlAuthenticationError()
-      }
-
-      const wallet = await models.wallet.findFirst({
-        where: {
-          userId: me.id,
-          type
-        },
-        include: {
-          vaultEntries: true
-        }
-      })
-      return wallet
-    },
     wallets: async (parent, args, { me, models }) => {
       if (!me) {
         throw new GqlAuthenticationError()

api/typeDefs/item.js

@@ -57,7 +57,7 @@ export default gql`
       text: String!, url: String!, boost: Int, status: String, logo: Int): ItemPaidAction!
     upsertPoll(
       id: ID, sub: String, title: String!, text: String, options: [String!]!, boost: Int, forward: [ItemForwardInput], pollExpiresAt: Date,
-      hash: String, hmac: String): ItemPaidAction!
+      randPollOptions: Boolean, hash: String, hmac: String): ItemPaidAction!
     updateNoteId(id: ID!, noteId: String!): Item!
     upsertComment(id: ID, text: String!, parentId: ID, boost: Int, hash: String, hmac: String): ItemPaidAction!
     act(id: ID!, sats: Int, act: String, hasSendWallet: Boolean): ItemActPaidAction!
@@ -81,6 +81,7 @@ export default gql`
     meInvoiceActionState: InvoiceActionState
     count: Int!
     options: [PollOption!]!
+    randPollOptions: Boolean
   }
 
   type Items {