diff --git a/package-lock.json b/package-lock.json index e5b08a89..3c311401 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/package.json b/package.json index c6bd7b3e..36632349 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "svelte-link-preview": "^0.3.3", "svelte-loading-spinners": "^0.3.4", "svelte-preprocess": "^5.0.1", + "svelte-range-slider-pips": "^2.1.1", "svelte-routing": "^1.6.0", "svelte-switch": "^0.0.5", "throttle-debounce": "^5.0.0", diff --git a/src/App.svelte b/src/App.svelte index 9b8f4c4d..81f274ab 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -261,11 +261,11 @@ {#if $toast}
+ border border-dark pointer-events-all"> {#if is(String, $toast.message)} {$toast.message} {:else} diff --git a/src/agent/network.ts b/src/agent/network.ts index 63817129..3abfc177 100644 --- a/src/agent/network.ts +++ b/src/agent/network.ts @@ -96,7 +96,7 @@ const loadPeople = async (pubkeys, {relays = null, kinds = personKinds, force = const chunkRelays = relays || ( getAllPubkeyWriteRelays(chunk) .concat(getUserReadRelays()) - .slice(0, 3) + .slice(0, 10) ) await load(chunkRelays, {kinds, authors: chunk}, opts) diff --git a/src/agent/relays.ts b/src/agent/relays.ts index 06ed3263..9a3a375f 100644 --- a/src/agent/relays.ts +++ b/src/agent/relays.ts @@ -3,6 +3,7 @@ import {warn} from 'src/util/logger' import {pick, objOf, map, assoc, sortBy, uniqBy, prop} from 'ramda' import {first, createMap} from 'hurdak/lib/hurdak' import {Tags, isRelay, findReplyId} from 'src/util/nostr' +import {shuffle} from 'src/util/misc' import database from 'src/agent/database' import user from 'src/agent/user' @@ -124,6 +125,8 @@ export const uniqByUrl = uniqBy(prop('url')) export const sortByScore = sortBy(r => -r.score) +export const sampleRelays = relays => shuffle(relays).slice(0, 30) + export const aggregateScores = relayGroups => { const scores = {} as Record { const selection = document.getSelection() diff --git a/src/partials/Note.svelte b/src/partials/Note.svelte index 648a276f..e4686cea 100644 --- a/src/partials/Note.svelte +++ b/src/partials/Note.svelte @@ -208,9 +208,11 @@ {#if !showParent}
{/if} - - - +
+ + + +
diff --git a/src/routes/Chat.svelte b/src/routes/Chat.svelte index 04b25b88..0a815aab 100644 --- a/src/routes/Chat.svelte +++ b/src/routes/Chat.svelte @@ -26,10 +26,14 @@ const messages = await database.messages.all() const pubkeys = without([user.getPubkey()], uniq(messages.flatMap(m => [m.pubkey, m.recipient]))) - await network.loadPeople(pubkeys) + network.loadPeople(pubkeys) return sortBy(k => -(mostRecentByPubkey[k] || 0), pubkeys) - .map(k => ({type: 'npub', id: k, ...database.getPersonWithFallback(k)})) + .map(k => { + const person = database.getPersonWithFallback(k) + + return {type: 'npub', id: k, ...person, ...person.kind0} + }) .concat(rooms.map(room => ({type: 'note', ...room}))) }) @@ -72,7 +76,7 @@ {#if $rooms} -
+

Your rooms

diff --git a/src/routes/Messages.svelte b/src/routes/Messages.svelte index 73355a13..0b1a098a 100644 --- a/src/routes/Messages.svelte +++ b/src/routes/Messages.svelte @@ -1,6 +1,7 @@