feat: mention all users in the thread by default

This commit is contained in:
codytseng
2025-02-27 22:01:17 +08:00
parent d4fa40900b
commit 979d5e9ecc

View File

@@ -24,8 +24,8 @@ export default function Mentions({
const { pubkey } = useNostr() const { pubkey } = useNostr()
const [pubkeys, setPubkeys] = useState<string[]>([]) const [pubkeys, setPubkeys] = useState<string[]>([])
const [relatedPubkeys, setRelatedPubkeys] = useState<string[]>([]) const [relatedPubkeys, setRelatedPubkeys] = useState<string[]>([])
const [potentialMentions, setPotentialMentions] = useState<string[]>([])
const [parentEventPubkey, setParentEventPubkey] = useState<string | undefined>() const [parentEventPubkey, setParentEventPubkey] = useState<string | undefined>()
const [addedPubkeys, setAddedPubkeys] = useState<string[]>([])
const [removedPubkeys, setRemovedPubkeys] = useState<string[]>([]) const [removedPubkeys, setRemovedPubkeys] = useState<string[]>([])
useEffect(() => { useEffect(() => {
@@ -34,9 +34,10 @@ export default function Mentions({
setRelatedPubkeys(relatedPubkeys.filter((p) => p !== pubkey)) setRelatedPubkeys(relatedPubkeys.filter((p) => p !== pubkey))
setParentEventPubkey(parentEventPubkey !== pubkey ? parentEventPubkey : undefined) setParentEventPubkey(parentEventPubkey !== pubkey ? parentEventPubkey : undefined)
const potentialMentions = [...pubkeys, ...relatedPubkeys] const potentialMentions = [...pubkeys, ...relatedPubkeys]
setAddedPubkeys((pubkeys) => { if (parentEventPubkey) {
return pubkeys.filter((p) => potentialMentions.includes(p)) potentialMentions.push(parentEventPubkey)
}) }
setPotentialMentions(potentialMentions)
setRemovedPubkeys((pubkeys) => { setRemovedPubkeys((pubkeys) => {
return pubkeys.filter((p) => potentialMentions.includes(p)) return pubkeys.filter((p) => potentialMentions.includes(p))
}) })
@@ -44,23 +45,9 @@ export default function Mentions({
}, [content, parentEvent, pubkey]) }, [content, parentEvent, pubkey])
useEffect(() => { useEffect(() => {
const newMentions = [...pubkeys] const newMentions = potentialMentions.filter((pubkey) => !removedPubkeys.includes(pubkey))
addedPubkeys.forEach((pubkey) => {
if (!newMentions.includes(pubkey) && pubkey !== parentEventPubkey) {
newMentions.push(pubkey)
}
})
removedPubkeys.forEach((pubkey) => {
const index = newMentions.indexOf(pubkey)
if (index !== -1) {
newMentions.splice(index, 1)
}
})
if (parentEventPubkey) {
newMentions.push(parentEventPubkey)
}
setMentions(newMentions) setMentions(newMentions)
}, [pubkeys, relatedPubkeys, parentEventPubkey, addedPubkeys, removedPubkeys]) }, [potentialMentions, removedPubkeys])
return ( return (
<Popover> <Popover>
@@ -71,34 +58,30 @@ export default function Mentions({
disabled={pubkeys.length === 0 && relatedPubkeys.length === 0 && !parentEventPubkey} disabled={pubkeys.length === 0 && relatedPubkeys.length === 0 && !parentEventPubkey}
onClick={(e) => e.stopPropagation()} onClick={(e) => e.stopPropagation()}
> >
{t('Mentions')} {mentions.length > 0 && `(${mentions.length})`} {t('Mentions')}{' '}
{potentialMentions.length > 0 && `(${mentions.length}/${potentialMentions.length})`}
</Button> </Button>
</PopoverTrigger> </PopoverTrigger>
<PopoverContent className="w-52 p-0 py-1"> <PopoverContent className="w-52 p-0 py-1">
<div className="space-y-1"> <div className="space-y-1">
{parentEventPubkey && ( {potentialMentions.map((_, index) => {
<PopoverCheckboxItem checked disabled> const pubkey = potentialMentions[potentialMentions.length - 1 - index]
<SimpleUserAvatar userId={parentEventPubkey} size="small" /> const isParentPubkey = pubkey === parentEventPubkey
<SimpleUsername return (
userId={parentEventPubkey}
className="font-semibold text-sm truncate"
skeletonClassName="h-3"
/>
</PopoverCheckboxItem>
)}
{pubkeys.concat(relatedPubkeys).map((pubkey, index) => (
<PopoverCheckboxItem <PopoverCheckboxItem
key={`${pubkey}-${index}`} key={`${pubkey}-${index}`}
checked={mentions.includes(pubkey)} checked={isParentPubkey ? true : mentions.includes(pubkey)}
onCheckedChange={(checked) => { onCheckedChange={(checked) => {
if (isParentPubkey) {
return
}
if (checked) { if (checked) {
setAddedPubkeys((pubkeys) => [...pubkeys, pubkey])
setRemovedPubkeys((pubkeys) => pubkeys.filter((p) => p !== pubkey)) setRemovedPubkeys((pubkeys) => pubkeys.filter((p) => p !== pubkey))
} else { } else {
setRemovedPubkeys((pubkeys) => [...pubkeys, pubkey]) setRemovedPubkeys((pubkeys) => [...pubkeys, pubkey])
setAddedPubkeys((pubkeys) => pubkeys.filter((p) => p !== pubkey))
} }
}} }}
disabled={isParentPubkey}
> >
<SimpleUserAvatar userId={pubkey} size="small" /> <SimpleUserAvatar userId={pubkey} size="small" />
<SimpleUsername <SimpleUsername
@@ -107,7 +90,8 @@ export default function Mentions({
skeletonClassName="h-3" skeletonClassName="h-3"
/> />
</PopoverCheckboxItem> </PopoverCheckboxItem>
))} )
})}
</div> </div>
</PopoverContent> </PopoverContent>
</Popover> </Popover>