Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Never update author of item on edit #1401

Merged
merged 3 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions api/resolvers/item.js
Original file line number Diff line number Diff line change
Expand Up @@ -1315,16 +1315,19 @@ 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`, userId: meId }
item = { id: Number(item.id), text: item.text, title: `@${user.name}'s bio` }
} else if (old.parentId) {
// prevent editing a comment like a post
item = { id: Number(item.id), text: item.text, userId: meId }
item = { id: Number(item.id), text: item.text }
} else {
item = { subName, userId: meId, ...item }
item = { subName, ...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 = []
Expand Down
8 changes: 5 additions & 3 deletions components/item-info.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ export default function ItemInfo ({
}, [item])

useEffect(() => {
const invoice = window.localStorage.getItem(`item:${item.id}:hash:hmac`)
setCanEdit((item.mine || invoice) && (Date.now() < editThreshold))
}, [item.id, item.mine, editThreshold])
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])

// territory founders can pin any post in their territory
// and OPs can pin any root reply in their post
Expand Down
14 changes: 9 additions & 5 deletions components/use-item-submit.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ 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
Expand All @@ -19,6 +21,7 @@ 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 }) => {
Expand All @@ -27,10 +30,11 @@ export default function useItemSubmit (mutation,
options = options.slice(item?.poll?.options?.length || 0).filter(o => o.trim().length > 0)
}

if (item?.id) {
const invoiceData = window.localStorage.getItem(`item:${item.id}:hash:hmac`)
if (invoiceData) {
const [hash, hmac] = invoiceData.split(':')
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(':')
values.hash = hash
values.hmac = hmac
}
Expand Down Expand Up @@ -89,7 +93,7 @@ export default function useItemSubmit (mutation,
await router.push(sub ? `/~${sub.name}/recent` : '/recent')
}
}
}, [upsertItem, router, crossposter, item, sub, onSuccessfulSubmit,
}, [me, upsertItem, router, crossposter, item, sub, onSuccessfulSubmit,
navigateOnSubmit, extraValues, paidMutationOptions]
)
}
Expand Down
Loading