Kieran/snort
5
14
Fork 14
Code Issues 37 Pull Requests 1 Packages Projects Releases 24 Wiki Activity

fix: nip28 chats loading

Browse Source
This commit is contained in:
Kieran 2023-11-22 15:52:30 +00:00
parent 2884a35b5c
commit 6fd2741cc0
Signed by: Kieran
GPG Key ID: DE71CEB3925BE941
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app/src/chat/index.ts
View File

@ -204,6 +204,6 @@ export function useChatSystem() {
return [...nip4, ...nip28].filter(a => { return [...nip4, ...nip28].filter(a => {
const authors = a.participants.filter(a => a.type === "pubkey").map(a => a.id); const authors = a.participants.filter(a => a.type === "pubkey").map(a => a.id);
return !authors.every(a => isBlocked(a)); return authors.length === 0 || !authors.every(a => isBlocked(a));
}); });
} }

8
packages/app/src/chat/nip28.ts
View File

@ -1,5 +1,5 @@
import debug from "debug"; import debug from "debug";
import { ExternalStore, FeedCache, unixNow, unwrap } from "@snort/shared"; import { ExternalStore, FeedCache, unwrap } from "@snort/shared";
import { import {
EventKind, EventKind,
NostrEvent, NostrEvent,
@ -16,7 +16,6 @@ import {
import { LoginSession } from "@/Login"; import { LoginSession } from "@/Login";
import { findTag } from "@/SnortUtils"; import { findTag } from "@/SnortUtils";
import { Chat, ChatParticipant, ChatSystem, ChatType, lastReadInChat } from "@/chat"; import { Chat, ChatParticipant, ChatSystem, ChatType, lastReadInChat } from "@/chat";
import { Day } from "@/Const";
export class Nip28ChatSystem extends ExternalStore<Array<Chat>> implements ChatSystem { export class Nip28ChatSystem extends ExternalStore<Array<Chat>> implements ChatSystem {
#cache: FeedCache<NostrEvent>; #cache: FeedCache<NostrEvent>;
@ -50,7 +49,7 @@ export class Nip28ChatSystem extends ExternalStore<Array<Chat>> implements ChatS
const lastMessage = messages[id]?.reduce((acc, v) => (v.created_at > acc ? v.created_at : acc), 0) ?? 0; const lastMessage = messages[id]?.reduce((acc, v) => (v.created_at > acc ? v.created_at : acc), 0) ?? 0;
rb.withFilter() rb.withFilter()
.tag("e", [id]) .tag("e", [id])
.since(lastMessage === 0 ? unixNow() - 2 * Day : lastMessage) .since(lastMessage === 0 ? undefined : lastMessage)
.kinds(this.ChannelKinds); .kinds(this.ChannelKinds);
} }
@ -67,9 +66,10 @@ export class Nip28ChatSystem extends ExternalStore<Array<Chat>> implements ChatS
listChats(): Chat[] { listChats(): Chat[] {
const chats = this.#chatChannels(); const chats = this.#chatChannels();
return Object.entries(chats).map(([k, v]) => { const ret = Object.entries(chats).map(([k, v]) => {
return Nip28ChatSystem.createChatObj(Nip28ChatSystem.chatId(k), v); return Nip28ChatSystem.createChatObj(Nip28ChatSystem.chatId(k), v);
}); });
return ret;
} }
static chatId(id: string) { static chatId(id: string) {