small fixes

This commit is contained in:
Ren Amamiya
2023-09-13 11:10:24 +07:00
parent fa0d7cac31
commit 5a6dd172b1
19 changed files with 57 additions and 33 deletions

View File

@@ -13,7 +13,7 @@ import { Widget } from '@utils/types';
export function GlobalArticlesWidget({ params }: { params: Widget }) {
const { ndk } = useNDK();
const { status, data } = useQuery(
['global-articles-widget'],
[params.id + '-' + params.title],
async () => {
const events = await ndk.fetchEvents({
kinds: [NDKKind.Article],

View File

@@ -13,7 +13,7 @@ import { Widget } from '@utils/types';
export function GlobalFilesWidget({ params }: { params: Widget }) {
const { ndk } = useNDK();
const { status, data } = useQuery(
['global-files-widget'],
[params.id + '-' + params.title],
async () => {
const events = await ndk.fetchEvents({
// @ts-expect-error, NDK not support file metadata yet

View File

@@ -22,7 +22,7 @@ import { Widget } from '@utils/types';
export function GlobalHashtagWidget({ params }: { params: Widget }) {
const { ndk } = useNDK();
const { status, data } = useQuery(
['global-hashtag-widget', params.content],
[params.id + '-' + params.title],
async () => {
const events = await ndk.fetchEvents({
kinds: [NDKKind.Text, NDKKind.Repost, NDKKind.Article],

View File

@@ -15,7 +15,7 @@ export function LocalArticlesWidget({ params }: { params: Widget }) {
const { db } = useStorage();
const { status, data, hasNextPage, isFetchingNextPage, fetchNextPage } =
useInfiniteQuery({
queryKey: ['local-articles-widget'],
queryKey: [params.id + '-' + params.title],
queryFn: async ({ pageParam = 0 }) => {
return await db.getAllEventsByKinds([NDKKind.Article], 20, pageParam);
},

View File

@@ -23,7 +23,7 @@ export function LocalFeedsWidget({ params }: { params: Widget }) {
const { db } = useStorage();
const { status, data, hasNextPage, isFetchingNextPage, fetchNextPage } =
useInfiniteQuery({
queryKey: ['local-feeds-widget', params.content],
queryKey: [params.id + '-' + params.title],
queryFn: async ({ pageParam = 0 }) => {
const authors = JSON.parse(params.content);
return await db.getAllEventsByAuthors(authors, 20, pageParam);
@@ -71,7 +71,7 @@ export function LocalFeedsWidget({ params }: { params: Widget }) {
data-index={index}
ref={virtualizer.measureElement}
>
<Repost key={dbEvent.id} event={event} />
<Repost key={dbEvent.id} event={event} root={dbEvent.root_id} />
</div>
);
case 1063:

View File

@@ -15,7 +15,7 @@ export function LocalFilesWidget({ params }: { params: Widget }) {
const { db } = useStorage();
const { status, data, hasNextPage, isFetchingNextPage, fetchNextPage } =
useInfiniteQuery({
queryKey: ['local-files-widget'],
queryKey: [params.id + '-' + params.title],
queryFn: async ({ pageParam = 0 }) => {
return await db.getAllEventsByKinds([1063], 20, pageParam);
},

View File

@@ -23,7 +23,7 @@ export function LocalFollowsWidget({ params }: { params: Widget }) {
const { db } = useStorage();
const { status, data, hasNextPage, isFetchingNextPage, fetchNextPage } =
useInfiniteQuery({
queryKey: ['local-follows-widget'],
queryKey: [params.id + '-' + params.title],
queryFn: async ({ pageParam = 0 }) => {
return await db.getAllEventsByAuthors(db.account.follows, 20, pageParam);
},
@@ -70,7 +70,7 @@ export function LocalFollowsWidget({ params }: { params: Widget }) {
data-index={index}
ref={virtualizer.measureElement}
>
<Repost key={dbEvent.id} event={event} />
<Repost key={dbEvent.id} event={event} root={dbEvent.root_id} />
</div>
);
case 1063:

View File

@@ -73,7 +73,7 @@ export function LocalNetworkWidget() {
data-index={index}
ref={virtualizer.measureElement}
>
<Repost key={dbEvent.id} event={event} />
<Repost key={dbEvent.id} event={event} root={dbEvent.root_id} />
</div>
);
case 1063:

View File

@@ -23,7 +23,7 @@ import { Widget } from '@utils/types';
export function LocalUserWidget({ params }: { params: Widget }) {
const { ndk } = useNDK();
const { status, data } = useQuery(
['local-user-widget', params.content],
[params.id + '-' + params.title],
async () => {
const events = await ndk.fetchEvents({
kinds: [1, 6],