diff --git a/src/components/PostEditor/Mentions.tsx b/src/components/PostEditor/Mentions.tsx index b1ffe207..f33ef5e5 100644 --- a/src/components/PostEditor/Mentions.tsx +++ b/src/components/PostEditor/Mentions.tsx @@ -8,6 +8,7 @@ import { HTMLAttributes, useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { SimpleUserAvatar } from '../UserAvatar' import { SimpleUsername } from '../Username' +import { useMuteList } from '@/providers/MuteListProvider' export default function Mentions({ content, @@ -22,6 +23,7 @@ export default function Mentions({ }) { const { t } = useTranslation() const { pubkey } = useNostr() + const { mutePubkeys } = useMuteList() const [potentialMentions, setPotentialMentions] = useState([]) const [parentEventPubkey, setParentEventPubkey] = useState() const [removedPubkeys, setRemovedPubkeys] = useState([]) @@ -36,7 +38,15 @@ export default function Mentions({ } setPotentialMentions(potentialMentions) setRemovedPubkeys((pubkeys) => { - return pubkeys.filter((p) => potentialMentions.includes(p)) + return Array.from( + new Set( + pubkeys + .filter((p) => potentialMentions.includes(p)) + .concat( + potentialMentions.filter((p) => mutePubkeys.includes(p) && p !== _parentEventPubkey) + ) + ) + ) }) }) }, [content, parentEvent, pubkey])