coracle/welshman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify loader, apply changes to app stores

Browse Source
This commit is contained in:
Jon Staab
2025-11-19 15:41:56 -08:00
parent cd553d6f6a
commit d197acc41e
10 changed files with 177 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app/src/blossom.ts
+16 -14
View File
@@ -1,22 +1,24 @@
import {BLOSSOM_SERVERS, asDecryptedEvent, readList} from "@welshman/util"
import {TrustedEvent, PublishedList} from "@welshman/util"
import {deriveEventsMapped, collection} from "@welshman/store"
import {deriveItemsByKey, deriveItems, makeForceLoadItem, makeLoadItem, makeDeriveItem, getter} from "@welshman/store"
import {repository} from "./core.js"
import {makeOutboxLoader} from "./relaySelections.js"
export const blossomServers = deriveEventsMapped<PublishedList>(repository, {
filters: [{kinds: [BLOSSOM_SERVERS]}],
itemToEvent: item => item.event,
export const blossomServersByPubkey = deriveItemsByKey({
repository,
eventToItem: (event: TrustedEvent) => readList(asDecryptedEvent(event)),
filters: [{kinds: [BLOSSOM_SERVERS]}],
getKey: blossomServers => blossomServers.event.pubkey,
})
export const {
indexStore: blossomServersByPubkey,
deriveItem: deriveBlossomServers,
loadItem: loadBlossomServers,
} = collection({
name: "blossomServers",
store: blossomServers,
getKey: blossomServers => blossomServers.event.pubkey,
load: makeOutboxLoader(BLOSSOM_SERVERS),
})
export const blossomServers = deriveItems(blossomServersByPubkey)
export const getBlossomServersByPubkey = getter(blossomServersByPubkey)
export const getBlossomServers = (pubkey: string) => getBlossomServersByPubkey().get(pubkey)
export const forceLoadBlossomServers = makeForceLoadItem(makeOutboxLoader(BLOSSOM_SERVERS), getBlossomServers)
export const loadBlossomServers = makeLoadItem(makeOutboxLoader(BLOSSOM_SERVERS), getBlossomServers)
export const deriveBlossomServers = makeDeriveItem(blossomServersByPubkey, loadBlossomServers)
packages/app/src/follows.ts
+16 -14
View File
@@ -1,22 +1,24 @@
import {FOLLOWS, asDecryptedEvent, readList} from "@welshman/util"
import {TrustedEvent, PublishedList} from "@welshman/util"
import {deriveEventsMapped, collection} from "@welshman/store"
import {deriveItemsByKey, deriveItems, makeForceLoadItem, makeLoadItem, makeDeriveItem, getter} from "@welshman/store"
import {repository} from "./core.js"
import {makeOutboxLoader} from "./relaySelections.js"
export const follows = deriveEventsMapped<PublishedList>(repository, {
filters: [{kinds: [FOLLOWS]}],
itemToEvent: item => item.event,
export const followsByPubkey = deriveItemsByKey({
repository,
eventToItem: (event: TrustedEvent) => readList(asDecryptedEvent(event)),
filters: [{kinds: [FOLLOWS]}],
getKey: follows => follows.event.pubkey,
})
export const {
indexStore: followsByPubkey,
deriveItem: deriveFollows,
loadItem: loadFollows,
} = collection({
name: "follows",
store: follows,
getKey: follows => follows.event.pubkey,
load: makeOutboxLoader(FOLLOWS),
})
export const follows = deriveItems(followsByPubkey)
export const getFollowsByPubkey = getter(followsByPubkey)
export const getFollows = (pubkey: string) => getFollowsByPubkey().get(pubkey)
export const forceLoadFollows = makeForceLoadItem(makeOutboxLoader(FOLLOWS), getFollows)
export const loadFollows = makeLoadItem(makeOutboxLoader(FOLLOWS), getFollows)
export const deriveFollows = makeDeriveItem(followsByPubkey, loadFollows)
packages/app/src/inboxRelaySelections.ts
+16 -14
View File
@@ -1,22 +1,24 @@
import {INBOX_RELAYS, asDecryptedEvent, readList} from "@welshman/util"
import {TrustedEvent, PublishedList} from "@welshman/util"
import {deriveEventsMapped, collection} from "@welshman/store"
import {deriveItemsByKey, deriveItems, makeForceLoadItem, makeLoadItem, makeDeriveItem, getter} from "@welshman/store"
import {repository} from "./core.js"
import {makeOutboxLoader} from "./relaySelections.js"
export const inboxRelaySelections = deriveEventsMapped<PublishedList>(repository, {
filters: [{kinds: [INBOX_RELAYS]}],
itemToEvent: item => item.event,
export const inboxRelaySelectionsByPubkey = deriveItemsByKey({
repository,
eventToItem: (event: TrustedEvent) => readList(asDecryptedEvent(event)),
filters: [{kinds: [INBOX_RELAYS]}],
getKey: inboxRelaySelections => inboxRelaySelections.event.pubkey,
})
export const {
indexStore: inboxRelaySelectionsByPubkey,
deriveItem: deriveInboxRelaySelections,
loadItem: loadInboxRelaySelections,
} = collection({
name: "inboxRelaySelections",
store: inboxRelaySelections,
getKey: inboxRelaySelections => inboxRelaySelections.event.pubkey,
load: makeOutboxLoader(INBOX_RELAYS),
})
export const inboxRelaySelections = deriveItems(inboxRelaySelectionsByPubkey)
export const getInboxRelaySelectionsByPubkey = getter(inboxRelaySelectionsByPubkey)
export const getInboxRelaySelections = (pubkey: string) => getInboxRelaySelectionsByPubkey().get(pubkey)
export const forceLoadInboxRelaySelections = makeForceLoadItem(makeOutboxLoader(INBOX_RELAYS), getInboxRelaySelections)
export const loadInboxRelaySelections = makeLoadItem(makeOutboxLoader(INBOX_RELAYS), getInboxRelaySelections)
export const deriveInboxRelaySelections = makeDeriveItem(inboxRelaySelectionsByPubkey, loadInboxRelaySelections)
packages/app/src/mutes.ts
+16 -14
View File
@@ -1,28 +1,30 @@
import {MUTES, asDecryptedEvent, readList} from "@welshman/util"
import {TrustedEvent, PublishedList} from "@welshman/util"
import {deriveEventsMapped, collection} from "@welshman/store"
import {deriveItemsByKey, deriveItems, makeForceLoadItem, makeLoadItem, makeDeriveItem, getter} from "@welshman/store"
import {repository} from "./core.js"
import {ensurePlaintext} from "./plaintext.js"
import {makeOutboxLoader} from "./relaySelections.js"
export const mutes = deriveEventsMapped<PublishedList>(repository, {
filters: [{kinds: [MUTES]}],
itemToEvent: item => item.event,
export const mutesByPubkey = deriveItemsByKey({
repository,
eventToItem: async (event: TrustedEvent) =>
readList(
asDecryptedEvent(event, {
content: await ensurePlaintext(event),
}),
),
filters: [{kinds: [MUTES]}],
getKey: mute => mute.event.pubkey,
})
export const {
indexStore: mutesByPubkey,
deriveItem: deriveMutes,
loadItem: loadMutes,
} = collection({
name: "mutes",
store: mutes,
getKey: mute => mute.event.pubkey,
load: makeOutboxLoader(MUTES),
})
export const mutes = deriveItems(mutesByPubkey)
export const getMutesByPubkey = getter(mutesByPubkey)
export const getMutes = (pubkey: string) => getMutesByPubkey().get(pubkey)
export const forceLoadMutes = makeForceLoadItem(makeOutboxLoader(MUTES), getMutes)
export const loadMutes = makeLoadItem(makeOutboxLoader(MUTES), getMutes)
export const deriveMutes = makeDeriveItem(mutesByPubkey, loadMutes)
packages/app/src/pins.ts
+16 -14
View File
@@ -1,22 +1,24 @@
import {PINS, asDecryptedEvent, readList} from "@welshman/util"
import {TrustedEvent, PublishedList} from "@welshman/util"
import {deriveEventsMapped, collection} from "@welshman/store"
import {deriveItemsByKey, deriveItems, makeForceLoadItem, makeLoadItem, makeDeriveItem, getter} from "@welshman/store"
import {repository} from "./core.js"
import {makeOutboxLoader} from "./relaySelections.js"
export const pins = deriveEventsMapped<PublishedList>(repository, {
filters: [{kinds: [PINS]}],
itemToEvent: item => item.event,
export const pinsByPubkey = deriveItemsByKey({
repository,
eventToItem: (event: TrustedEvent) => readList(asDecryptedEvent(event)),
filters: [{kinds: [PINS]}],
getKey: pins => pins.event.pubkey,
})
export const {
indexStore: pinsByPubkey,
deriveItem: derivePins,
loadItem: loadPins,
} = collection({
name: "pins",
store: pins,
getKey: pins => pins.event.pubkey,
load: makeOutboxLoader(PINS),
})
export const pins = deriveItems(pinsByPubkey)
export const getPinsByPubkey = getter(pinsByPubkey)
export const getPins = (pubkey: string) => getPinsByPubkey().get(pubkey)
export const forceLoadPins = makeForceLoadItem(makeOutboxLoader(PINS), getPins)
export const loadPins = makeLoadItem(makeOutboxLoader(PINS), getPins)
export const derivePins = makeDeriveItem(pinsByPubkey, loadPins)
packages/app/src/profiles.ts
+7 -5
View File
@@ -1,6 +1,6 @@
import {derived, readable} from "svelte/store"
import {readProfile, displayProfile, displayPubkey, PROFILE} from "@welshman/util"
import {deriveItemsByKey, deriveItems, makeDeriveItem, getter} from "@welshman/store"
import {deriveItemsByKey, deriveItems, makeForceLoadItem, makeLoadItem, makeDeriveItem, getter} from "@welshman/store"
import {repository} from "./core.js"
import {makeOutboxLoaderWithIndexers} from "./relaySelections.js"
@@ -13,14 +13,16 @@ export const profilesByPubkey = deriveItemsByKey({
export const profiles = deriveItems(profilesByPubkey)
export const loadProfile = makeOutboxLoaderWithIndexers(PROFILE)
export const deriveProfile = makeDeriveItem(profilesByPubkey, loadProfile)
export const getProfilesByPubkey = getter(profilesByPubkey)
export const getProfile = (pubkey: string) => getProfilesByPubkey().get(pubkey)
export const forceLoadProfile = makeForceLoadItem(makeOutboxLoaderWithIndexers(PROFILE), getProfile)
export const loadProfile = makeLoadItem(makeOutboxLoaderWithIndexers(PROFILE), getProfile)
export const deriveProfile = makeDeriveItem(profilesByPubkey, loadProfile)
export const displayProfileByPubkey = (pubkey: string | undefined) =>
pubkey ? displayProfile(getProfile(pubkey), displayPubkey(pubkey)) : ""
packages/app/src/relaySelections.ts
+16 -14
View File
@@ -7,7 +7,7 @@ import {
TrustedEvent,
PublishedList,
} from "@welshman/util"
import {deriveEventsMapped, collection} from "@welshman/store"
import {deriveItemsByKey, deriveItems, makeForceLoadItem, makeLoadItem, makeDeriveItem, getter} from "@welshman/store"
import {load, LoadOptions} from "@welshman/net"
import {Router} from "@welshman/router"
import {repository} from "./core.js"
@@ -41,19 +41,21 @@ export const makeOutboxLoaderWithIndexers =
])
}
export const relaySelections = deriveEventsMapped<PublishedList>(repository, {
filters: [{kinds: [RELAYS]}],
itemToEvent: item => item.event,
export const relaySelectionsByPubkey = deriveItemsByKey({
repository,
eventToItem: (event: TrustedEvent) => readList(asDecryptedEvent(event)),
filters: [{kinds: [RELAYS]}],
getKey: relaySelections => relaySelections.event.pubkey,
})
export const {
indexStore: relaySelectionsByPubkey,
deriveItem: deriveRelaySelections,
loadItem: loadRelaySelections,
} = collection({
name: "relaySelections",
store: relaySelections,
getKey: relaySelections => relaySelections.event.pubkey,
load: makeOutboxLoaderWithIndexers(RELAYS),
})
export const relaySelections = deriveItems(relaySelectionsByPubkey)
export const getRelaySelectionsByPubkey = getter(relaySelectionsByPubkey)
export const getRelaySelections = (pubkey: string) => getRelaySelectionsByPubkey().get(pubkey)
export const forceLoadRelaySelections = makeForceLoadItem(makeOutboxLoaderWithIndexers(RELAYS), getRelaySelections)
export const loadRelaySelections = makeLoadItem(makeOutboxLoaderWithIndexers(RELAYS), getRelaySelections)
export const deriveRelaySelections = makeDeriveItem(relaySelectionsByPubkey, loadRelaySelections)