-
- {!messages ? (
-
Loading...
- ) : (
-
- {items.map((item) => {
- const index = reverseIndex(item.index);
- const message = messages[index];
-
- return (
-
-
-
- );
- })}
-
- )}
-
-
+ {!messages ? (
+
Loading...
+ ) : (
+
+ )}
+
diff --git a/src/app/chat/pages/index.page.tsx b/src/app/chat/pages/index.page.tsx
index 764d7b5b..ac12e41b 100644
--- a/src/app/chat/pages/index.page.tsx
+++ b/src/app/chat/pages/index.page.tsx
@@ -18,11 +18,11 @@ export function Page() {
const searchParams: any = pageContext.urlParsed.search;
const pubkey = searchParams.pubkey;
- const [fetchMessages, clear] = useChatMessages((state: any) => [
+ const [add, fetchMessages, clear] = useChatMessages((state: any) => [
+ state.add,
state.fetch,
state.clear,
]);
- const add = useChatMessages((state: any) => state.add);
useSWRSubscription(account !== pubkey ? ["chat", pubkey] : null, () => {
const sub = ndk.subscribe({
diff --git a/src/app/prefetch/pages/index.page.tsx b/src/app/prefetch/pages/index.page.tsx
index 69a9d1d0..37b30df4 100644
--- a/src/app/prefetch/pages/index.page.tsx
+++ b/src/app/prefetch/pages/index.page.tsx
@@ -1,5 +1,11 @@
import { prefetchEvents } from "@libs/ndk";
-import { countTotalNotes, createChat, createNote } from "@libs/storage";
+import {
+ countTotalNotes,
+ createChannelMessage,
+ createChat,
+ createNote,
+ getChannels,
+} from "@libs/storage";
import { NDKFilter } from "@nostr-dev-kit/ndk";
import { LumeIcon } from "@shared/icons";
import { RelayContext } from "@shared/relayProvider";
@@ -98,12 +104,52 @@ export function Page() {
}
}
+ async function fetchChannelMessages() {
+ try {
+ const ids = [];
+ const channels: any = await getChannels(10, 0);
+ channels.forEach((channel) => {
+ ids.push(channel.event_id);
+ });
+
+ const since =
+ lastLogin === 0 ? dateToUnix(getHourAgo(48, now.current)) : lastLogin;
+
+ const filter: NDKFilter = {
+ "#e": ids,
+ kinds: [42],
+ since: since,
+ };
+
+ const events = await prefetchEvents(ndk, filter);
+ events.forEach((event) => {
+ const channel_id = event.tags[0][1];
+ if (channel_id) {
+ createChannelMessage(
+ channel_id,
+ event.id,
+ event.pubkey,
+ event.kind,
+ event.content,
+ event.tags,
+ event.created_at,
+ );
+ }
+ });
+
+ return true;
+ } catch (e) {
+ console.log("error: ", e);
+ }
+ }
+
useEffect(() => {
async function prefetch() {
const notes = await fetchNotes();
if (notes) {
const chats = await fetchChats();
- if (chats) {
+ const channels = await fetchChannelMessages();
+ if (chats && channels) {
navigate("/app/space", { overwriteLastHistoryEntry: true });
}
}
diff --git a/src/libs/ndk.tsx b/src/libs/ndk.tsx
index 4e7304a0..33916bea 100644
--- a/src/libs/ndk.tsx
+++ b/src/libs/ndk.tsx
@@ -35,7 +35,7 @@ export async function prefetchEvents(
});
relaySetSubscription.on("eose", () => {
- setTimeout(() => resolve(new Set(events.values())), 3000);
+ setTimeout(() => resolve(new Set(events.values())), 5000);
});
});
}
diff --git a/src/libs/storage.tsx b/src/libs/storage.tsx
index bc108fae..0c0a3bdc 100644
--- a/src/libs/storage.tsx
+++ b/src/libs/storage.tsx
@@ -303,6 +303,31 @@ export async function updateChannelMetadata(event_id: string, value: string) {
);
}
+// create channel messages
+export async function createChannelMessage(
+ channel_id: string,
+ event_id: string,
+ pubkey: string,
+ kind: number,
+ content: string,
+ tags: string[][],
+ created_at: number,
+) {
+ const db = await connect();
+ return await db.execute(
+ "INSERT OR IGNORE INTO channel_messages (channel_id, event_id, pubkey, kind, content, tags, created_at) VALUES (?, ?, ?, ?, ?, ?, ?);",
+ [channel_id, event_id, pubkey, kind, content, tags, created_at],
+ );
+}
+
+// get channel messages by channel id
+export async function getChannelMessages(channel_id: string) {
+ const db = await connect();
+ return await db.select(
+ `SELECT * FROM channel_messages WHERE channel_id = "${channel_id}" ORDER BY created_at ASC;`,
+ );
+}
+
// get all chats by pubkey
export async function getChatsByPubkey(pubkey: string) {
const db = await connect();
diff --git a/src/shared/notes/preview/image.tsx b/src/shared/notes/preview/image.tsx
index 706a213e..74ef90e0 100644
--- a/src/shared/notes/preview/image.tsx
+++ b/src/shared/notes/preview/image.tsx
@@ -2,7 +2,7 @@ import { Image } from "@shared/image";
export function ImagePreview({ urls }: { urls: string[] }) {
return (
-
+
{urls.map((url) => (
diff --git a/src/shared/notes/preview/link.tsx b/src/shared/notes/preview/link.tsx
index 84493c65..bf6818a9 100644
--- a/src/shared/notes/preview/link.tsx
+++ b/src/shared/notes/preview/link.tsx
@@ -6,7 +6,7 @@ export function LinkPreview({ urls }: { urls: string[] }) {
const { data, error, isLoading } = useOpenGraph(urls[0]);
return (
-
+
{error &&
failed to load
}
{isLoading || !data ? (
diff --git a/src/shared/notes/preview/video.tsx b/src/shared/notes/preview/video.tsx
index 1b7557fa..758c470b 100644
--- a/src/shared/notes/preview/video.tsx
+++ b/src/shared/notes/preview/video.tsx
@@ -5,7 +5,7 @@ export function VideoPreview({ urls }: { urls: string[] }) {
e.stopPropagation()}
onKeyDown={(e) => e.stopPropagation()}
- className="relative mt-2 flex w-full flex-col overflow-hidden rounded-lg bg-zinc-950"
+ className="relative mt-3 max-w-[420px] flex w-full flex-col overflow-hidden rounded-lg bg-zinc-950"
>
diff --git a/src/stores/channels.tsx b/src/stores/channels.tsx
index 04b384be..e974f9c0 100644
--- a/src/stores/channels.tsx
+++ b/src/stores/channels.tsx
@@ -1,5 +1,9 @@
-import { getChannels } from "@libs/storage";
-import NDK, { NDKFilter } from "@nostr-dev-kit/ndk";
+import {
+ createChannelMessage,
+ getChannelMessages,
+ getChannels,
+} from "@libs/storage";
+import { LumeEvent } from "@utils/types";
import { create } from "zustand";
import { immer } from "zustand/middleware/immer";
@@ -38,19 +42,28 @@ export const useChannelMessages = create(
immer((set) => ({
messages: [],
replyTo: { id: null, pubkey: null, content: null },
- fetch: async (ndk: NDK, id: string, since: number) => {
- const filter: NDKFilter = {
- "#e": [id],
- kinds: [42],
- since: since,
- };
- const events = await ndk.fetchEvents(filter);
- const array = [...events];
- set({ messages: array });
+ fetch: async (id: string) => {
+ const events = await getChannelMessages(id);
+ set({ messages: events });
},
- add: (message: any) => {
+ add: (id, event: LumeEvent) => {
set((state: any) => {
- state.messages.push(message);
+ createChannelMessage(
+ id,
+ event.id,
+ event.pubkey,
+ event.kind,
+ event.content,
+ event.tags,
+ event.created_at,
+ );
+ state.messages.push({
+ event_id: event.id,
+ channel_id: id,
+ hide: 0,
+ mute: 0,
+ ...event,
+ });
});
},
openReply: (id: string, pubkey: string, content: string) => {
diff --git a/src/utils/parser.tsx b/src/utils/parser.tsx
index 2749b603..096aaf0d 100644
--- a/src/utils/parser.tsx
+++ b/src/utils/parser.tsx
@@ -4,8 +4,19 @@ import getUrls from "get-urls";
import { parseReferences } from "nostr-tools";
import reactStringReplace from "react-string-replace";
+function isJsonString(str) {
+ try {
+ JSON.parse(str);
+ } catch (e) {
+ return false;
+ }
+ return true;
+}
+
export function parser(event: any) {
- event.tags = destr(event.tags);
+ if (isJsonString(event.tags)) {
+ event["tags"] = destr(event.tags);
+ }
const references = parseReferences(event);
const urls = getUrls(event.content);