matt/flotilla
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix deriving stuff in social.ts

Browse source
This commit is contained in:
Jon Staab 2026-08-14 10:12:18 -07:00
parent 8e2284a2fe
commit 31471b50b5
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/app/social.ts
View file

@ -12,18 +12,16 @@ import {
import type {TrustedEvent} from "@welshman/util" import type {TrustedEvent} from "@welshman/util"
import {withGetter} from "@welshman/store" import {withGetter} from "@welshman/store"
import {getCommentTagValues, getReplyTagValues} from "@welshman/domain" import {getCommentTagValues, getReplyTagValues} from "@welshman/domain"
import {followLists, muteLists, profiles, user} from "@app/core" import {FollowLists, MuteLists} from "@welshman/app"
import {deriveUserItem, profiles, user} from "@app/core"
import {DEFAULT_PUBKEYS} from "@app/env" import {DEFAULT_PUBKEYS} from "@app/env"
export const bootstrapPubkeys = derived( export const bootstrapPubkeys = derived(deriveUserItem(FollowLists), $userFollowList => {
[user, followLists.get().index.$], const appPubkeys = DEFAULT_PUBKEYS.split(",")
([$user, $followLists]) => { const userPubkeys = shuffle($userFollowList?.pubkeys() ?? [])
const appPubkeys = DEFAULT_PUBKEYS.split(",")
const userPubkeys = shuffle($followLists.get($user.pubkey)?.pubkeys() ?? [])
return userPubkeys.length > 5 ? userPubkeys : [...userPubkeys, ...appPubkeys] return userPubkeys.length > 5 ? userPubkeys : [...userPubkeys, ...appPubkeys]
}, })
)
// Ids and addresses of an event's immediate parents, falling back to its thread roots. // Ids and addresses of an event's immediate parents, falling back to its thread roots.
const getParents = ({kind, tags}: TrustedEvent) => { const getParents = ({kind, tags}: TrustedEvent) => {
@ -33,9 +31,8 @@ const getParents = ({kind, tags}: TrustedEvent) => {
} }
export const isEventMuted = withGetter( export const isEventMuted = withGetter(
derived([user, muteLists.get().index.$], ([$user, $muteLists]) => { derived([user, deriveUserItem(MuteLists)], ([$user, $muteList]) => {
const muteList = $muteLists.get($user.pubkey) const tags = $muteList?.tags() ?? []
const tags = muteList?.tags() ?? []
const mutedEvents = new Set(tagValues(hexTags("e"), tags)) const mutedEvents = new Set(tagValues(hexTags("e"), tags))
const mutedPubkeys = new Set(tagValues(hexTags("p"), tags)) const mutedPubkeys = new Set(tagValues(hexTags("p"), tags))
const mutedAddresses = new Set(tagValues(addressTags("a"), tags)) const mutedAddresses = new Set(tagValues(addressTags("a"), tags))
@ -47,7 +44,7 @@ export const isEventMuted = withGetter(
: undefined : undefined
return (e: TrustedEvent) => { return (e: TrustedEvent) => {
if (!muteList) return false if (!$muteList) return false
if ($user.pubkey === e.pubkey) return false if ($user.pubkey === e.pubkey) return false
if (mutedPubkeys.has(e.pubkey)) return true if (mutedPubkeys.has(e.pubkey)) return true
if (mutedEvents.has(e.id)) return true if (mutedEvents.has(e.id)) return true