mirror of
https://github.com/lumehq/lume.git
synced 2025-03-29 03:02:14 +01:00
fix note metadata
This commit is contained in:
parent
2ed1c58d6e
commit
e951d268a3
@ -16,7 +16,6 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@floating-ui/react": "^0.23.1",
|
"@floating-ui/react": "^0.23.1",
|
||||||
"@headlessui/react": "^1.7.14",
|
"@headlessui/react": "^1.7.14",
|
||||||
"@preact/signals-react": "1.2.2",
|
|
||||||
"@supabase/supabase-js": "^2.21.0",
|
"@supabase/supabase-js": "^2.21.0",
|
||||||
"@tanstack/react-query": "^4.29.5",
|
"@tanstack/react-query": "^4.29.5",
|
||||||
"@tanstack/react-virtual": "3.0.0-beta.54",
|
"@tanstack/react-virtual": "3.0.0-beta.54",
|
||||||
|
19
pnpm-lock.yaml
generated
19
pnpm-lock.yaml
generated
@ -7,9 +7,6 @@ dependencies:
|
|||||||
'@headlessui/react':
|
'@headlessui/react':
|
||||||
specifier: ^1.7.14
|
specifier: ^1.7.14
|
||||||
version: 1.7.14(react-dom@18.2.0)(react@18.2.0)
|
version: 1.7.14(react-dom@18.2.0)(react@18.2.0)
|
||||||
'@preact/signals-react':
|
|
||||||
specifier: 1.2.2
|
|
||||||
version: 1.2.2(react@18.2.0)
|
|
||||||
'@supabase/supabase-js':
|
'@supabase/supabase-js':
|
||||||
specifier: ^2.21.0
|
specifier: ^2.21.0
|
||||||
version: 2.21.0(encoding@0.1.13)
|
version: 2.21.0(encoding@0.1.13)
|
||||||
@ -752,22 +749,6 @@ packages:
|
|||||||
{ integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== }
|
{ integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== }
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
/@preact/signals-core@1.3.0:
|
|
||||||
resolution:
|
|
||||||
{ integrity: sha512-M+M3ZOtd1dtV/uasyk4SZu1vbfEJ4NeENv0F7F12nijZYedB5wSgbtZcuACyssnTznhF4ctUyrR0dZHuHfyWKA== }
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/@preact/signals-react@1.2.2(react@18.2.0):
|
|
||||||
resolution:
|
|
||||||
{ integrity: sha512-GoESQ9n1bns2FD+8yqH7lBvQMavboKLCNEW+s0hs3Wcp5B1VHvVxwJo6aFs6rpxoh1/q8Tvwbi4vIeehBD2mzA== }
|
|
||||||
peerDependencies:
|
|
||||||
react: 17.x || 18.x
|
|
||||||
dependencies:
|
|
||||||
'@preact/signals-core': 1.3.0
|
|
||||||
react: 18.2.0
|
|
||||||
use-sync-external-store: 1.2.0(react@18.2.0)
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/@rollup/plugin-virtual@3.0.1:
|
/@rollup/plugin-virtual@3.0.1:
|
||||||
resolution:
|
resolution:
|
||||||
{ integrity: sha512-fK8O0IL5+q+GrsMLuACVNk2x21g3yaw+sG2qn16SnUd3IlBsQyvWxLMGHmCmXRMecPjGRSZ/1LmZB4rjQm68og== }
|
{ integrity: sha512-fK8O0IL5+q+GrsMLuACVNk2x21g3yaw+sG2qn16SnUd3IlBsQyvWxLMGHmCmXRMecPjGRSZ/1LmZB4rjQm68og== }
|
||||||
|
@ -3,10 +3,9 @@ import NoteMetadata from '@lume/app/newsfeed/components/note/metadata';
|
|||||||
import { NoteParent } from '@lume/app/newsfeed/components/note/parent';
|
import { NoteParent } from '@lume/app/newsfeed/components/note/parent';
|
||||||
import { NoteDefaultUser } from '@lume/app/newsfeed/components/user/default';
|
import { NoteDefaultUser } from '@lume/app/newsfeed/components/user/default';
|
||||||
|
|
||||||
import { memo } from 'react';
|
|
||||||
import { navigate } from 'vite-plugin-ssr/client/router';
|
import { navigate } from 'vite-plugin-ssr/client/router';
|
||||||
|
|
||||||
export const NoteBase = memo(function NoteBase({ event }: { event: any }) {
|
export default function NoteBase({ event }: { event: any }) {
|
||||||
const content = contentParser(event.content, event.tags);
|
const content = contentParser(event.content, event.tags);
|
||||||
|
|
||||||
const parentNote = () => {
|
const parentNote = () => {
|
||||||
@ -44,4 +43,4 @@ export const NoteBase = memo(function NoteBase({ event }: { event: any }) {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
});
|
}
|
||||||
|
@ -5,16 +5,15 @@ import ZapIcon from '@lume/shared/icons/zap';
|
|||||||
import { RelayContext } from '@lume/shared/relayProvider';
|
import { RelayContext } from '@lume/shared/relayProvider';
|
||||||
import { READONLY_RELAYS } from '@lume/stores/constants';
|
import { READONLY_RELAYS } from '@lume/stores/constants';
|
||||||
|
|
||||||
import { useSignal } from '@preact/signals-react';
|
import { useContext, useState } from 'react';
|
||||||
import { useContext } from 'react';
|
|
||||||
import useSWRSubscription from 'swr/subscription';
|
import useSWRSubscription from 'swr/subscription';
|
||||||
|
|
||||||
export default function NoteMetadata({ id, eventPubkey }: { id: string; eventPubkey: string }) {
|
export default function NoteMetadata({ id, eventPubkey }: { id: string; eventPubkey: string }) {
|
||||||
const pool: any = useContext(RelayContext);
|
const pool: any = useContext(RelayContext);
|
||||||
|
|
||||||
const replies = useSignal(0);
|
const [replies, setReplies] = useState(0);
|
||||||
const likes = useSignal(0);
|
const [reposts, setReposts] = useState(0);
|
||||||
const reposts = useSignal(0);
|
const [likes, setLikes] = useState(0);
|
||||||
|
|
||||||
useSWRSubscription(id ? ['note-metadata', id] : null, ([, key], {}) => {
|
useSWRSubscription(id ? ['note-metadata', id] : null, ([, key], {}) => {
|
||||||
const unsubscribe = pool.subscribe(
|
const unsubscribe = pool.subscribe(
|
||||||
@ -30,14 +29,14 @@ export default function NoteMetadata({ id, eventPubkey }: { id: string; eventPub
|
|||||||
(event: any) => {
|
(event: any) => {
|
||||||
switch (event.kind) {
|
switch (event.kind) {
|
||||||
case 1:
|
case 1:
|
||||||
replies.value++;
|
setReplies((replies) => replies + 1);
|
||||||
break;
|
break;
|
||||||
case 6:
|
case 6:
|
||||||
reposts.value++;
|
setReposts((reposts) => reposts + 1);
|
||||||
break;
|
break;
|
||||||
case 7:
|
case 7:
|
||||||
if (event.content === '🤙' || event.content === '+') {
|
if (event.content === '🤙' || event.content === '+') {
|
||||||
likes.value++;
|
setLikes((likes) => likes + 1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@ -53,9 +52,9 @@ export default function NoteMetadata({ id, eventPubkey }: { id: string; eventPub
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center gap-16">
|
<div className="flex items-center gap-16">
|
||||||
<NoteReply id={id} replies={replies.value} />
|
<NoteReply id={id} replies={replies} />
|
||||||
<NoteLike id={id} pubkey={eventPubkey} likes={likes.value} />
|
<NoteLike id={id} pubkey={eventPubkey} likes={likes} />
|
||||||
<NoteRepost id={id} pubkey={eventPubkey} reposts={reposts.value} />
|
<NoteRepost id={id} pubkey={eventPubkey} reposts={reposts} />
|
||||||
<button className="group inline-flex w-min items-center gap-1.5">
|
<button className="group inline-flex w-min items-center gap-1.5">
|
||||||
<ZapIcon width={20} height={20} className="text-zinc-400 group-hover:text-orange-400" />
|
<ZapIcon width={20} height={20} className="text-zinc-400 group-hover:text-orange-400" />
|
||||||
<span className="text-sm leading-none text-zinc-400 group-hover:text-zinc-200">{0}</span>
|
<span className="text-sm leading-none text-zinc-400 group-hover:text-zinc-200">{0}</span>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import NoteForm from '@lume/app/newsfeed/components/form';
|
import NoteForm from '@lume/app/newsfeed/components/form';
|
||||||
import { NoteBase } from '@lume/app/newsfeed/components/note/base';
|
import NoteBase from '@lume/app/newsfeed/components/note/base';
|
||||||
import { Placeholder } from '@lume/app/newsfeed/components/note/placeholder';
|
import { Placeholder } from '@lume/app/newsfeed/components/note/placeholder';
|
||||||
import { NoteQuoteRepost } from '@lume/app/newsfeed/components/note/quoteRepost';
|
import { NoteQuoteRepost } from '@lume/app/newsfeed/components/note/quoteRepost';
|
||||||
import { hasNewerNoteAtom } from '@lume/stores/note';
|
import { hasNewerNoteAtom } from '@lume/stores/note';
|
||||||
@ -10,7 +10,7 @@ import { useVirtualizer } from '@tanstack/react-virtual';
|
|||||||
import { useAtom } from 'jotai';
|
import { useAtom } from 'jotai';
|
||||||
import { useEffect, useRef } from 'react';
|
import { useEffect, useRef } from 'react';
|
||||||
|
|
||||||
const ITEM_PER_PAGE = 20;
|
const ITEM_PER_PAGE = 10;
|
||||||
const TIME = Math.floor(Date.now() / 1000);
|
const TIME = Math.floor(Date.now() / 1000);
|
||||||
|
|
||||||
export function Page() {
|
export function Page() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user