From a22db789670221ae782451ffe98adc7f6d99fa85 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Tue, 10 Jun 2025 13:35:57 -0700 Subject: [PATCH] rename createEvent to makeEvent --- pnpm-lock.yaml | Bin 336736 -> 315766 bytes src/app/commands.ts | 26 +++++++++--------- src/app/components/CalendarEventForm.svelte | 4 +-- src/app/components/Chat.svelte | 4 +-- src/app/components/ProfileDelete.svelte | 8 +++--- src/app/components/ProfileEdit.svelte | 4 +-- src/app/components/SignUpProfile.svelte | 4 +-- src/app/components/ThreadCreate.svelte | 4 +-- src/routes/settings/+page.svelte | 8 +++--- src/routes/spaces/[relay]/[room]/+page.svelte | 4 +-- .../spaces/[relay]/calendar/+page.svelte | 4 +-- src/routes/spaces/[relay]/chat/+page.svelte | 4 +-- 12 files changed, 37 insertions(+), 37 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b7c9e7921ecb6d1b787b013bb7324165e076c01d..dd0dae4e1f389494ba3f41df64243b31802349a9 100644 GIT binary patch delta 2097 zcmb7ETS!z<6y@G?e9c1}8b{4^#z#nrnrIP2&(A_DA_DC>I#(T>W^C?g`ejBzN{Mlh zO^VoypqFJsY|x)1ihg>45Mc%qm6YO8kXk`?X6{(b$GwdA^X#=2d#%0qoqB4Xzq+#L z$YyVg3)AM@u_fj%$*5J(^G_NlsaX(yo{cL!wz8 z$*;muD7+p`@JVh*n! zS&^7UIh=JQ74K8;RLN&K?iB{h(HHGimt9)Rm^%#Sz}_#-7O~rg#n|4YkweG+L23K zM!pJzy)bHpAxBO(<}ktp7}nAB(A;*b?^)#k9kXxMD1BLFhKl!O1)IpTvX;4HfwAD@_(0~u4uLH!4nXECF|aK^yI^pZ zB(V5D`GIr45-E&k#u<9I3O&&Ol^D@02j?*;`c_Qi`X5ulSAVZK|)$0tc*S_-yih-XB+uv(ndL)S%KGbD&sEL$t4 zWdkJBEbQ7TzDmd08qv~*cPB-U4#%g(Ag9cT4+;JbidQ#)loe-!0TZ#Jy@0efu^Vy* zegkqjHxvMT8X<*PJWBQ(ktZ;0Lhk&v$i{-%xcHGwPzZh@ZO}PG@G*j){ay}h>ZlpG(NwIdqvvywyR8tAd#oa``2y_(ZY%>bcTqDY zb<@KHxy62c$XGe#9;K_@Yuh8lwblj$vZCEr*Eqbh3pnC)u`9Ys!-%mP{i`?L^ FxWAG(>wo|N delta 12784 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 diff --git a/src/app/commands.ts b/src/app/commands.ts index bf035f22..976b152b 100644 --- a/src/app/commands.ts +++ b/src/app/commands.ts @@ -19,7 +19,7 @@ import { GROUPS, COMMENT, isSignedEvent, - createEvent, + makeEvent, displayProfile, normalizeRelayUrl, makeList, @@ -129,13 +129,13 @@ export const broadcastUserData = async (relays: string[]) => { // NIP 29 stuff export const createRoom = (url: string, room: string) => { - const event = createEvent(GROUP_CREATE, {tags: [tagRoom(room, url)]}) + const event = makeEvent(GROUP_CREATE, {tags: [tagRoom(room, url)]}) return publishThunk({event, relays: [url]}) } export const editRoom = (url: string, room: string, meta: Record) => { - const event = createEvent(GROUP_EDIT_META, { + const event = makeEvent(GROUP_EDIT_META, { tags: [tagRoom(room, url), ...Object.entries(meta)], }) @@ -143,13 +143,13 @@ export const editRoom = (url: string, room: string, meta: Record } export const joinRoom = (url: string, room: string) => { - const event = createEvent(GROUP_JOIN, {tags: [tagRoom(room, url)]}) + const event = makeEvent(GROUP_JOIN, {tags: [tagRoom(room, url)]}) return publishThunk({event, relays: [url]}) } export const leaveRoom = (url: string, room: string) => { - const event = createEvent(GROUP_LEAVE, {tags: [tagRoom(room, url)]}) + const event = makeEvent(GROUP_LEAVE, {tags: [tagRoom(room, url)]}) return publishThunk({event, relays: [url]}) } @@ -207,7 +207,7 @@ export const setRelayPolicy = (url: string, read: boolean, write: boolean) => { } return publishThunk({ - event: createEvent(list.kind, {tags}), + event: makeEvent(list.kind, {tags}), relays: [ url, ...INDEXER_RELAYS, @@ -229,7 +229,7 @@ export const setInboxRelayPolicy = (url: string, enabled: boolean) => { } return publishThunk({ - event: createEvent(list.kind, {tags}), + event: makeEvent(list.kind, {tags}), relays: [ ...INDEXER_RELAYS, ...Router.get().FromUser().getUrls(), @@ -247,7 +247,7 @@ export const checkRelayAccess = async (url: string, claim = "") => { await socket.auth.attemptAuth(e => signer.get()?.sign(e)) const thunk = publishThunk({ - event: createEvent(AUTH_JOIN, {tags: [["claim", claim]]}), + event: makeEvent(AUTH_JOIN, {tags: [["claim", claim]]}), relays: [url], }) @@ -333,7 +333,7 @@ export const makeDelete = ({event}: {event: TrustedEvent}) => { tags.push(groupTag) } - return createEvent(DELETE, {tags}) + return makeEvent(DELETE, {tags}) } export const publishDelete = ({relays, event}: {relays: string[]; event: TrustedEvent}) => @@ -351,7 +351,7 @@ export const makeReport = ({event, reason, content}: ReportParams) => { ["e", event.id, reason], ] - return createEvent(REPORT, {content, tags}) + return makeEvent(REPORT, {content, tags}) } export const publishReport = ({ @@ -378,7 +378,7 @@ export const makeReaction = ({content, event, tags: paramTags = []}: ReactionPar tags.push(groupTag) } - return createEvent(REACTION, {content, tags}) + return makeEvent(REACTION, {content, tags}) } export const publishReaction = ({relays, ...params}: ReactionParams & {relays: string[]}) => @@ -391,7 +391,7 @@ export type CommentParams = { } export const makeComment = ({event, content, tags = []}: CommentParams) => - createEvent(COMMENT, {content, tags: [...tags, ...tagEventForComment(event)]}) + makeEvent(COMMENT, {content, tags: [...tags, ...tagEventForComment(event)]}) export const publishComment = ({relays, ...params}: CommentParams & {relays: string[]}) => publishThunk({event: makeComment(params), relays}) @@ -426,7 +426,7 @@ export const makeAlert = async ({cron, email, feed, bunker, secret, description} tags.push(["nip46", secret, bunker]) } - return createEvent(ALERT, { + return makeEvent(ALERT, { content: await signer.get().nip44.encrypt(NOTIFIER_PUBKEY, JSON.stringify(tags)), tags: [ ["d", randomId()], diff --git a/src/app/components/CalendarEventForm.svelte b/src/app/components/CalendarEventForm.svelte index cd0725f5..d3cdf418 100644 --- a/src/app/components/CalendarEventForm.svelte +++ b/src/app/components/CalendarEventForm.svelte @@ -2,7 +2,7 @@ import type {Snippet} from "svelte" import {writable} from "svelte/store" import {randomId, HOUR} from "@welshman/lib" - import {createEvent, EVENT_TIME} from "@welshman/util" + import {makeEvent, EVENT_TIME} from "@welshman/util" import {publishThunk} from "@welshman/app" import {preventDefault} from "@lib/html" import {daysBetween} from "@lib/util" @@ -63,7 +63,7 @@ } const ed = await editor - const event = createEvent(EVENT_TIME, { + const event = makeEvent(EVENT_TIME, { content: ed.getText({blockSeparator: "\n"}).trim(), tags: [ ["d", initialValues?.d || randomId()], diff --git a/src/app/components/Chat.svelte b/src/app/components/Chat.svelte index 077d61ad..64b8e127 100644 --- a/src/app/components/Chat.svelte +++ b/src/app/components/Chat.svelte @@ -16,7 +16,7 @@ import type {TrustedEvent, EventTemplate, EventContent} from "@welshman/util" import {parse, isLink} from "@welshman/content" import { - createEvent, + makeEvent, tagsFromIMeta, getTags, DIRECT_MESSAGE, @@ -97,7 +97,7 @@ content = content.trim() if (content) { - templates.push(createEvent(kind, {content, tags: [...tags, ...ptags]})) + templates.push(makeEvent(kind, {content, tags: [...tags, ...ptags]})) } } diff --git a/src/app/components/ProfileDelete.svelte b/src/app/components/ProfileDelete.svelte index 035e06fa..a61c028b 100644 --- a/src/app/components/ProfileDelete.svelte +++ b/src/app/components/ProfileDelete.svelte @@ -1,7 +1,7 @@