feat: bookmarks (#279)

This commit is contained in:
M.Abubakar 2025-04-18 18:51:36 +05:00 committed by GitHub
parent 085adeb096
commit 7876f26d0c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 390 additions and 15 deletions

View file

@ -0,0 +1,90 @@
import { useToast } from '@/hooks'
import { useBookmarks } from '@/providers/BookmarksProvider'
import { useNostr } from '@/providers/NostrProvider'
import { BookmarkIcon, Loader } from 'lucide-react'
import { useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { Event } from 'nostr-tools'
export default function BookmarkButton({ event }: { event: Event }) {
const { t } = useTranslation()
const { toast } = useToast()
const { pubkey: accountPubkey, checkLogin } = useNostr()
const { bookmarks, addBookmark, removeBookmark } = useBookmarks()
const [updating, setUpdating] = useState(false)
const eventId = event.id
const eventPubkey = event.pubkey
const isBookmarked = useMemo(
() => bookmarks.some((tag) => tag[0] === 'e' && tag[1] === eventId),
[bookmarks, eventId]
)
if (!accountPubkey) return null
const handleBookmark = async (e: React.MouseEvent) => {
e.stopPropagation()
checkLogin(async () => {
if (isBookmarked) return
setUpdating(true)
try {
await addBookmark(eventId, eventPubkey)
toast({
title: t('Note bookmarked'),
description: t('This note has been added to your bookmarks')
})
} catch (error) {
toast({
title: t('Bookmark failed'),
description: (error as Error).message,
variant: 'destructive'
})
} finally {
setUpdating(false)
}
})
}
const handleRemoveBookmark = async (e: React.MouseEvent) => {
e.stopPropagation()
checkLogin(async () => {
if (!isBookmarked) return
setUpdating(true)
try {
await removeBookmark(eventId)
toast({
title: t('Bookmark removed'),
description: t('This note has been removed from your bookmarks')
})
} catch (error) {
toast({
title: t('Remove bookmark failed'),
description: (error as Error).message,
variant: 'destructive'
})
} finally {
setUpdating(false)
}
})
}
return (
<button
className={`flex items-center gap-1 ${
isBookmarked ? 'text-primary' : 'text-muted-foreground'
} enabled:hover:text-primary px-3 h-full`}
onClick={isBookmarked ? handleRemoveBookmark : handleBookmark}
disabled={updating}
title={isBookmarked ? t('Remove bookmark') : t('Bookmark')}
>
{updating ? (
<Loader className="animate-spin" />
) : (
<BookmarkIcon className={isBookmarked ? 'fill-primary' : ''} />
)}
</button>
)
}

View file

@ -0,0 +1,107 @@
import { useFetchEvent } from '@/hooks'
import { useBookmarks } from '@/providers/BookmarksProvider'
import { useEffect, useMemo, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { generateEventIdFromETag } from '@/lib/tag'
import NoteCard, { NoteCardLoadingSkeleton } from '../NoteCard'
export default function BookmarksList() {
const { t } = useTranslation()
const { bookmarks } = useBookmarks()
const [visibleBookmarks, setVisibleBookmarks] = useState<
{ eventId: string; neventId?: string }[]
>([])
const [loading, setLoading] = useState(true)
const bottomRef = useRef<HTMLDivElement | null>(null)
const SHOW_COUNT = 10
const bookmarkItems = useMemo(() => {
return bookmarks
.filter((tag) => tag[0] === 'e')
.map((tag) => ({
eventId: tag[1],
neventId: generateEventIdFromETag(tag)
}))
.reverse()
}, [bookmarks])
useEffect(() => {
setVisibleBookmarks(bookmarkItems.slice(0, SHOW_COUNT))
setLoading(false)
}, [bookmarkItems])
useEffect(() => {
const options = {
root: null,
rootMargin: '10px',
threshold: 0.1
}
const loadMore = () => {
if (visibleBookmarks.length < bookmarkItems.length) {
setVisibleBookmarks((prev) => [
...prev,
...bookmarkItems.slice(prev.length, prev.length + SHOW_COUNT)
])
}
}
const observerInstance = new IntersectionObserver((entries) => {
if (entries[0].isIntersecting) {
loadMore()
}
}, options)
const currentBottomRef = bottomRef.current
if (currentBottomRef) {
observerInstance.observe(currentBottomRef)
}
return () => {
if (observerInstance && currentBottomRef) {
observerInstance.unobserve(currentBottomRef)
}
}
}, [visibleBookmarks, bookmarkItems])
if (loading) {
return <NoteCardLoadingSkeleton isPictures={false} />
}
if (bookmarkItems.length === 0) {
return (
<div className="mt-2 text-sm text-center text-muted-foreground">
{t('No bookmarks found. Add some by clicking the bookmark icon on notes.')}
</div>
)
}
return (
<div className="space-y-4">
{visibleBookmarks.map((item) => (
<BookmarkedNote key={item.eventId} eventId={item.eventId} neventId={item.neventId} />
))}
{visibleBookmarks.length < bookmarkItems.length && (
<div ref={bottomRef}>
<NoteCardLoadingSkeleton isPictures={false} />
</div>
)}
</div>
)
}
function BookmarkedNote({ eventId, neventId }: { eventId: string; neventId?: string }) {
const { event, isFetching } = useFetchEvent(neventId || eventId)
if (isFetching) {
return <NoteCardLoadingSkeleton isPictures={false} />
}
if (!event) {
return null
}
return <NoteCard event={event} className="w-full" />
}

View file

@ -1,6 +1,7 @@
import { toRelaySettings } from '@/lib/link'
import { simplifyUrl } from '@/lib/url'
import { SecondaryPageLink } from '@/PageManager'
import { useBookmarks } from '@/providers/BookmarksProvider'
import { useFavoriteRelays } from '@/providers/FavoriteRelaysProvider'
import { useFeed } from '@/providers/FeedProvider'
import { useNostr } from '@/providers/NostrProvider'
@ -8,11 +9,12 @@ import { useTranslation } from 'react-i18next'
import RelayIcon from '../RelayIcon'
import RelaySetCard from '../RelaySetCard'
import SaveRelayDropdownMenu from '../SaveRelayDropdownMenu'
import { UsersRound } from 'lucide-react'
import { BookmarkIcon, UsersRound } from 'lucide-react'
export default function FeedSwitcher({ close }: { close?: () => void }) {
const { t } = useTranslation()
const { pubkey } = useNostr()
const { bookmarks } = useBookmarks()
const { relaySets, favoriteRelays } = useFavoriteRelays()
const { feedInfo, switchFeed, temporaryRelayUrls } = useFeed()
@ -35,6 +37,25 @@ export default function FeedSwitcher({ close }: { close?: () => void }) {
</div>
</FeedSwitcherItem>
)}
{pubkey && bookmarks.length > 0 && (
<FeedSwitcherItem
isActive={feedInfo.feedType === 'bookmarks'}
onClick={() => {
if (!pubkey) return
switchFeed('bookmarks', { pubkey })
close?.()
}}
>
<div className="flex gap-2 items-center">
<div className="flex justify-center items-center w-6 h-6 shrink-0">
<BookmarkIcon className="size-4" />
</div>
<div>{t('Bookmarks')}</div>
</div>
</FeedSwitcherItem>
)}
{temporaryRelayUrls.length > 0 && (
<FeedSwitcherItem
key="temporary"

View file

@ -3,6 +3,7 @@ import { useNoteStats } from '@/providers/NoteStatsProvider'
import { useScreenSize } from '@/providers/ScreenSizeProvider'
import { Event } from 'nostr-tools'
import { useEffect } from 'react'
import BookmarkButton from '../BookmarkButton'
import LikeButton from './LikeButton'
import ReplyButton from './ReplyButton'
import RepostButton from './RepostButton'
@ -48,6 +49,7 @@ export default function NoteStats({
<RepostButton event={event} />
<LikeButton event={event} />
<ZapButton event={event} />
<BookmarkButton event={event} />
<SeenOnButton event={event} />
</div>
</div>
@ -63,6 +65,7 @@ export default function NoteStats({
<RepostButton event={event} />
<LikeButton event={event} />
<ZapButton event={event} />
<BookmarkButton event={event} />
</div>
<div className="flex items-center" onClick={(e) => e.stopPropagation()}>
<SeenOnButton event={event} />