Merge branch 'master' into custom_domain

Soxasora · web-flow · commit fa3b9a2534a1 · 2025-03-09T14:16:33.000+01:00
diff --git a/.github/workflows/extend-awards.yml b/.github/workflows/extend-awards.yml
@@ -1,28 +1,35 @@
 name: extend-awards
-run-name: Extending awards
 on:
-  pull_request:
+  pull_request_target:
     types: [ closed ]
     branches:
       - master
+permissions:
+  pull-requests: write
+  contents: write
+  issues: read
 jobs:
-  unfiltered:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo '${{ toJson(github) }}'
   if_merged:
-    if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
+    if: |
+      github.event_name == 'pull_request_target' &&
+      github.event.action == 'closed' &&
+      github.event.pull_request.merged == true &&
+      github.event.pull_request.head.ref != 'extend-awards/patch'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: '3.13' 
       - run: pip install requests
-      - run: python extend-awards.py '${{ toJson(github) }}'
+      - run: python extend-awards.py
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_CONTEXT: ${{ toJson(github) }}
       - uses: peter-evans/create-pull-request@v7
         with:
-          commit-message: extending awards
-          title: Extending awards
+          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.
diff --git a/.gitignore b/.gitignore
@@ -64,4 +64,5 @@ docker/lnbits/data
 !docker/lndk/tls-*.pem
 
 # nostr link extract
-scripts/nostr-link-extract.config.json
+scripts/nostr-link-extract.config.json
+scripts/nostr-links.db
diff --git a/api/paidAction/receive.js b/api/paidAction/receive.js
@@ -7,8 +7,7 @@ export const anonable = false
 
 export const paymentMethods = [
   PAID_ACTION_PAYMENT_METHODS.P2P,
-  PAID_ACTION_PAYMENT_METHODS.DIRECT,
-  PAID_ACTION_PAYMENT_METHODS.OPTIMISTIC
+  PAID_ACTION_PAYMENT_METHODS.DIRECT
 ]
 
 export async function getCost ({ msats }) {
diff --git a/api/resolvers/admin.js b/api/resolvers/admin.js
@@ -1,3 +1,5 @@
+import { SN_ADMIN_IDS } from '@/lib/constants'
+
 export default {
   Query: {
     snl: async (parent, _, { models }) => {
@@ -7,7 +9,7 @@ export default {
   },
   Mutation: {
     onAirToggle: async (parent, _, { models, me }) => {
-      if (me.id !== 616) {
+      if (!me || !SN_ADMIN_IDS.includes(me.id)) {
         throw new Error('not an admin')
       }
       const { id, live } = await models.snl.findFirst()
diff --git a/awards.csv b/awards.csv
@@ -175,6 +175,17 @@ SatsAllDay,issue,#1820,#1819,easy,,,1,9k,weareallsatoshi@getalby.com,2025-01-27
 Soxasora,pr,#1814,#1736,easy,,,,100k,soxasora@blink.sv,2025-01-27
 jason-me,pr,#1857,,easy,,,,100k,rrbtc@vlt.ge,2025-02-08
 ed-kung,pr,#1901,#323,good-first-issue,,,,20k,simplestacker@getalby.com,2025-02-14
-Scroogey-SN,pr,#1911,#1905,good-first-issue,,,1,18k,???,???
-Scroogey-SN,pr,#1928,#1924,good-first-issue,,,,20k,???,???
+Scroogey-SN,pr,#1911,#1905,good-first-issue,,,1,18k,Scroogey@coinos.io,???
+Scroogey-SN,pr,#1928,#1924,good-first-issue,,,,20k,Scroogey@coinos.io,???
 dtonon,issue,#1928,#1924,good-first-issue,,,,2k,???,???
+ed-kung,pr,#1926,#1914,medium-hard,,,,500k,simplestacker@getalby.com,???
+ed-kung,issue,#1926,#1914,medium-hard,,,,50k,simplestacker@getalby.com,???
+ed-kung,pr,#1926,#1927,easy,,,,100k,simplestacker@getalby.com,???
+ed-kung,issue,#1926,#1927,easy,,,,10k,simplestacker@getalby.com,???
+ed-kung,issue,#1913,#1890,good-first-issue,,,,2k,simplestacker@getalby.com,???
+Scroogey-SN,pr,#1930,#1167,good-first-issue,,,,20k,Scroogey@coinos.io,???
+itsrealfake,issue,#1930,#1167,good-first-issue,,,,2k,smallimagination100035@getalby.com,???
+Scroogey-SN,pr,#1948,#1849,medium,urgent,,,750k,Scroogey@coinos.io,???
+felipebueno,issue,#1947,#1945,good-first-issue,,,,2k,felipebueno@blink.sv,???
+ed-kung,pr,#1952,#1951,easy,,,,100k,simplestacker@getalby.com,???
+ed-kung,issue,#1952,#1951,easy,,,,10k,simplestacker@getalby.com,???
diff --git a/components/link-to-context.module.css b/components/link-to-context.module.css
@@ -31,6 +31,7 @@
 .linkBoxParent input,
 .linkBoxParent iframe,
 .linkBoxParent video,
+.linkBoxParent pre,
 .linkBoxParent img {
     pointer-events: auto !important;
-}
+}
diff --git a/components/notifications.js b/components/notifications.js
@@ -733,7 +733,10 @@ export function NotificationAlert () {
     error
       ? (
         <Alert variant='danger' dismissible onClose={() => setError(null)}>
-          <span>{error.toString()}</span>
+          <span>{navigator?.brave && error.name === 'AbortError'
+            ? 'Push registration failed. Enable "Use Google services for push messaging" in Brave\'s privacy settings and try again.'
+            : error.toString()}
+          </span>
         </Alert>
         )
       : showAlert
diff --git a/components/text.js b/components/text.js
@@ -49,10 +49,13 @@ export function SearchText ({ text }) {
 
 // this is one of the slowest components to render
 export default memo(function Text ({ rel = UNKNOWN_LINK_REL, imgproxyUrls, children, tab, itemId, outlawed, topLevel }) {
+  // would the text overflow on the current screen size?
   const [overflowing, setOverflowing] = useState(false)
-  const router = useRouter()
+  // should we show the full text?
   const [show, setShow] = useState(false)
   const containerRef = useRef(null)
+
+  const router = useRouter()
   const [mathJaxPlugin, setMathJaxPlugin] = useState(null)
 
   // we only need mathjax if there's math content between $$ tags
@@ -69,9 +72,9 @@ export default memo(function Text ({ rel = UNKNOWN_LINK_REL, imgproxyUrls, child
 
   // if we are navigating to a hash, show the full text
   useEffect(() => {
-    setShow(router.asPath.includes('#') && !router.asPath.includes('#itemfn-'))
+    setShow(router.asPath.includes('#'))
     const handleRouteChange = (url, { shallow }) => {
-      setShow(url.includes('#') && !url.includes('#itemfn-'))
+      setShow(url.includes('#'))
     }
 
     router.events.on('hashChangeStart', handleRouteChange)
diff --git a/components/text.module.css b/components/text.module.css
@@ -195,15 +195,16 @@
 .p:has(> .mediaContainer) .mediaContainer img,
 .p:has(> .mediaContainer) .mediaContainer video
 {
-    block-size: revert-layer;
+    min-width: 30%;
     max-width: stretch;
 }
 
-.p.onlyImages {
-    display: block;
+.p:has(> .mediaContainer) .mediaContainer img
+{
+    block-size: revert-layer;
 }
 
-.p.onlyImages:has(> .mediaContainer.loaded) {
+.p.onlyImages {
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
diff --git a/docs/dev/extend-awards.md b/docs/dev/extend-awards.md
@@ -0,0 +1,54 @@
+# Automatically extend awards.csv
+
+## Overview
+
+Whenever a pull request (PR) is merged in the [stacker.news](https://github.com/stackernews/stacker.news) repository, a [GitHub Action](https://docs.github.com/en/actions) is triggered:
+
+If the merged PR solves an issue with [award tags](https://github.com/stackernews/stacker.news?tab=readme-ov-file#contributing),
+the amounts due to the PR and issue authors are calculated and corresponding lines are added to the [awards.csv](https://github.com/stackernews/stacker.news/blob/master/awards.csv) file,
+and a PR is opened for this change.
+
+## Action
+
+The action is defined in [.github/workflows/extend-awards.yml](.github/workflows/extend-awards.yml).
+
+Filters on the event type and parameters ensure the action is [triggered only on merged PRs](https://stackoverflow.com/questions/60710209/trigger-github-actions-only-when-pr-is-merged).
+
+The primary job consists of several steps:
+  - [checkout](https://github.com/actions/checkout) checks out the repository
+  - [setup-python](https://github.com/actions/setup-python) installs [Python](https://en.wikipedia.org/wiki/Python_(programming_language))
+  - [pip](https://en.wikipedia.org/wiki/Pip_%28package_manager%29) installs the [requests](https://docs.python-requests.org/en/latest/index.html) module
+  - a script (see below) is executed, which appends lines to [awards.csv](awards.csv) if needed
+  - [create-pull-request](https://github.com/peter-evans/create-pull-request) looks for modified files and creates (or updates) a PR
+
+## Script
+
+The script is [extend-awards.py](extend-awards.py).
+
+The script extracts from the [environment](https://en.wikipedia.org/wiki/Environment_variable) an authentication token needed for the [GitHub REST API](https://docs.github.com/en/rest/about-the-rest-api/about-the-rest-api) and the [context](https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/accessing-contextual-information-about-workflow-runs) containing the event details including the merged PR (formatted in [JSON](https://en.wikipedia.org/wiki/JSON)).
+
+In the merged PR's title and body it searches for the first [GitHub issue URL](https://github.com/stackernews/stacker.news/issues/) or any number with a hash symbol (#) prefix, and takes this as the issue being solved by the PR.
+
+Using the GitHub REST API it fetches the issue and analyzes its tags for difficulty and priority.
+
+It fetches the issue's timeline and counts the number of reviews completed with status 'changes requested' to calculate the amount reduction.
+
+It calculates the amounts due to the PR author and the issue author.
+
+It reads the existing awards.csv file to suppress appending redundant lines (same user, PR, and issue) and fill known receive methods (same user).
+
+Finally, it appends zero, one, or two lines to the awards.csv file.
+
+## Diagnostics
+
+In the GitHub web interface under 'Actions' each invokation of the action can be viewed, including environment and [output and errors](https://en.wikipedia.org/wiki/Standard_streams) of the script. First, the specific invokation is selected, then the job 'if_merged', then the step 'Run python extend-awards.py'. The environment is found by expanding the inner 'Run python extended-awards.py' on the first line.
+
+The normal output includes details about the issue number found, the amount calculation, or the reason for not appending lines.
+
+The error output may include a [Python traceback](https://realpython.com/python-traceback/) which helps to explain the error.
+
+The environment contains in GITHUB_CONTEXT the event details, which may be required to understand the error.
+
+## Security considerations
+
+The create-pull-request step requires [workflow permissions](https://github.com/peter-evans/create-pull-request#workflow-permissions).
diff --git a/docs/dev/semantic-search.md b/docs/dev/semantic-search.md
@@ -1,4 +1,4 @@
-Getting semantic search setup in OpenSearch is a multistep process.
+Getting semantic search setup in OpenSearch is currently a multistep, manual process. To configure semantic search, enter the following commands into OpenSearch's REST API. You can do this in Dev Tools in the OpenSearch Dashboard (after starting your SN dev environment, point your browser to localhost:5601). You can also use CURL to send these commands to localhost:9200.
 
 ### step 1: configure the ml plugin
 ```json
@@ -67,7 +67,7 @@ PUT /_ingest/pipeline/nlp-ingest-pipeline
     },
     {
       "text_embedding": {
-        "model_id": "6whlBY0B2sj1ObjeeD5d",
+        "model_id": "<model id>",
         "field_map": {
           "text": "text_embedding",
           "title": "title_embedding"
@@ -306,3 +306,13 @@ GET /item-nlp/_search
 }
 ```
 
+### step 12: configure the development environment to use the nlp pipeline
+
+Add the following lines to `.env.local`:
+
+```
+OPENSEARCH_INDEX=item-nlp
+OPENSEARCH_MODEL_ID=<model id>
+```
+
+Note that you won't have to re-do the above steps each time you restart your dev instance. The OpenSearch configuration is saved to a local volume.
diff --git a/extend-awards.py b/extend-awards.py
@@ -1,4 +1,4 @@
-import json, os, re, requests, sys
+import json, os, re, requests
 
 difficulties = {'good-first-issue':20000,'easy':100000,'medium':250000,'medium-hard':500000,'hard':1000000}
 priorities = {'low':0.5,'medium':1.5,'high':2,'urgent':3}
@@ -56,11 +56,8 @@ def countReviews(pr):
 			count += 1
 	return count
 
-def checkPR(pr):
-	i = getIssue(pr)
-	if not 'pull_request' in i or not 'merged_at' in i['pull_request']:
-		print('pr %s is not a merged pull request' % pr)
-		return
+def checkPR(i):
+	pr = str(i['number'])
 	print('pr %s' % pr)
 	n = findIssueInPR(i)
 	if not n:
@@ -103,14 +100,5 @@ def checkPR(pr):
 		s = s.split('\n')[0]
 		awards.append(s.split(','))
 
-j = json.loads(sys.argv[1])
-url = j['event']['pull_request']['_links']['commits']['href']
-r = sess.get(url, headers=headers)
-j = json.loads(r.text)
-for c in j:
-	m = re.search('\\(#([0-9]+)\\)$', c['commit']['message'].split('\n')[0])
-	if m:
-		checkPR(m.group(1))
-		exit(0)
-print('no PR found in commit')
-
+j = json.loads(os.getenv('GITHUB_CONTEXT'))
+checkPR(j['event']['pull_request'])
diff --git a/lib/constants.js b/lib/constants.js
@@ -92,9 +92,7 @@ export const RESERVED_MAX_USER_ID = 615
 export const GLOBAL_SEED = USER_ID.k00b
 export const FREEBIE_BASE_COST_THRESHOLD = 10
 
-// WIP ultimately subject to this list: https://ofac.treasury.gov/sanctions-programs-and-country-information
-// From lawyers: north korea, cuba, iran, ukraine, syria
-export const SANCTIONED_COUNTRY_CODES = ['KP', 'CU', 'IR', 'UA', 'SY']
+export const SANCTIONED_COUNTRY_CODES = process.env.SANCTIONED_COUNTRY_CODES?.split(',') || []
 
 export const TERRITORY_COST_MONTHLY = 50000
 export const TERRITORY_COST_YEARLY = 500000
diff --git a/next.config.js b/next.config.js
@@ -220,6 +220,7 @@ module.exports = withPlausibleProxy()({
             'process.env.NEXT_PUBLIC_NORMAL_POLL_INTERVAL': JSON.stringify(process.env.NEXT_PUBLIC_NORMAL_POLL_INTERVAL),
             'process.env.NEXT_PUBLIC_LONG_POLL_INTERVAL': JSON.stringify(process.env.NEXT_PUBLIC_LONG_POLL_INTERVAL),
             'process.env.NEXT_PUBLIC_EXTRA_LONG_POLL_INTERVAL': JSON.stringify(process.env.NEXT_PUBLIC_EXTRA_LONG_POLL_INTERVAL),
+            'process.env.SANCTIONED_COUNTRY_CODES': JSON.stringify(process.env.SANCTIONED_COUNTRY_CODES),
             'process.env.NEXT_IS_EXPORT_WORKER': 'true'
           })
         ]
diff --git a/pages/api/auth/[...nextauth].js b/pages/api/auth/[...nextauth].js
@@ -125,15 +125,12 @@ function getCallbacks (req, res) {
         token.sub = Number(token.id)
       }
 
-      // this only runs during a signup/login because response is only defined during signup/login
-      // and will add the multi_auth cookies for the user we just logged in as
-      if (req && res) {
-        req = new NodeNextRequest(req)
-        res = new NodeNextResponse(res)
+      // add multi_auth cookie for user that just logged in
+      if (user && req && res) {
         const secret = process.env.NEXTAUTH_SECRET
         const jwt = await encodeJWT({ token, secret })
         const me = await prisma.user.findUnique({ where: { id: token.id } })
-        setMultiAuthCookies(req, res, { ...me, jwt })
+        setMultiAuthCookies(new NodeNextRequest(req), new NodeNextResponse(res), { ...me, jwt })
       }
 
       return token
diff --git a/pages/api/lnurlp/[username]/pay.js b/pages/api/lnurlp/[username]/pay.js
@@ -96,6 +96,6 @@ export default async ({ query: { username, amount, nostr, comment, payerdata: pa
     })
   } catch (error) {
     console.log(error)
-    res.status(400).json({ status: 'ERROR', reason: 'could not generate invoice' })
+    res.status(400).json({ status: 'ERROR', reason: 'could not generate invoice to customer\'s attached wallet' })
   }
 }
diff --git a/scripts/nostr-link-extract.js b/scripts/nostr-link-extract.js
diff --git a/sw/index.js b/sw/index.js
diff --git a/wallets/payment.js b/wallets/payment.js
diff --git a/worker/trust.js b/worker/trust.js

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,7 @@ export const anonable = false`
`7`	`7`
`8`	`8`	`export const paymentMethods = [`
`9`	`9`	`PAID_ACTION_PAYMENT_METHODS.P2P,`
`10`		`- PAID_ACTION_PAYMENT_METHODS.DIRECT,`
`11`		`- PAID_ACTION_PAYMENT_METHODS.OPTIMISTIC`
	`10`	`+ PAID_ACTION_PAYMENT_METHODS.DIRECT`
`12`	`11`	`]`
`13`	`12`
`14`	`13`	`export async function getCost ({ msats }) {`
Original file line number	Diff line number	Diff line change
`@@ -195,15 +195,16 @@`
`195`	`195`	`.p:has(> .mediaContainer) .mediaContainer img,`
`196`	`196`	`.p:has(> .mediaContainer) .mediaContainer video`
`197`	`197`	`{`
`198`		`- block-size: revert-layer;`
	`198`	`+ min-width: 30%;`
`199`	`199`	`max-width: stretch;`
`200`	`200`	`}`
`201`	`201`
`202`		`-.p.onlyImages {`
`203`		`- display: block;`
	`202`	`+.p:has(> .mediaContainer) .mediaContainer img`
	`203`	`+{`
	`204`	`+ block-size: revert-layer;`
`204`	`205`	`}`
`205`	`206`
`206`		`-.p.onlyImages:has(> .mediaContainer.loaded) {`
	`207`	`+.p.onlyImages {`
`207`	`208`	`display: flex;`
`208`	`209`	`flex-direction: row;`
`209`	`210`	`flex-wrap: wrap;`