nostr/nostros
1
0
Fork 0
mirror of https://github.com/KoalaSat/nostros.git synced 2024-09-29 14:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use different subscription ids (#104)

Browse Source
This commit is contained in:
KoalaSat 2023-01-09 14:18:26 +00:00 committed by GitHub
commit 7a239b22e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/Components/NoteCard/index.tsx
View File

@ -82,7 +82,7 @@ export const NoteCard: React.FC<NoteCardProps> = ({
kinds: [EventKind.meta],
authors: [...rootReplies.map((reply) => reply.pubkey), note.pubkey],
}
relayPool?.subscribe('main-channel', message)
relayPool?.subscribe('notecard', message)
}
})
}

6
frontend/Pages/ContactsPage/index.tsx
View File

@ -56,7 +56,7 @@ export const ContactsPage: React.FC = () => {
setUsers(results)
const missingDataUsers = results.filter((user) => !user.picture).map((user) => user.id)
if (missingDataUsers.length > 0) {
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('contacts-meta', {
kinds: [EventKind.meta],
authors: missingDataUsers,
})
@ -70,12 +70,12 @@ export const ContactsPage: React.FC = () => {
relayPool?.unsubscribeAll()
if (publicKey) {
if (selectedTab === 0) {
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('contacts-following', {
kinds: [EventKind.petNames],
authors: [publicKey],
})
} else if (selectedTab === 1) {
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('contacts-followers', {
kinds: [EventKind.petNames],
'#p': [publicKey],
})

4
frontend/Pages/ConversationPage/index.tsx
View File

@ -73,12 +73,12 @@ export const ConversationPage: React.FC = () => {
const subscribeDirectMessages: () => void = async () => {
relayPool?.unsubscribeAll()
if (publicKey && otherPubKey) {
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('conversation-other', {
kinds: [EventKind.directMessage],
authors: [publicKey],
'#p': [otherPubKey],
})
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('conversation-user', {
kinds: [EventKind.directMessage],
authors: [otherPubKey],
'#p': [publicKey],

6
frontend/Pages/DirectMessagesPage/index.tsx
View File

@ -55,7 +55,7 @@ export const DirectMessagesPage: React.FC = () => {
if (results && results.length > 0) {
settDirectMessages(results)
const otherUsers = results.map((message) => getOtherPubKey(message, publicKey))
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('directmessages-meta', {
kinds: [EventKind.meta],
authors: otherUsers,
})
@ -69,11 +69,11 @@ export const DirectMessagesPage: React.FC = () => {
const subscribeDirectMessages: () => void = async () => {
relayPool?.unsubscribeAll()
if (publicKey) {
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('directmessages-user', {
kinds: [EventKind.directMessage],
authors: [publicKey],
})
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('directmessages-others', {
kinds: [EventKind.directMessage],
'#p': [publicKey],
})

8
frontend/Pages/HomePage/index.tsx
View File

@ -33,7 +33,7 @@ export const HomePage: React.FC = () => {
const calculateInitialNotes: () => Promise<void> = async () => {
if (database && publicKey) {
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('homepage-contacts', {
kinds: [EventKind.petNames],
authors: [publicKey],
})
@ -60,7 +60,7 @@ export const HomePage: React.FC = () => {
message.limit = pageSize + initialPageSize
}
relayPool?.subscribe('main-channel', message)
relayPool?.subscribe('homepage-main', message)
}
const loadNotes: () => void = () => {
@ -68,11 +68,11 @@ export const HomePage: React.FC = () => {
getMainNotes(database, publicKey, pageSize).then((notes) => {
setNotes(notes)
setRefreshing(false)
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('homepage-contacts-meta', {
kinds: [EventKind.meta],
authors: notes.map((note) => note.pubkey),
})
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('homepage-contacts-reactions', {
kinds: [EventKind.reaction],
'#e': notes.map((note) => note.id ?? ''),
})

4
frontend/Pages/LandingPage/Loader/index.tsx
View File

@ -19,7 +19,7 @@ export const Loader: React.FC = () => {
useEffect(() => {
if (!loadingRelayPool && !loadingDb && publicKey) {
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('loading-meta', {
kinds: [EventKind.petNames, EventKind.meta],
authors: [publicKey],
})
@ -37,7 +37,7 @@ export const Loader: React.FC = () => {
setContactsCount(results.length)
if (publicKey && results && results.length > 0) {
const authors = [...results.map((user: User) => user.id), publicKey]
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('loading-notes', {
kinds: [EventKind.meta, EventKind.textNote],
authors,
since: moment().unix() - 86400 * 2,

8
frontend/Pages/MentionsPage/index.tsx
View File

@ -26,12 +26,12 @@ export const MentionsPage: React.FC = () => {
const subscribeNotes: () => void = async () => {
if (!database || !publicKey) return
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('mentions-user-user', {
kinds: [EventKind.textNote],
'#p': [publicKey],
limit: pageSize,
})
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('mentions-user-answers', {
kinds: [EventKind.textNote],
'#e': [publicKey],
limit: pageSize,
@ -42,7 +42,7 @@ export const MentionsPage: React.FC = () => {
if (database && publicKey) {
getMentionNotes(database, publicKey, pageSize).then((notes) => {
setNotes(notes)
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('mentions-notes-answers', {
kinds: [EventKind.reaction],
'#e': notes.map((note) => note.id ?? ''),
})
@ -50,7 +50,7 @@ export const MentionsPage: React.FC = () => {
.filter((note) => !note.picture || note.picture === '')
.map((note) => note.pubkey)
if (missingDataNotes.length > 0) {
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('mentions-meta', {
kinds: [EventKind.meta],
authors: missingDataNotes,
})

6
frontend/Pages/NotePage/index.tsx
View File

@ -67,7 +67,7 @@ export const NotePage: React.FC = () => {
kinds: [EventKind.meta],
authors: [...rootReplies.map((note) => note.pubkey), event.pubkey],
}
relayPool?.subscribe('main-channel', message)
relayPool?.subscribe('meta-notepage', message)
} else {
setReplies([])
}
@ -81,11 +81,11 @@ export const NotePage: React.FC = () => {
const subscribeNotes: (past?: boolean) => Promise<void> = async (past) => {
if (database && eventId) {
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('main-notepage', {
kinds: [EventKind.textNote],
ids: [eventId],
})
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('answers-notepage', {
kinds: [EventKind.reaction, EventKind.textNote],
'#e': [eventId],
})

6
frontend/Pages/ProfilePage/index.tsx
View File

@ -85,7 +85,7 @@ export const ProfilePage: React.FC = () => {
getNotes(database, { filters: { pubkey: userId }, limit: pageSize }).then((results) => {
setNotes(results)
setRefreshing(false)
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('answers-profile', {
kinds: [EventKind.reaction],
'#e': results.map((note) => note.id ?? ''),
})
@ -101,11 +101,11 @@ export const ProfilePage: React.FC = () => {
authors: [userId],
limit: pageSize,
}
relayPool?.subscribe('main-channel', message)
relayPool?.subscribe('main-profile', message)
}
const subscribeProfile: () => Promise<void> = async () => {
relayPool?.subscribe('main-channel', {
relayPool?.subscribe('user-profile', {
kinds: [EventKind.meta, EventKind.petNames],
authors: [userId],
})