remove.mutate(id)}
+ onClick={() => removeBlock(id)}
className="inline-flex h-6 w-6 shrink translate-y-8 transform items-center justify-center rounded transition-transform duration-150 ease-in-out hover:bg-white/10 group-hover:translate-y-0"
>
diff --git a/src/shared/user.tsx b/src/shared/user.tsx
index 8cd89428..20cc0bc1 100644
--- a/src/shared/user.tsx
+++ b/src/shared/user.tsx
@@ -52,7 +52,7 @@ export function User({
diff --git a/src/stores/blocks.tsx b/src/stores/blocks.tsx
new file mode 100644
index 00000000..d10a133a
--- /dev/null
+++ b/src/stores/blocks.tsx
@@ -0,0 +1,37 @@
+import { create } from 'zustand';
+import { createJSONStorage, persist } from 'zustand/middleware';
+
+import { createBlock, getBlocks, removeBlock } from '@libs/storage';
+
+import { Block } from '@utils/types';
+
+interface BlockState {
+ blocks: null | Array;
+ fetchBlocks: () => void;
+ setBlock: ({ kind, title, content }: Block) => void;
+ removeBlock: (id: string) => void;
+}
+
+export const useBlocks = create()(
+ persist(
+ (set) => ({
+ blocks: null,
+ fetchBlocks: async () => {
+ const blocks = await getBlocks();
+ set({ blocks: blocks });
+ },
+ setBlock: async ({ kind, title, content }: Block) => {
+ const block: Block = await createBlock(kind, title, content);
+ set((state) => ({ blocks: [...state.blocks, block] }));
+ },
+ removeBlock: async (id: string) => {
+ await removeBlock(id);
+ set((state) => ({ blocks: state.blocks.filter((block) => block.id !== id) }));
+ },
+ }),
+ {
+ name: 'blocks',
+ storage: createJSONStorage(() => localStorage),
+ }
+ )
+);
diff --git a/src/utils/hooks/useAccount.tsx b/src/utils/hooks/useAccount.tsx
index cc9838d5..d1a5e5b0 100644
--- a/src/utils/hooks/useAccount.tsx
+++ b/src/utils/hooks/useAccount.tsx
@@ -20,7 +20,7 @@ export function useAccount() {
staleTime: Infinity,
refetchOnMount: false,
refetchOnWindowFocus: false,
- refetchOnReconnect: true,
+ refetchOnReconnect: false,
}
);
diff --git a/src/utils/hooks/useBlock.tsx b/src/utils/hooks/useBlock.tsx
deleted file mode 100644
index 9430739c..00000000
--- a/src/utils/hooks/useBlock.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-
-import { createBlock, removeBlock } from '@libs/storage';
-
-interface BlockData {
- kind: number;
- title: string;
- content: string;
-}
-
-export function useBlock() {
- const queryClient = useQueryClient();
-
- const add = useMutation({
- mutationFn: (data: BlockData) => {
- return createBlock(data.kind, data.title, data.content);
- },
- onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: ['blocks'] });
- },
- });
-
- const remove = useMutation({
- mutationFn: (id: string) => {
- return removeBlock(id);
- },
- onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: ['blocks'] });
- },
- });
-
- return { add, remove };
-}
diff --git a/src/utils/hooks/useEvent.tsx b/src/utils/hooks/useEvent.tsx
index c27881c6..2ae79148 100644
--- a/src/utils/hooks/useEvent.tsx
+++ b/src/utils/hooks/useEvent.tsx
@@ -17,6 +17,7 @@ export function useEvent(id: string, fallback?: string) {
} else {
if (fallback) {
const embed: LumeEvent = JSON.parse(fallback);
+ if (embed.kind === 1) embed['content'] = parser(embed);
embed['event_id'] = embed.id;
await createNote(
embed.id,
@@ -28,22 +29,18 @@ export function useEvent(id: string, fallback?: string) {
);
return embed;
} else {
- const event = await ndk.fetchEvent(id);
+ const event = (await ndk.fetchEvent(id)) as unknown as LumeEvent;
if (event) {
await createNote(
event.id,
event.pubkey,
event.kind,
event.tags,
- event.content,
+ event.content as unknown as string,
event.created_at
);
event['event_id'] = event.id;
- if (event.kind === 1) {
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore
- event['content'] = parser(event);
- }
+ if (event.kind === 1) event['content'] = parser(event);
return event as unknown as LumeEvent;
} else {
throw new Error('Event not found');
diff --git a/src/utils/hooks/useNostr.tsx b/src/utils/hooks/useNostr.tsx
index 60c926ea..a24c915c 100644
--- a/src/utils/hooks/useNostr.tsx
+++ b/src/utils/hooks/useNostr.tsx
@@ -47,7 +47,7 @@ export function useNostr() {
});
});
- network = [...network.values()] as string[];
+ network = [...lruNetwork.values()] as string[];
} else {
network = account.network;
}
@@ -69,7 +69,7 @@ export function useNostr() {
if (network.length > 0) {
let since: number;
if (totalNotes === 0 || lastLogin === 0) {
- since = nHoursAgo(6);
+ since = nHoursAgo(24);
} else {
since = lastLogin;
}
diff --git a/src/utils/types.d.ts b/src/utils/types.d.ts
index 8a54659e..b56ae3e8 100644
--- a/src/utils/types.d.ts
+++ b/src/utils/types.d.ts
@@ -32,8 +32,8 @@ export interface Profile extends NDKUserProfile {
}
export interface Block {
- id: string;
- account_id: number;
+ id?: string;
+ account_id?: number;
kind: number;
title: string;
content: string;