api/resolvers/item.js

@@ -1315,19 +1315,16 @@ export const updateItem = async (parent, { sub: subName, forward, hash, hmac, ..
 
   if (old.bio) {
     // prevent editing a bio like a regular item
-    item = { id: Number(item.id), text: item.text, title: `@${user.name}'s bio` }
+    item = { id: Number(item.id), text: item.text, title: `@${user.name}'s bio`, userId: meId }
   } else if (old.parentId) {
     // prevent editing a comment like a post
-    item = { id: Number(item.id), text: item.text }
+    item = { id: Number(item.id), text: item.text, userId: meId }
   } else {
-    item = { subName, ...item }
+    item = { subName, userId: meId, ...item }
     item.forwardUsers = await getForwardUsers(models, forward)
   }
   item.uploadIds = uploadIdsFromText(item.text, { models })
 
-  // never change author of item
-  item.userId = old.userId
-
   const resultItem = await performPaidAction('ITEM_UPDATE', item, { models, me, lnd })
 
   resultItem.comments = []

api/resolvers/upload.js

@@ -29,12 +29,11 @@ export default {
         }
       }
 
-      // width and height is 0 for videos
       if (width * height > IMAGE_PIXELS_MAX) {
         throw new GqlInputError(`image must be less than ${IMAGE_PIXELS_MAX} pixels`)
       }
 
-      const fileParams = {
+      const imgParams = {
         type,
         size,
         width,
@@ -45,10 +44,10 @@ export default {
 
       if (avatar) {
         if (!me) throw new GqlAuthenticationError()
-        fileParams.paid = undefined
+        imgParams.paid = undefined
       }
 
-      const upload = await models.upload.create({ data: { ...fileParams } })
+      const upload = await models.upload.create({ data: { ...imgParams } })
       return createPresignedPost({ key: String(upload.id), type, size })
     }
   }

components/file-upload.js

@@ -39,8 +39,8 @@ export const FileUpload = forwardRef(({ children, className, onSelect, onUpload,
         try {
           ({ data } = await getSignedPOST({ variables }))
         } catch (e) {
+          toaster.danger('error initiating upload: ' + e.message || e.toString?.())
           onError?.({ ...variables, name: file.name, file })
-          reject(e)
           return
         }
 
@@ -58,8 +58,10 @@ export const FileUpload = forwardRef(({ children, className, onSelect, onUpload,
 
         if (!res.ok) {
           // TODO make sure this is actually a helpful error message and does not expose anything to the user we don't want
+          const err = res.statusText
+          toaster.danger('error uploading: ' + err)
           onError?.({ ...variables, name: file.name, file })
-          reject(new Error(res.statusText))
+          reject(err)
           return
         }
 
@@ -94,20 +96,16 @@ export const FileUpload = forwardRef(({ children, className, onSelect, onUpload,
         onChange={async (e) => {
           const fileList = e.target.files
           for (const file of Array.from(fileList)) {
-            try {
-              if (accept.indexOf(file.type) === -1) {
-                throw new Error(`file must be ${accept.map(t => t.replace(/^(image|video)\//, '')).join(', ')}`)
-              }
-              if (onSelect) await onSelect?.(file, s3Upload)
-              else await s3Upload(file)
-            } catch (e) {
-              toaster.danger(`upload of '${file.name}' failed: ` + e.message || e.toString?.())
+            if (accept.indexOf(file.type) === -1) {
+              toaster.danger(`image must be ${accept.map(t => t.replace('image/', '').replace('video/', '')).join(', ')}`)
               continue
             }
+            if (onSelect) await onSelect?.(file, s3Upload)
+            else await s3Upload(file)
+            // reset file input
+            // see https://bobbyhadz.com/blog/react-reset-file-input#reset-a-file-input-in-react
+            e.target.value = null
           }
-          // reset file input
-          // see https://bobbyhadz.com/blog/react-reset-file-input#reset-a-file-input-in-react
-          e.target.value = null
         }}
       />
       <div

components/item-info.js

@@ -49,11 +49,9 @@ export default function ItemInfo ({
   }, [item])
 
   useEffect(() => {
-    const authorEdit = item.mine
-    const invParams = window.localStorage.getItem(`item:${item.id}:hash:hmac`)
-    const hmacEdit = !!invParams && !me && Number(item.user.id) === USER_ID.anon
-    setCanEdit((authorEdit || hmacEdit) && (Date.now() < editThreshold))
-  }, [me, item.id, item.mine, editThreshold])
+    const invoice = window.localStorage.getItem(`item:${item.id}:hash:hmac`)
+    setCanEdit((item.mine || invoice) && (Date.now() < editThreshold))
+  }, [item.id, item.mine, editThreshold])
 
   // territory founders can pin any post in their territory
   // and OPs can pin any root reply in their post

components/use-item-submit.js

@@ -6,8 +6,6 @@ import { useCallback } from 'react'
 import { normalizeForwards, toastUpsertSuccessMessages } from '@/lib/form'
 import { RETRY_PAID_ACTION } from '@/fragments/paidAction'
 import gql from 'graphql-tag'
-import { USER_ID } from '@/lib/constants'
-import { useMe } from './me'
 
 // this is intented to be compatible with upsert item mutations
 // so that it can be reused for all post types and comments and we don't have
@@ -21,7 +19,6 @@ export default function useItemSubmit (mutation,
   const toaster = useToast()
   const crossposter = useCrossposter()
   const [upsertItem] = usePaidMutation(mutation)
-  const { me } = useMe()
 
   return useCallback(
     async ({ boost, crosspost, title, options, bounty, maxBid, start, stop, ...values }, { resetForm }) => {
@@ -30,11 +27,10 @@ export default function useItemSubmit (mutation,
         options = options.slice(item?.poll?.options?.length || 0).filter(o => o.trim().length > 0)
       }
 
-      const hmacEdit = item?.id && Number(item.user.id) === USER_ID.anon && !me
-      if (hmacEdit) {
-        const invParams = window.localStorage.getItem(`item:${item.id}:hash:hmac`)
-        if (invParams) {
-          const [hash, hmac] = invParams.split(':')
+      if (item?.id) {
+        const invoiceData = window.localStorage.getItem(`item:${item.id}:hash:hmac`)
+        if (invoiceData) {
+          const [hash, hmac] = invoiceData.split(':')
           values.hash = hash
           values.hmac = hmac
         }
@@ -93,7 +89,7 @@ export default function useItemSubmit (mutation,
           await router.push(sub ? `/~${sub.name}/recent` : '/recent')
         }
       }
-    }, [me, upsertItem, router, crossposter, item, sub, onSuccessfulSubmit,
+    }, [upsertItem, router, crossposter, item, sub, onSuccessfulSubmit,
       navigateOnSubmit, extraValues, paidMutationOptions]
   )
 }