Update welshman

This commit is contained in:
Jon Staab
2025-06-16 10:12:24 -07:00
parent dac9ef8e4e
commit cb0119b9b8
10 changed files with 148 additions and 141 deletions
+2 -2
View File
@@ -5,7 +5,7 @@
import type {Filter} from "@welshman/util"
import {deriveEvents} from "@welshman/store"
import {formatTimestampRelative} from "@welshman/lib"
import {NOTE, GROUPS, MESSAGE, THREAD, COMMENT, getRelayTags, getListTags} from "@welshman/util"
import {NOTE, ROOMS, MESSAGE, THREAD, COMMENT, getRelayTags, getListTags} from "@welshman/util"
import {repository, loadRelaySelections} from "@welshman/app"
import Button from "@lib/components/Button.svelte"
import ProfileSpaces from "@app/components/ProfileSpaces.svelte"
@@ -35,7 +35,7 @@
// Load groups and at least one note, regardless of time frame
load({
filters: [
{authors: [pubkey], kinds: [GROUPS]},
{authors: [pubkey], kinds: [ROOMS]},
{authors: [pubkey], limit: 1, kinds: [NOTE, MESSAGE, THREAD, COMMENT]},
],
relays: Router.get().FromPubkeys([pubkey]).getUrls(),
+4 -3
View File
@@ -1,4 +1,5 @@
<script lang="ts">
import {nthEq} from "@welshman/lib"
import type {Profile} from "@welshman/util"
import {
getTag,
@@ -29,10 +30,10 @@
if (shouldBroadcast) {
const router = Router.get()
const scenario = router.merge([router.FromUser(), router.Index()])
relays.push(
...router.merge([router.FromUser(), router.Index()]).policy(addMaximalFallbacks).getUrls(),
)
relays.push(...scenario.policy(addMaximalFallbacks).getUrls())
template.tags = template.tags.filter(nthEq(0, "-"))
} else {
template.tags = uniqTags([...template.tags, PROTECTED])
}
+8 -6
View File
@@ -1,7 +1,7 @@
<script lang="ts">
import {goto} from "$app/navigation"
import {randomId} from "@welshman/lib"
import {displayRelayUrl} from "@welshman/util"
import {uniqBy, nth} from "@welshman/lib"
import {displayRelayUrl, makeRoomMeta} from "@welshman/util"
import {deriveRelay, getThunkError, createRoom, editRoom, joinRoom} from "@welshman/app"
import {preventDefault} from "@lib/html"
import Field from "@lib/components/Field.svelte"
@@ -16,19 +16,21 @@
const {url} = $props()
const room = randomId()
const room = makeRoomMeta()
const relay = deriveRelay(url)
const back = () => history.back()
const tryCreate = async () => {
room.tags = uniqBy(nth(0), [...room.tags, ["name", name]])
const createMessage = await getThunkError(createRoom(url, room))
if (createMessage && !createMessage.match(/^duplicate:|already a member/)) {
return pushToast({theme: "error", message: createMessage})
}
const editMessage = await getThunkError(editRoom(url, room, {name}))
const editMessage = await getThunkError(editRoom(url, room))
if (editMessage) {
return pushToast({theme: "error", message: editMessage})
@@ -40,9 +42,9 @@
return pushToast({theme: "error", message: joinMessage})
}
await loadChannel(url, room)
await loadChannel(url, room.id)
goto(makeSpacePath(url, room))
goto(makeSpacePath(url, room.id))
}
const create = async () => {