components/item-act.js

@@ -10,7 +10,7 @@ import { useToast } from './toast'
 import { useLightning } from './lightning'
 import { nextTip } from './upvote'
 import { InvoiceCanceledError, usePayment } from './payment'
-// import { optimisticUpdate } from '@/lib/apollo'
+import { optimisticUpdate } from '@/lib/apollo'
 import { Types as ClientNotification, ClientNotifyProvider, useClientNotifications } from './client-notifications'
 import { ZAP_UNDO_DELAY_MS } from '@/lib/constants'
 
@@ -120,31 +120,23 @@ export default function ItemAct ({ onClose, item, down, children, abortSignal })
         act: down ? 'DONT_LIKE_THIS' : 'TIP',
         hash,
         hmac
-      },
+      }
-      optimisticResponse: {
-        act: { id: item.id, sats: Number(amount), act: down ? 'DONT_LIKE_THIS' : 'TIP', path: item.path }
-      },
-      update: actUpdate({ me })
     })
     if (!me) setItemMeAnonSats({ id: item.id, amount })
     addCustomTip(Number(amount))
-    strike()
-    onClose()
   }, [me, act, down, item.id, strike])
 
-  // XXX avoid manual optimistic updates until
+  const optimisticUpdate = useCallback(({ amount }) => {
-  //   https://github.com/stackernews/stacker.news/issues/1218 is fixed
+    const variables = {
-  // const optimisticUpdate = useCallback(({ amount }) => {
+      id: item.id,
-  //   const variables = {
+      sats: Number(amount),
-  //     id: item.id,
+      act: down ? 'DONT_LIKE_THIS' : 'TIP'
-  //     sats: Number(amount),
+    }
-  //     act: down ? 'DONT_LIKE_THIS' : 'TIP'
+    const optimisticResponse = { act: { ...variables, path: item.path } }
-  //   }
+    strike()
-  //   const optimisticResponse = { act: { ...variables, path: item.path } }
+    onClose()
-  //   strike()
+    return { mutation: ACT_MUTATION, variables, optimisticResponse, update: actUpdate({ me }) }
-  //   onClose()
+  }, [item.id, down, !!me, strike])
-  //   return { mutation: ACT_MUTATION, variables, optimisticResponse, update: actUpdate({ me }) }
-  // }, [item.id, down, !!me, strike])
 
   return (
     <ClientNotifyProvider additionalProps={{ itemId: item.id }}>
@@ -155,7 +147,7 @@ export default function ItemAct ({ onClose, item, down, children, abortSignal })
         }}
         schema={amountSchema}
         prepaid
-        // optimisticUpdate={optimisticUpdate}
+        optimisticUpdate={optimisticUpdate}
         onSubmit={onSubmit}
         clientNotification={ClientNotification.Zap}
         signal={abortSignal}
@@ -274,10 +266,8 @@ export function useZap () {
 
     let revert, cancel, nid
     try {
-      // XXX avoid manual optimistic updates until
+      revert = optimisticUpdate({ mutation: ZAP_MUTATION, variables, optimisticResponse, update })
-      //   https://github.com/stackernews/stacker.news/issues/1218 is fixed
+      strike()
-      // revert = optimisticUpdate({ mutation: ZAP_MUTATION, variables, optimisticResponse, update })
-      // strike()
 
       await abortSignal.pause({ me, amount: satsDelta })
 
@@ -287,11 +277,7 @@ export function useZap () {
 
       let hash, hmac;
       [{ hash, hmac }, cancel] = await payment.request(satsDelta)
-
+      await zap({ variables: { ...variables, hash, hmac } })
-      // XXX related to comment above
-      // await zap({ variables: { ...variables, hash, hmac } })
-      await zap({ variables: { ...variables, hash, hmac }, optimisticResponse, update })
-      strike()
     } catch (error) {
       revert?.()
 

components/pay-bounty.js

@@ -6,8 +6,9 @@ import { useMe } from './me'
 import { numWithUnits } from '@/lib/format'
 import { useShowModal } from './modal'
 import { useRoot } from './root'
-import { useAct, actUpdate } from './item-act'
+import { useAct, actUpdate, ACT_MUTATION } from './item-act'
 import { InvoiceCanceledError, usePayment } from './payment'
+import { optimisticUpdate } from '@/lib/apollo'
 import { useLightning } from './lightning'
 import { useToast } from './toast'
 import { Types as ClientNotification, useClientNotifications } from './client-notifications'
@@ -44,21 +45,30 @@ export default function PayBounty ({ children, item }) {
     const notifyProps = { itemId: item.id, sats }
     const optimisticResponse = { act: { ...variables, path: item.path } }
 
-    let cancel, nid
+    let revert, cancel, nid
     try {
+      revert = optimisticUpdate({
+        mutation: ACT_MUTATION,
+        variables,
+        optimisticResponse,
+        update: actUpdate({ me, onUpdate: onUpdate(onComplete) })
+      })
+
       if (me) {
         nid = notify(ClientNotification.Bounty.PENDING, notifyProps)
       }
 
       let hash, hmac;
       [{ hash, hmac }, cancel] = await payment.request(sats)
-
       await act({
         variables: { hash, hmac, ...variables },
-        optimisticResponse,
+        optimisticResponse: {
-        update: actUpdate({ me, onUpdate: onUpdate(onComplete) })
+          act: variables
+        }
       })
     } catch (error) {
+      revert?.()
+
       if (error instanceof InvoiceCanceledError) {
         return
       }

components/poll.js

@@ -8,6 +8,7 @@ import { signIn } from 'next-auth/react'
 import ActionTooltip from './action-tooltip'
 import { POLL_COST } from '@/lib/constants'
 import { InvoiceCanceledError, usePayment } from './payment'
+import { optimisticUpdate } from '@/lib/apollo'
 import { useToast } from './toast'
 import { Types as ClientNotification, useClientNotifications } from './client-notifications'
 
@@ -54,17 +55,20 @@ export default function Poll ({ item }) {
               const variables = { id: v.id }
               const notifyProps = { itemId: item.id }
               const optimisticResponse = { pollVote: v.id }
-              let cancel, nid
+              let revert, cancel, nid
               try {
+                revert = optimisticUpdate({ mutation: POLL_VOTE_MUTATION, variables, optimisticResponse, update })
+
                 if (me) {
                   nid = notify(ClientNotification.PollVote.PENDING, notifyProps)
                 }
 
                 let hash, hmac;
                 [{ hash, hmac }, cancel] = await payment.request(item.pollCost || POLL_COST)
-
+                await pollVote({ variables: { hash, hmac, ...variables } })
-                await pollVote({ variables: { hash, hmac, ...variables }, optimisticResponse, update })
               } catch (error) {
+                revert?.()
+
                 if (error instanceof InvoiceCanceledError) {
                   return
                 }

components/text.js

@@ -259,6 +259,7 @@ export default memo(function Text ({ rel, imgproxyUrls, children, tab, itemId, o
               paddingRight: '15px'
             }
 
+            try {
               const { provider, id, meta } = parseEmbedUrl(href)
               // Youtube video embed
               if (provider === 'youtube') {
@@ -289,6 +290,9 @@ export default memo(function Text ({ rel, imgproxyUrls, children, tab, itemId, o
                   </div>
                 )
               }
+            } catch {
+            // ignore invalid URLs
+            }
 
             // assume the link is an image which will fallback to link if it's not
             return <Img src={href} rel={rel ?? UNKNOWN_LINK_REL} {...props}>{children}</Img>

lib/url.js

@@ -1,24 +1,11 @@
 export function ensureProtocol (value) {
   if (!value) return value
   value = value.trim()
-  let url
+  if (!/^([a-z0-9]+:\/\/|mailto:)/.test(value)) {
-
+    value = 'http://' + value
-  try {
+  }
-    url = new URL(value)
-  } catch {
-    try {
-      url = new URL('http://' + value)
-    } catch {
   return value
 }
-  }
-
-  // remove trailing slash if new URL() added it
-  if (url.href.endsWith('/') && !value.endsWith('/')) {
-    return url.href.slice(0, -1)
-  }
-  return url.href
-}
 
 export function isExternal (url) {
   return !url.startsWith(process.env.NEXT_PUBLIC_URL + '/') && !url.startsWith('/')
@@ -76,7 +63,6 @@ export function parseInternalLinks (href) {
 }
 
 export function parseEmbedUrl (href) {
-  try {
   const { hostname, pathname, searchParams } = new URL(href)
 
   if (hostname.endsWith('youtube.com') && pathname.includes('/watch')) {
@@ -110,9 +96,6 @@ export function parseEmbedUrl (href) {
       }
     }
   }
-  } catch {
-    // ignore
-  }
 
   // Important to return empty object as default
   return {}

sndev

@@ -159,11 +159,6 @@ OPTIONS"
 
 sndev__logs() {
   shift
-  if [ $# -eq 1 ]; then
-    docker__compose logs -t --tail=1000 -f "$@"
-    exit 0
-  fi
-
   docker__compose logs "$@"
 }