{urls.map((url) => (
-
+
state.lastLogin);
const notifyChat = useChats((state: any) => state.add);
+ const saveChat = useChatMessages((state: any) => state.add);
const notifyChannel = useChannels((state: any) => state.add);
const { user } = useProfile(data.pubkey);
useSWRSubscription(
user && lastLogin > 0 ? ["account", data.pubkey] : null,
- ([, key]) => {
+ () => {
// subscribe to channel
const unsubscribe = pool.subscribe(
[
{
- "#p": [key],
+ "#p": [data.pubkey],
since: lastLogin,
},
],
@@ -42,7 +43,9 @@ export function ActiveAccount({ data }: { data: any }) {
case 1:
break;
case 4:
- if (notChatPage) {
+ if (!isChatPage) {
+ // save
+ saveChat(data.pubkey, event);
// update state
notifyChat(event.pubkey);
// send native notifiation
@@ -50,7 +53,7 @@ export function ActiveAccount({ data }: { data: any }) {
}
break;
case 42:
- if (notChannelPage) {
+ if (!isChannelPage) {
// update state
notifyChannel(event);
// send native notifiation
diff --git a/src/shared/appHeader.tsx b/src/shared/appHeader.tsx
index 2f55d2c1..bb7911f2 100644
--- a/src/shared/appHeader.tsx
+++ b/src/shared/appHeader.tsx
@@ -1,4 +1,3 @@
-import { EventCollector } from "@shared/eventCollector";
import { ArrowLeftIcon, ArrowRightIcon } from "@shared/icons";
export function AppHeader() {
@@ -39,7 +38,6 @@ export function AppHeader() {
/>
-
);
}
diff --git a/src/shared/eventCollector.tsx b/src/shared/eventCollector.tsx
index 224b9607..57acf590 100644
--- a/src/shared/eventCollector.tsx
+++ b/src/shared/eventCollector.tsx
@@ -3,8 +3,8 @@ import { RelayContext } from "@shared/relayProvider";
import { useActiveAccount } from "@stores/accounts";
import { READONLY_RELAYS } from "@stores/constants";
import { dateToUnix } from "@utils/date";
-import { createChat, createNote, updateAccount } from "@utils/storage";
-import { getParentID, nip02ToArray } from "@utils/transform";
+import { createNote } from "@utils/storage";
+import { getParentID } from "@utils/transform";
import { useContext } from "react";
import useSWRSubscription from "swr/subscription";
@@ -21,20 +21,6 @@ export function EventCollector() {
authors: follows,
since: dateToUnix(),
},
- {
- kinds: [3],
- authors: [account.pubkey],
- },
- {
- kinds: [4],
- "#p": [account.pubkey],
- since: dateToUnix(),
- },
- {
- kinds: [4],
- authors: [account.pubkey],
- since: dateToUnix(),
- },
],
READONLY_RELAYS,
(event: any) => {
@@ -54,37 +40,6 @@ export function EventCollector() {
);
break;
}
- // contacts
- case 3: {
- const follows = nip02ToArray(event.tags);
- // update account's folllows with NIP-02 tag list
- updateAccount("follows", follows, event.pubkey);
- break;
- }
- // chat
- case 4: {
- if (event.pubkey === account.pubkey) {
- const receiver = event.tags.find((t) => t[0] === "p")[1];
- createChat(
- event.id,
- receiver,
- event.pubkey,
- event.content,
- event.tags,
- event.created_at,
- );
- } else {
- createChat(
- event.id,
- account.pubkey,
- event.pubkey,
- event.content,
- event.tags,
- event.created_at,
- );
- }
- break;
- }
// repost
case 6:
createNote(
diff --git a/src/stores/channels.tsx b/src/stores/channels.tsx
index 54068078..c4d2e635 100644
--- a/src/stores/channels.tsx
+++ b/src/stores/channels.tsx
@@ -38,7 +38,7 @@ export const useChannelMessages = create(
messages: [],
replyTo: { id: null, pubkey: null, content: null },
add: (message: any) => {
- set((state: any) => ({ messages: [...state.messages, message] }));
+ set((state: any) => ({ messages: [message, ...state.messages] }));
},
openReply: (id: string, pubkey: string, content: string) => {
set(() => ({ replyTo: { id, pubkey, content } }));
diff --git a/src/stores/chats.tsx b/src/stores/chats.tsx
index 6ad62d1d..64df0a23 100644
--- a/src/stores/chats.tsx
+++ b/src/stores/chats.tsx
@@ -1,4 +1,4 @@
-import { getChatMessages, getChatsByPubkey } from "@utils/storage";
+import { createChat, getChatMessages, getChatsByPubkey } from "@utils/storage";
import { create } from "zustand";
import { immer } from "zustand/middleware/immer";
@@ -9,7 +9,7 @@ export const useChats = create(
const response: any = await getChatsByPubkey(pubkey);
set({ chats: response });
},
- add: (pubkey: string) => {
+ add: async (pubkey: string) => {
set((state) => {
const target = state.chats.findIndex(
(m: { sender_pubkey: string }) => m.sender_pubkey === pubkey,
@@ -39,8 +39,23 @@ export const useChatMessages = create((set) => ({
const response: any = await getChatMessages(receiver_pubkey, sender_pubkey);
set({ messages: response });
},
- add: (message: any) => {
- set((state: any) => ({ messages: [...state.messages, message] }));
+ add: async (receiver: string, event: any) => {
+ const save = await createChat(
+ event.id,
+ receiver,
+ event.pubkey,
+ event.content,
+ event.tags,
+ event.created_at,
+ );
+ if (save) {
+ set((state: any) => ({
+ messages: [
+ ...state.messages,
+ { ...event, sender_pubkey: event.pubkey, receiver_pubkey: receiver },
+ ],
+ }));
+ }
},
clear: () => {
set(() => ({ messages: [] }));