capture/index.js

@@ -94,7 +94,6 @@ app.get('/*', async (req, res) => {
     if (commentId) {
       console.timeLog(timeLabel, 'scrolling to comment')
       await page.waitForSelector('.outline-it')
-      await new Promise((resolve, _reject) => setTimeout(resolve, 100))
     }
 
     const file = await page.screenshot({ type: 'png', captureBeyondViewport: false })

components/action-tooltip.js

@@ -8,7 +8,7 @@ export default function ActionTooltip ({ children, notForm, disable, overlayText
   if (!notForm) {
     formik = useFormikContext()
   }
-  if (disable || !overlayText) {
+  if (disable) {
     return children
   }
   return (
@@ -16,7 +16,7 @@ export default function ActionTooltip ({ children, notForm, disable, overlayText
       placement={placement || 'bottom'}
       overlay={
         <Tooltip>
-          {overlayText}
+          {overlayText || '1 sat'}
         </Tooltip>
       }
       trigger={['hover', 'focus']}

components/fee-button.js

@@ -118,12 +118,12 @@ export default function FeeButton ({ ChildButton = SubmitButton, variant, text,
     ? 'free'
     : total > 1
       ? numWithUnits(total, { abbreviate: false, format: true })
-      : undefined
+      : total === 1 ? undefined : 'free'
   disabled ||= ctxDisabled
 
   return (
     <div className={styles.feeButton}>
-      <ActionTooltip overlayText={!free && total === 1 ? '1 sat' : feeText}>
+      <ActionTooltip overlayText={feeText}>
         <ChildButton variant={variant} disabled={disabled} nonDisabledText={feeText}>{text}</ChildButton>
       </ActionTooltip>
       {!me && <AnonInfo />}

components/hidden-wallet-summary.js

@@ -1,4 +1,4 @@
-import { useState, useMemo } from 'react'
+import { useState, useRef, useEffect } from 'react'
 import { abbrNum, numWithUnits } from '@/lib/format'
 import { useMe } from './me'
 
@@ -6,19 +6,19 @@ export default function HiddenWalletSummary ({ abbreviate, fixedWidth }) {
   const me = useMe()
   const [hover, setHover] = useState(false)
 
-  const fixedWidthAbbrSats = useMemo(() => {
+  // prevent layout shifts when hovering by fixing width to initial rendered width
-    const abbr = abbrNum(me.privates?.sats).toString()
+  const ref = useRef()
-    if (abbr.length >= 6) return abbr
+  const [width, setWidth] = useState(undefined)
-
+  useEffect(() => {
-    // add leading spaces if abbr is shorter than 6 characters
+    setWidth(ref.current?.offsetWidth)
-    return ' '.repeat(6 - abbr.length) + abbr
+  }, [])
-  }, [me.privates?.sats])
 
   return (
     <span
-      className='text-monospace' style={{ whiteSpace: 'pre-wrap' }} align='right' onPointerEnter={() => setHover(true)} onPointerLeave={() => setHover(false)}
+      ref={ref} style={{ width: fixedWidth ? width : undefined }}
+      className='text-monospace' align='right' onPointerEnter={() => setHover(true)} onPointerLeave={() => setHover(false)}
     >
-      {hover ? (abbreviate ? fixedWidthAbbrSats : numWithUnits(me.privates?.sats, { abbreviate: false, format: true })) : '******'}
+      {hover ? (abbreviate ? abbrNum(me.privates?.sats) : numWithUnits(me.privates?.sats, { abbreviate: false, format: true })) : '******'}
     </span>
   )
 }

components/item-info.js

@@ -140,7 +140,7 @@ export default function ItemInfo ({
             className='text-reset pointer'
             onClick={() => onEdit ? onEdit() : router.push(`/items/${item.id}/edit`)}
           >
-            <span>{editText || 'edit'} </span>
+            {editText || 'edit'}
             <Countdown
               date={editThreshold}
               onComplete={() => {

components/poll.js

@@ -52,7 +52,7 @@ export default function Poll ({ item }) {
     const variables = { id: v.id }
 
     return (
-      <ActionTooltip placement='left' notForm overlayText='1 sat'>
+      <ActionTooltip placement='left' notForm>
         <Button
           variant='outline-info' className={styles.pollButton}
           onClick={me

components/text.js

@@ -178,12 +178,7 @@ export default memo(function Text ({ rel, imgproxyUrls, children, tab, itemId, o
             // If [text](url) was parsed as <a> and text is not empty and not a link itself,
             // we don't render it as an image since it was probably a conscious choice to include text.
             const text = children[0]
-            let url
+            const url = !href.startsWith('/') && new URL(href)
-            try {
-              url = !href.startsWith('/') && new URL(href)
-            } catch {
-              // ignore invalid URLs
-            }
             const internalURL = process.env.NEXT_PUBLIC_URL
             if (!!text && !/^https?:\/\//.test(text)) {
               if (props['data-footnote-ref'] || typeof props['data-footnote-backref'] !== 'undefined') {
@@ -196,7 +191,7 @@ export default memo(function Text ({ rel, imgproxyUrls, children, tab, itemId, o
                   </Link>
                 )
               }
-              if (href.startsWith('/') || url?.origin === internalURL) {
+              if (href.startsWith('/') || url.origin === internalURL) {
                 return (
                   <Link
                     id={props.id}

docker-compose.yml

@@ -1,38 +1,20 @@
-x-env_file: &env_file
-  - .env.development
-  - path: .env.local
-    required: false
-x-healthcheck: &healthcheck
-  interval: 10s
-  timeout: 10s
-  retries: 10
-  start_period: 1m
-x-depends-on-db: &depends_on_db
-  db:
-    condition: service_healthy
-    restart: true
-x-depends-on-app: &depends_on_app
-  app:
-    condition: service_healthy
-    restart: true
-x-depends-on-bitcoin: &depends_on_bitcoin
-  bitcoin:
-    condition: service_healthy
-    restart: true
-
 services:
   db:
     container_name: db
     build: ./docker/db
     restart: unless-stopped
     healthcheck:
-      <<: *healthcheck
       test: ["CMD-SHELL", "PGPASSWORD=${POSTGRES_PASSWORD} pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB} -h 127.0.0.1 && psql -U ${POSTGRES_USER} ${POSTGRES_DB} -c 'SELECT 1 FROM users LIMIT 1'"]
+      interval: 10s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
     expose:
       - "5432"
     ports:
       - "5431:5432"
-    env_file: *env_file
+    env_file:
+      - .env.development
     volumes:
       - ./docker/db/seed.sql:/docker-entrypoint-initdb.d/seed.sql
       - db:/var/lib/postgresql/data
@@ -47,10 +29,17 @@ services:
         - GID=${CURRENT_GID}
     restart: unless-stopped
     healthcheck:
-      <<: *healthcheck
       test: ["CMD", "curl", "-f", "http://localhost:3000"]
-    depends_on: *depends_on_db
+      interval: 10s
-    env_file: *env_file
+      timeout: 10s
+      retries: 10
+      start_period: 1m
+    depends_on:
+      db:
+        condition: service_healthy
+        restart: true
+    env_file:
+      - .env.development
     expose:
       - "3000"
     ports:
@@ -64,13 +53,19 @@ services:
     build:
       context: ./capture
     restart: unless-stopped
-    depends_on: *depends_on_app
+    depends_on:
+      app:
+        condition: service_healthy
+        restart: true
     profiles:
       - capture
     healthcheck:
-      <<: *healthcheck
       test: ["CMD", "curl", "-f", "http://localhost:5678/health"]
-    env_file: *env_file
+      interval: 10s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
+    env_file: .env.development
     environment:
       # configure to screenshot production, because local dev is too slow
       - CAPTURE_URL=http://stacker.news
@@ -89,10 +84,14 @@ services:
         - GID=${CURRENT_GID}
     restart: unless-stopped
     depends_on:
-      <<:
+      db:
-         - *depends_on_db
+        condition: service_healthy
-         - *depends_on_app
+        restart: true
-    env_file: *env_file
+      app:
+        condition: service_healthy
+        restart: true
+    env_file:
+      - .env.development
     volumes:
       - ./:/app
     entrypoint: ["/bin/sh", "-c"]
@@ -104,10 +103,14 @@ services:
     profiles:
       - images
     healthcheck:
-      <<: *healthcheck
       test: [ "CMD", "imgproxy", "health" ]
+      interval: 10s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
     restart: unless-stopped
-    env_file: *env_file
+    env_file:
+      - .env.development
     ports:
       - "3001:8080"
     expose:
@@ -126,7 +129,8 @@ services:
     restart: unless-stopped
     profiles:
       - images
-    env_file: *env_file
+    env_file:
+      - .env.development
     environment:
       - DEBUG=1
     ports:
@@ -145,10 +149,14 @@ services:
     profiles:
       - search
     healthcheck:
-      <<: *healthcheck
       test: ["CMD-SHELL", "curl -ku admin:${OPENSEARCH_INITIAL_ADMIN_PASSWORD} --silent --fail localhost:9200/_cluster/health || exit 1"]
+      interval: 10s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
     restart: unless-stopped
-    env_file: *env_file
+    env_file:
+      - .env.development
     environment:
       - OPENSEARCH_INITIAL_ADMIN_PASSWORD=mVchg1T5oA9wudUh
     ports:
@@ -186,7 +194,8 @@ services:
       opensearch:
         condition: service_healthy
         restart: true
-    env_file: *env_file
+    env_file:
+      - .env.development
     environment:
       - opensearch.ssl.verificationMode=none
       - OPENSEARCH_HOSTS=http://opensearch:9200
@@ -204,8 +213,11 @@ services:
     profiles:
       - payments
     healthcheck:
-      <<: *healthcheck
       test: ["CMD-SHELL", "bitcoin-cli -chain=regtest -rpcport=${RPC_PORT} -rpcuser=${RPC_USER} -rpcpassword=${RPC_PASS} getblockchaininfo"]
+      interval: 10s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
     command:
       - 'bitcoind'
       - '-server=1'
@@ -263,10 +275,17 @@ services:
     profiles:
       - payments
     healthcheck:
-      <<: *healthcheck
       test: ["CMD-SHELL", "lncli", "getinfo"]
-    depends_on: *depends_on_bitcoin
+      interval: 10s
-    env_file: *env_file
+      timeout: 10s
+      retries: 10
+      start_period: 1m
+    depends_on:
+      bitcoin:
+        condition: service_healthy
+        restart: true
+    env_file:
+      - .env.development
     command:
       - 'lnd'
       - '--noseedbackup'
@@ -320,10 +339,17 @@ services:
     profiles:
       - payments
     healthcheck:
-      <<: *healthcheck
       test: ["CMD-SHELL", "lncli", "getinfo"]
-    depends_on: *depends_on_bitcoin
+      interval: 10s
-    env_file: *env_file
+      timeout: 10s
+      retries: 10
+      start_period: 1m
+    depends_on:
+      bitcoin:
+        condition: service_healthy
+        restart: true
+    env_file:
+      - .env.development
     command:
       - 'lnd'
       - '--noseedbackup'
@@ -375,10 +401,17 @@ services:
     profiles:
       - payments
     healthcheck:
-      <<: *healthcheck
       test: ["CMD-SHELL", "su clightning -c 'lightning-cli --network=regtest getinfo'"]
-    depends_on: *depends_on_bitcoin
+      interval: 10s
-    env_file: *env_file
+      timeout: 10s
+      retries: 10
+      start_period: 1m
+    depends_on:
+      bitcoin:
+        condition: service_healthy
+        restart: true
+    env_file:
+      - .env.development
     command:
       - 'lightningd'
       - '--network=regtest'
@@ -429,8 +462,11 @@ services:
       - email
     restart: unless-stopped
     healthcheck:
-      <<: *healthcheck
       test: ["CMD", "wget", "-q", "--spider", "http://localhost:8025"]
+      interval: 10s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
     ports:
       - "8025:8025"
       - "1025:1025"

lib/webPush.js

@@ -236,7 +236,7 @@ export const notifyZapped = async ({ models, id }) => {
     // send push notifications to forwarded recipients
     if (mappedForwards.length) {
       await Promise.allSettled(mappedForwards.map(forward => sendUserNotification(forward.user.id, {
-        title: `you were forwarded ${numWithUnits(Math.round(msatsToSats(updatedItem.msats) * forward.pct / 100))}`,
+        title: `you were forwarded ${numWithUnits(msatsToSats(updatedItem.msats) * forward.pct / 100)}`,
         body: updatedItem.title ?? updatedItem.text,
         item: updatedItem,
         tag: `FORWARDEDTIP-${updatedItem.id}`

sndev

@@ -13,7 +13,7 @@ docker__compose() {
     COMPOSE_PROFILES="images,search,payments,email,capture"
   fi
 
-  CURRENT_UID=$(id -u) CURRENT_GID=$(id -g) COMPOSE_PROFILES=$COMPOSE_PROFILES command docker compose --env-file .env.development --env-file .env.local "$@"
+  CURRENT_UID=$(id -u) CURRENT_GID=$(id -g) COMPOSE_PROFILES=$COMPOSE_PROFILES command docker compose --env-file .env.development "$@"
 }
 
 docker__exec() {