fix(popup): enable kind 1 quote and reposts in popup comments
This commit is contained in:
parent
5e521f67bc
commit
6dc1556b4c
@ -1,8 +1,19 @@
|
|||||||
import { NDKKind } from '@nostr-dev-kit/ndk'
|
import {
|
||||||
|
NDKEvent,
|
||||||
|
NDKFilter,
|
||||||
|
NDKKind,
|
||||||
|
NDKSubscriptionCacheUsage
|
||||||
|
} from '@nostr-dev-kit/ndk'
|
||||||
import { formatDate } from 'date-fns'
|
import { formatDate } from 'date-fns'
|
||||||
import { useDidMount, useNDKContext } from 'hooks'
|
import { useAppSelector, useDidMount, useNDKContext } from 'hooks'
|
||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import { useParams, useLocation, Link } from 'react-router-dom'
|
import {
|
||||||
|
useParams,
|
||||||
|
useLocation,
|
||||||
|
Link,
|
||||||
|
useSubmit,
|
||||||
|
useNavigation
|
||||||
|
} from 'react-router-dom'
|
||||||
import {
|
import {
|
||||||
getModPageRoute,
|
getModPageRoute,
|
||||||
getBlogPageRoute,
|
getBlogPageRoute,
|
||||||
@ -15,6 +26,8 @@ import { Reactions } from './Reactions'
|
|||||||
import { Zap } from './Zap'
|
import { Zap } from './Zap'
|
||||||
import { nip19 } from 'nostr-tools'
|
import { nip19 } from 'nostr-tools'
|
||||||
import { CommentContent } from './CommentContent'
|
import { CommentContent } from './CommentContent'
|
||||||
|
import { NoteQuoteRepostPopup } from 'components/Notes/NoteQuoteRepostPopup'
|
||||||
|
import { NoteRepostPopup } from 'components/Notes/NoteRepostPopup'
|
||||||
|
|
||||||
interface CommentProps {
|
interface CommentProps {
|
||||||
comment: CommentEvent
|
comment: CommentEvent
|
||||||
@ -38,6 +51,16 @@ export const Comment = ({ comment }: CommentProps) => {
|
|||||||
const [commentEvents, setCommentEvents] = useState<CommentEvent[]>([])
|
const [commentEvents, setCommentEvents] = useState<CommentEvent[]>([])
|
||||||
const [profile, setProfile] = useState<UserProfile>()
|
const [profile, setProfile] = useState<UserProfile>()
|
||||||
|
|
||||||
|
const submit = useSubmit()
|
||||||
|
const navigation = useNavigation()
|
||||||
|
const [repostEvents, setRepostEvents] = useState<NDKEvent[]>([])
|
||||||
|
const [quoteRepostEvents, setQuoteRepostEvents] = useState<NDKEvent[]>([])
|
||||||
|
const [hasReposted, setHasReposted] = useState(false)
|
||||||
|
const [hasQuoted, setHasQuoted] = useState(false)
|
||||||
|
const [showRepostPopup, setShowRepostPopup] = useState(false)
|
||||||
|
const [showQuoteRepostPopup, setShowQuoteRepostPopup] = useState(false)
|
||||||
|
const userState = useAppSelector((state) => state.user)
|
||||||
|
const userPubkey = userState.user?.pubkey as string | undefined
|
||||||
useDidMount(() => {
|
useDidMount(() => {
|
||||||
comment.event.author.fetchProfile().then((res) => setProfile(res))
|
comment.event.author.fetchProfile().then((res) => setProfile(res))
|
||||||
ndk
|
ndk
|
||||||
@ -52,7 +75,65 @@ export const Comment = ({ comment }: CommentProps) => {
|
|||||||
}))
|
}))
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const repostFilter: NDKFilter = {
|
||||||
|
kinds: [NDKKind.Repost],
|
||||||
|
'#e': [comment.event.id]
|
||||||
|
}
|
||||||
|
const quoteFilter: NDKFilter = {
|
||||||
|
kinds: [NDKKind.Text],
|
||||||
|
'#q': [comment.event.id]
|
||||||
|
}
|
||||||
|
ndk
|
||||||
|
.fetchEvents([repostFilter, quoteFilter], {
|
||||||
|
closeOnEose: true,
|
||||||
|
cacheUsage: NDKSubscriptionCacheUsage.PARALLEL
|
||||||
|
})
|
||||||
|
.then((ndkEventSet) => {
|
||||||
|
const ndkEvents = Array.from(ndkEventSet)
|
||||||
|
|
||||||
|
if (ndkEventSet.size) {
|
||||||
|
const quoteRepostEvents = ndkEvents.filter(
|
||||||
|
(n) => n.kind === NDKKind.Text
|
||||||
|
)
|
||||||
|
userPubkey &&
|
||||||
|
setHasQuoted(
|
||||||
|
quoteRepostEvents.some((qr) => qr.pubkey === userPubkey)
|
||||||
|
)
|
||||||
|
setQuoteRepostEvents(quoteRepostEvents)
|
||||||
|
|
||||||
|
const repostEvents = ndkEvents.filter(
|
||||||
|
(n) => n.kind === NDKKind.Repost
|
||||||
|
)
|
||||||
|
userPubkey &&
|
||||||
|
setHasReposted(repostEvents.some((qr) => qr.pubkey === userPubkey))
|
||||||
|
setRepostEvents(repostEvents)
|
||||||
|
}
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
const handleRepost = async (confirm: boolean) => {
|
||||||
|
if (navigation.state !== 'idle') return
|
||||||
|
|
||||||
|
setShowRepostPopup(false)
|
||||||
|
|
||||||
|
// Cancel if not confirmed
|
||||||
|
if (!confirm) return
|
||||||
|
|
||||||
|
const repostNdkEvent = await comment.event.repost(false)
|
||||||
|
const rawEvent = repostNdkEvent.rawEvent()
|
||||||
|
submit(
|
||||||
|
JSON.stringify({
|
||||||
|
intent: 'repost',
|
||||||
|
note1: comment.event.encode(),
|
||||||
|
data: rawEvent
|
||||||
|
}),
|
||||||
|
{
|
||||||
|
method: 'post',
|
||||||
|
encType: 'application/json',
|
||||||
|
action: appRoutes.feed
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
const profileRoute = getProfilePageRoute(
|
const profileRoute = getProfilePageRoute(
|
||||||
nip19.nprofileEncode({
|
nip19.nprofileEncode({
|
||||||
@ -107,25 +188,82 @@ export const Comment = ({ comment }: CommentProps) => {
|
|||||||
<div className='IBMSMSMBSSCL_CommentActions'>
|
<div className='IBMSMSMBSSCL_CommentActions'>
|
||||||
<div className='IBMSMSMBSSCL_CommentActionsInside'>
|
<div className='IBMSMSMBSSCL_CommentActionsInside'>
|
||||||
<Reactions {...comment.event.rawEvent()} />
|
<Reactions {...comment.event.rawEvent()} />
|
||||||
{/* <div
|
|
||||||
className='IBMSMSMBSSCL_CAElement IBMSMSMBSSCL_CAERepost'
|
{comment.event.kind === NDKKind.Text && (
|
||||||
style={{ cursor: 'not-allowed' }}
|
<>
|
||||||
>
|
{/* Quote Repost, Kind 1 */}
|
||||||
<svg
|
<div
|
||||||
xmlns='http://www.w3.org/2000/svg'
|
className={`IBMSMSMBSSCL_CAElement IBMSMSMBSSCL_CAERepost ${
|
||||||
viewBox='0 -64 640 640'
|
hasQuoted ? 'IBMSMSMBSSCL_CAERepostActive' : ''
|
||||||
width='1em'
|
}`}
|
||||||
height='1em'
|
onClick={
|
||||||
fill='currentColor'
|
navigation.state === 'idle'
|
||||||
className='IBMSMSMBSSCL_CAElementIcon'
|
? () => setShowQuoteRepostPopup(true)
|
||||||
>
|
: undefined
|
||||||
<path d='M614.2 334.8C610.5 325.8 601.7 319.1 592 319.1H544V176C544 131.9 508.1 96 464 96h-128c-17.67 0-32 14.31-32 32s14.33 32 32 32h128C472.8 160 480 167.2 480 176v143.1h-48c-9.703 0-18.45 5.844-22.17 14.82s-1.656 19.29 5.203 26.16l80 80.02C499.7 445.7 505.9 448 512 448s12.28-2.344 16.97-7.031l80-80.02C615.8 354.1 617.9 343.8 614.2 334.8zM304 352h-128C167.2 352 160 344.8 160 336V192h48c9.703 0 18.45-5.844 22.17-14.82s1.656-19.29-5.203-26.16l-80-80.02C140.3 66.34 134.1 64 128 64S115.7 66.34 111 71.03l-80 80.02C24.17 157.9 22.11 168.2 25.83 177.2S38.3 192 48 192H96V336C96 380.1 131.9 416 176 416h128c17.67 0 32-14.31 32-32S321.7 352 304 352z'></path>
|
}
|
||||||
</svg>
|
>
|
||||||
<p className='IBMSMSMBSSCL_CAElementText'>0</p>
|
<svg
|
||||||
<div className='IBMSMSMBSSCL_CAElementLoadWrapper'>
|
xmlns='http://www.w3.org/2000/svg'
|
||||||
<div className='IBMSMSMBSSCL_CAElementLoad'></div>
|
viewBox='0 0 512 512'
|
||||||
</div>
|
width='1em'
|
||||||
</div> */}
|
height='1em'
|
||||||
|
fill='currentColor'
|
||||||
|
className='IBMSMSMBSSCL_CAElementIcon'
|
||||||
|
>
|
||||||
|
<path d='M256 31.1c-141.4 0-255.1 93.09-255.1 208c0 49.59 21.38 94.1 56.97 130.7c-12.5 50.39-54.31 95.3-54.81 95.8C0 468.8-.5938 472.2 .6875 475.2c1.312 3 4.125 4.797 7.312 4.797c66.31 0 116-31.8 140.6-51.41c32.72 12.31 69.01 19.41 107.4 19.41C397.4 447.1 512 354.9 512 239.1S397.4 31.1 256 31.1zM368 266c0 8.836-7.164 16-16 16h-54V336c0 8.836-7.164 16-16 16h-52c-8.836 0-16-7.164-16-16V282H160c-8.836 0-16-7.164-16-16V214c0-8.838 7.164-16 16-16h53.1V144c0-8.838 7.164-16 16-16h52c8.836 0 16 7.162 16 16v54H352c8.836 0 16 7.162 16 16V266z'></path>
|
||||||
|
</svg>
|
||||||
|
<p className='IBMSMSMBSSCL_CAElementText'>
|
||||||
|
{quoteRepostEvents.length}
|
||||||
|
</p>
|
||||||
|
<div className='IBMSMSMBSSCL_CAElementLoadWrapper'>
|
||||||
|
<div className='IBMSMSMBSSCL_CAElementLoad'></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{showQuoteRepostPopup && (
|
||||||
|
<NoteQuoteRepostPopup
|
||||||
|
ndkEvent={comment.event}
|
||||||
|
handleClose={() => setShowQuoteRepostPopup(false)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Repost, Kind 6 */}
|
||||||
|
<div
|
||||||
|
className={`IBMSMSMBSSCL_CAElement IBMSMSMBSSCL_CAERepost ${
|
||||||
|
hasReposted ? 'IBMSMSMBSSCL_CAERepostActive' : ''
|
||||||
|
}`}
|
||||||
|
onClick={
|
||||||
|
navigation.state === 'idle'
|
||||||
|
? () => setShowRepostPopup(true)
|
||||||
|
: undefined
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
xmlns='http://www.w3.org/2000/svg'
|
||||||
|
viewBox='0 -64 640 640'
|
||||||
|
width='1em'
|
||||||
|
height='1em'
|
||||||
|
fill='currentColor'
|
||||||
|
className='IBMSMSMBSSCL_CAElementIcon'
|
||||||
|
>
|
||||||
|
<path d='M614.2 334.8C610.5 325.8 601.7 319.1 592 319.1H544V176C544 131.9 508.1 96 464 96h-128c-17.67 0-32 14.31-32 32s14.33 32 32 32h128C472.8 160 480 167.2 480 176v143.1h-48c-9.703 0-18.45 5.844-22.17 14.82s-1.656 19.29 5.203 26.16l80 80.02C499.7 445.7 505.9 448 512 448s12.28-2.344 16.97-7.031l80-80.02C615.8 354.1 617.9 343.8 614.2 334.8zM304 352h-128C167.2 352 160 344.8 160 336V192h48c9.703 0 18.45-5.844 22.17-14.82s1.656-19.29-5.203-26.16l-80-80.02C140.3 66.34 134.1 64 128 64S115.7 66.34 111 71.03l-80 80.02C24.17 157.9 22.11 168.2 25.83 177.2S38.3 192 48 192H96V336C96 380.1 131.9 416 176 416h128c17.67 0 32-14.31 32-32S321.7 352 304 352z'></path>
|
||||||
|
</svg>
|
||||||
|
<p className='IBMSMSMBSSCL_CAElementText'>
|
||||||
|
{repostEvents.length}
|
||||||
|
</p>
|
||||||
|
<div className='IBMSMSMBSSCL_CAElementLoadWrapper'>
|
||||||
|
<div className='IBMSMSMBSSCL_CAElementLoad'></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{showRepostPopup && (
|
||||||
|
<NoteRepostPopup
|
||||||
|
ndkEvent={comment.event}
|
||||||
|
handleConfirm={handleRepost}
|
||||||
|
handleClose={() => setShowRepostPopup(false)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
{typeof profile?.lud16 !== 'undefined' && profile.lud16 !== '' && (
|
{typeof profile?.lud16 !== 'undefined' && profile.lud16 !== '' && (
|
||||||
<Zap {...comment.event.rawEvent()} />
|
<Zap {...comment.event.rawEvent()} />
|
||||||
)}
|
)}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user