+
{$profileDisplay}
diff --git a/src/app/editor/index.ts b/src/app/editor/index.ts
new file mode 100644
index 0000000..cc6749f
--- /dev/null
+++ b/src/app/editor/index.ts
@@ -0,0 +1,102 @@
+import type {Writable} from "svelte/store"
+import {derived} from "svelte/store"
+import {createEditor, SvelteNodeViewRenderer} from "svelte-tiptap"
+import {ctx} from "@welshman/lib"
+import type {StampedEvent} from "@welshman/util"
+import {signer, profileSearch} from "@welshman/app"
+import {MentionSuggestion, WelshmanExtension} from "@welshman/editor"
+import {getSetting, userSettingValues} from "@app/state"
+import ProfileSuggestion from "./ProfileSuggestion.svelte"
+import EditMention from "./EditMention.svelte"
+
+export const getUploadType = () => getSetting<"nip96" | "blossom">("upload_type")
+
+export const getUploadUrl = () => {
+ const {upload_type, nip96_urls, blossom_urls} = userSettingValues.get()
+
+ return upload_type === "nip96"
+ ? nip96_urls[0] || "https://nostr.build"
+ : blossom_urls[0] || "https://cdn.satellite.earth"
+}
+
+export const signWithAssert = async (template: StampedEvent) => {
+ const event = await signer.get().sign(template)
+
+ return event!
+}
+
+export const getEditor = ({
+ aggressive = false,
+ autofocus = false,
+ charCount,
+ content = "",
+ element,
+ placeholder = "",
+ submit,
+ uploading,
+ wordCount,
+}: {
+ aggressive?: boolean
+ autofocus?: boolean
+ charCount?: Writable
+ content?: string
+ element: HTMLElement
+ placeholder?: string
+ submit: () => void
+ uploading?: Writable
+ wordCount?: Writable
+}) =>
+ createEditor({
+ element,
+ content,
+ autofocus,
+ extensions: [
+ WelshmanExtension.configure({
+ submit,
+ sign: signWithAssert,
+ defaultUploadType: getUploadType(),
+ defaultUploadUrl: getUploadUrl(),
+ extensions: {
+ placeholder: {
+ config: {
+ placeholder,
+ },
+ },
+ breakOrSubmit: {
+ config: {
+ aggressive,
+ },
+ },
+ fileUpload: {
+ config: {
+ onDrop() {
+ uploading?.set(true)
+ },
+ onComplete() {
+ uploading?.set(false)
+ },
+ },
+ },
+ nprofile: {
+ extend: {
+ addNodeView: () => SvelteNodeViewRenderer(EditMention),
+ addProseMirrorPlugins() {
+ return [
+ MentionSuggestion({
+ editor: (this as any).editor,
+ search: derived(profileSearch, s => s.searchValues),
+ getRelays: (pubkey: string) => ctx.app.router.FromPubkeys([pubkey]).getUrls(),
+ component: ProfileSuggestion,
+ }),
+ ]
+ },
+ },
+ },
+ },
+ }),
+ ],
+ onUpdate({editor}) {
+ wordCount?.set(editor.storage.wordCount.words)
+ charCount?.set(editor.storage.wordCount.chars)
+ },
+ })
diff --git a/src/app/notifications.ts b/src/app/notifications.ts
index a20b62f..1c45c09 100644
--- a/src/app/notifications.ts
+++ b/src/app/notifications.ts
@@ -1,7 +1,7 @@
import {derived} from "svelte/store"
-import {synced} from "@welshman/store"
+import {synced, throttled} from "@welshman/store"
import {pubkey} from "@welshman/app"
-import {prop, sortBy, now} from "@welshman/lib"
+import {prop, identity, now} from "@welshman/lib"
import type {TrustedEvent} from "@welshman/util"
import {MESSAGE} from "@welshman/util"
import {makeSpacePath, makeChatPath, makeThreadPath, makeRoomPath} from "@app/routes"
@@ -9,7 +9,7 @@ import {
THREAD_FILTER,
COMMENT_FILTER,
chats,
- getEventsForUrl,
+ getUrlsForEvent,
userRoomsByUrl,
repositoryStore,
} from "@app/state"
@@ -25,11 +25,12 @@ export const setChecked = (key: string) => checked.update(state => ({...state, [
// Derived notifications state
export const notifications = derived(
- [pubkey, checked, chats, userRoomsByUrl, repositoryStore],
- ([$pubkey, $checked, $chats, $userRoomsByUrl, $repository]) => {
- const hasNotification = (path: string, events: TrustedEvent[]) => {
- const [latestEvent] = sortBy($e => -$e.created_at, events)
-
+ throttled(
+ 1000,
+ derived([pubkey, checked, chats, userRoomsByUrl, repositoryStore, getUrlsForEvent], identity),
+ ),
+ ([$pubkey, $checked, $chats, $userRoomsByUrl, $repository, $getUrlsForEvent]) => {
+ const hasNotification = (path: string, latestEvent: TrustedEvent | undefined) => {
if (!latestEvent || latestEvent.pubkey === $pubkey) {
return false
}
@@ -50,29 +51,33 @@ export const notifications = derived(
for (const {pubkeys, messages} of $chats) {
const chatPath = makeChatPath(pubkeys)
- if (hasNotification(chatPath, messages)) {
+ if (hasNotification(chatPath, messages[0])) {
paths.add("/chat")
paths.add(chatPath)
}
}
+ const allThreadEvents = $repository.query([THREAD_FILTER, COMMENT_FILTER])
+ const allMessageEvents = $repository.query([{kinds: [MESSAGE]}])
+
for (const [url, rooms] of $userRoomsByUrl.entries()) {
const spacePath = makeSpacePath(url)
const threadPath = makeThreadPath(url)
- const threadFilters = [THREAD_FILTER, COMMENT_FILTER]
- const threadEvents = getEventsForUrl($repository, url, threadFilters)
+ const latestEvent = allThreadEvents.find(e => $getUrlsForEvent(e.id).includes(url))
- if (hasNotification(threadPath, threadEvents)) {
+ if (hasNotification(threadPath, latestEvent)) {
paths.add(spacePath)
paths.add(threadPath)
}
for (const room of rooms) {
const roomPath = makeRoomPath(url, room)
- const roomFilters = [{kinds: [MESSAGE], "#h": [room]}]
- const roomEvents = getEventsForUrl($repository, url, roomFilters)
+ const latestEvent = allMessageEvents.find(
+ e =>
+ $getUrlsForEvent(e.id).includes(url) && e.tags.find(t => t[0] === "h" && t[1] === room),
+ )
- if (hasNotification(roomPath, roomEvents)) {
+ if (hasNotification(roomPath, latestEvent)) {
paths.add(spacePath)
paths.add(roomPath)
}
diff --git a/src/app/requests.ts b/src/app/requests.ts
index b6656b5..f67951c 100644
--- a/src/app/requests.ts
+++ b/src/app/requests.ts
@@ -1,20 +1,23 @@
+import {get} from "svelte/store"
import {partition, assoc, now, ago, MONTH} from "@welshman/lib"
import {MESSAGE, DELETE, THREAD, COMMENT} from "@welshman/util"
import type {Subscription} from "@welshman/net"
import type {AppSyncOpts} from "@welshman/app"
import {subscribe, repository, pull, hasNegentropy} from "@welshman/app"
-import {userRoomsByUrl, getEventsForUrl} from "@app/state"
+import {userRoomsByUrl, getUrlsForEvent} from "@app/state"
// Utils
export const pullConservatively = ({relays, filters}: AppSyncOpts) => {
+ const $getUrlsForEvent = get(getUrlsForEvent)
const [smart, dumb] = partition(hasNegentropy, relays)
const promises = [pull({relays: smart, filters})]
+ const allEvents = repository.query(filters, {shouldSort: false})
// Since pulling from relays without negentropy is expensive, limit how many
// duplicates we repeatedly download
for (const url of dumb) {
- const events = getEventsForUrl(repository, url, filters)
+ const events = allEvents.filter(e => $getUrlsForEvent(e.id).includes(url))
if (events.length > 100) {
filters = filters.map(assoc("since", events[10]!.created_at))
diff --git a/src/app/state.ts b/src/app/state.ts
index a1394ca..6902c9a 100644
--- a/src/app/state.ts
+++ b/src/app/state.ts
@@ -607,7 +607,8 @@ export const userSettingValues = withGetter(
derived(userSettings, $s => $s?.values || defaultSettings),
)
-export const getSetting = (key: keyof Settings["values"]) => userSettingValues.get()[key]
+export const getSetting = (key: keyof Settings["values"]) =>
+ userSettingValues.get()[key] as T
export const userMembership = withGetter(
derived([pubkey, membershipByPubkey], ([$pubkey, $membershipByPubkey]) => {
diff --git a/src/lib/components/SearchSelect.svelte b/src/lib/components/SearchSelect.svelte
index f6a5153..bcaa51c 100644
--- a/src/lib/components/SearchSelect.svelte
+++ b/src/lib/components/SearchSelect.svelte
@@ -4,10 +4,9 @@
import {type Instance} from "tippy.js"
import {identity} from "@welshman/lib"
import {createSearch} from "@welshman/app"
+ import {Suggestions, SuggestionString} from "@welshman/editor"
import Icon from "@lib/components/Icon.svelte"
import Tippy from "@lib/components/Tippy.svelte"
- import Suggestions from "@lib/editor/Suggestions.svelte"
- import SuggestionString from "@lib/editor/SuggestionString.svelte"
export let value: string
export let options: string[]
diff --git a/src/lib/editor/EditBolt11.svelte b/src/lib/editor/EditBolt11.svelte
deleted file mode 100644
index 0a59a52..0000000
--- a/src/lib/editor/EditBolt11.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
diff --git a/src/lib/editor/EditEvent.svelte b/src/lib/editor/EditEvent.svelte
deleted file mode 100644
index 987e430..0000000
--- a/src/lib/editor/EditEvent.svelte
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
- {displayEvent($event)}
-
-
diff --git a/src/lib/editor/EditImage.svelte b/src/lib/editor/EditImage.svelte
deleted file mode 100644
index 99981a6..0000000
--- a/src/lib/editor/EditImage.svelte
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- {#if node.attrs.uploading}
-
- {:else}
-
- {/if}
- {node.attrs.file.name}
-
diff --git a/src/lib/editor/EditMention.svelte b/src/lib/editor/EditMention.svelte
deleted file mode 100644
index 0dc21a6..0000000
--- a/src/lib/editor/EditMention.svelte
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- @{displayProfile($profile)}
-
-
diff --git a/src/lib/editor/EditVideo.svelte b/src/lib/editor/EditVideo.svelte
deleted file mode 100644
index cc54d52..0000000
--- a/src/lib/editor/EditVideo.svelte
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- {#if node.attrs.uploading}
-
- {:else}
-
- {/if}
- {node.attrs.file.name}
-
diff --git a/src/lib/editor/FileUpload.ts b/src/lib/editor/FileUpload.ts
deleted file mode 100644
index bdaacee..0000000
--- a/src/lib/editor/FileUpload.ts
+++ /dev/null
@@ -1,395 +0,0 @@
-import type {CommandProps, Editor} from "@tiptap/core"
-import {Extension} from "@tiptap/core"
-import {now} from "@welshman/lib"
-import type {StampedEvent, SignedEvent} from "@welshman/util"
-import type {ImageAttributes, VideoAttributes} from "nostr-editor"
-import {readServerConfig, uploadFile} from "nostr-tools/nip96"
-import {getToken} from "nostr-tools/nip98"
-import type {Node} from "prosemirror-model"
-import {Plugin, PluginKey} from "prosemirror-state"
-import {writable} from "svelte/store"
-
-declare module "@tiptap/core" {
- interface Commands {
- uploadFile: {
- selectFiles: () => ReturnType
- uploadFiles: () => ReturnType
- getMetaTags: () => string[][]
- }
- }
-}
-
-export interface FileUploadOptions {
- allowedMimeTypes: string[]
- expiration: number
- immediateUpload: boolean
- hash: (file: File) => Promise
- sign?: (event: StampedEvent) => Promise
- onDrop: (currentEditor: Editor, file: File, pos: number) => void
- onComplete: (currentEditor: Editor) => void
-}
-
-interface UploadTask {
- url?: string
- sha256?: string
- error?: string
-}
-
-function bufferToHex(buffer: ArrayBuffer) {
- return Array.from(new Uint8Array(buffer))
- .map(b => b.toString(16).padStart(2, "0"))
- .join("")
-}
-
-export const FileUploadExtension = Extension.create({
- name: "fileUpload",
-
- addStorage() {
- return {
- loading: writable(false),
- tags: [] as string[][],
- }
- },
-
- addOptions() {
- return {
- allowedMimeTypes: [
- "image/jpeg",
- "image/png",
- "image/gif",
- "video/mp4",
- "video/mpeg",
- "video/webm",
- ],
- immediateUpload: true,
- expiration: 60000,
- async hash(file: File) {
- return bufferToHex(await crypto.subtle.digest("SHA-256", await file.arrayBuffer()))
- },
- onDrop() {},
- onComplete() {},
- }
- },
-
- addCommands() {
- return {
- selectFiles: () => props => {
- props.tr.setMeta("selectFiles", true)
- return true
- },
- uploadFiles: () => (props: CommandProps) => {
- props.tr.setMeta("uploadFiles", true)
- return true
- },
- getMetaTags: () =>
- ((props: CommandProps) => {
- const tags: string[][] = []
- // make sure the file uploaded is still in the editor content
- props.editor.state.doc.descendants(node => {
- if (!(node.type.name === "image" || node.type.name === "video")) {
- return
- }
- const tag = props.editor.storage.fileUpload.tags.find((t: string[]) =>
- t[1].includes(node.attrs.src),
- )
- if (tag) {
- tags.push(tag)
- }
- })
- return tags
- }) as any,
- }
- },
-
- addProseMirrorPlugins() {
- const uploader = new Uploader(this.editor, this.options)
- return [
- new Plugin({
- key: new PluginKey("fileUploadPlugin"),
- state: {
- init() {
- return {}
- },
- apply(tr) {
- setTimeout(() => {
- if (tr.getMeta("selectFiles")) {
- uploader.selectFiles()
- tr.setMeta("selectFiles", null)
- } else if (tr.getMeta("uploadFiles")) {
- uploader.uploadFiles()
- tr.setMeta("uploadFiles", null)
- }
- })
- return {}
- },
- },
- props: {
- handleDrop: (_, event) => {
- return uploader.handleDrop(event)
- },
- },
- }),
- ]
- },
-})
-
-class Uploader {
- constructor(
- public editor: Editor,
- private options: FileUploadOptions,
- ) {}
-
- get view() {
- return this.editor.view
- }
-
- addFile(file: File, pos: number) {
- if (
- !this.options.allowedMimeTypes.some(amt => amt.split("*").every(s => file.type.includes(s)))
- ) {
- return false
- }
- const {tr} = this.view.state
- const [mimetype] = file.type.split("/")
- const node = this.view.state.schema.nodes[mimetype].create({
- file,
- src: URL.createObjectURL(file),
- alt: "",
- uploading: false,
- uploadError: null,
- })
- tr.insert(pos, node)
- this.view.dispatch(tr)
-
- if (this.options.immediateUpload) {
- this.editor.storage.fileUpload.loading.set(true)
- this.upload(node).then(() => this.editor.storage.fileUpload.loading.set(false))
- }
- this.options.onDrop(this.editor, file, pos)
- return true
- }
-
- findNodePosition(node: Node) {
- let pos = -1
- this.view.state.doc.descendants((n, p) => {
- if (n === node) {
- pos = p
- return false
- }
- })
- return pos
- }
-
- findNodes(uploading: boolean) {
- const nodes = [] as [Node, number][]
- this.view.state.doc.descendants((node, pos) => {
- if (!(node.type.name === "image" || node.type.name === "video")) {
- return
- }
- if (node.attrs.sha256) {
- return
- }
- if ((node.attrs.uploading || false) !== uploading) {
- return
- }
- nodes.push([node, pos])
- })
- return nodes
- }
-
- updateNodeAttributes(nodeRef: Node, attrs: Record) {
- const {tr} = this.editor.view.state
-
- const pos = this.findNodePosition(nodeRef)
- if (pos === -1) return
-
- Object.entries(attrs).forEach(
- ([key, value]) => value !== undefined && tr.setNodeAttribute(pos, key, value),
- )
- this.view.dispatch(tr)
- }
-
- onUploadDone(nodeRef: Node, response: UploadTask) {
- this.findNodes(true).forEach(([node, pos]) => {
- if (node.attrs.src === nodeRef.attrs.src) {
- this.updateNodeAttributes(node, {
- uploading: false,
- src: response.url,
- sha256: response.sha256,
- uploadError: response.error,
- })
- }
- })
- }
-
- async upload(node: Node) {
- const {sign, hash, expiration} = this.options
-
- const {
- file,
- alt,
- uploadType,
- uploadUrl: serverUrl,
- } = node.attrs as ImageAttributes | VideoAttributes
-
- this.updateNodeAttributes(node, {uploading: true, uploadError: null})
-
- try {
- if (uploadType === "nip96") {
- const res = (await uploadNIP96({file, alt, sign: sign!, serverUrl}))!
-
- // add the tags as received from nip-96 to the storage
- this.editor.storage.fileUpload.tags.push(["imeta", ...res.tags!])
- this.onUploadDone(node, res)
- } else {
- const res = await uploadBlossom({file, serverUrl, hash, sign, expiration})
- this.editor.storage.fileUpload.tags.push([
- "imeta",
- `url ${res.url}`,
- `size ${res.size}`,
- `m ${res.type}`,
- `x ${res.sha256}`,
- ])
- this.onUploadDone(node, res)
- }
- } catch (error) {
- const msg = error as string
- this.onUploadDone(node, {error: msg})
- throw new Error(msg as string)
- }
- }
-
- async uploadFiles() {
- const tasks = this.findNodes(false).map(([node]) => {
- return this.upload(node)
- })
- try {
- this.editor.storage.fileUpload.loading.set(true)
- await Promise.all(tasks)
- this.options.onComplete(this.editor)
- } finally {
- this.editor.storage.fileUpload.loading.set(false)
- }
- }
-
- selectFiles() {
- const input = document.createElement("input")
- input.type = "file"
- input.multiple = true
- input.accept = this.options.allowedMimeTypes.join(",")
- input.onchange = event => {
- const files = (event.target as HTMLInputElement).files
- if (files) {
- Array.from(files).forEach(file => {
- if (file) {
- const pos = this.view.state.selection.from + 1
- this.addFile(file, pos)
- }
- })
- }
- }
- input.click()
- }
-
- handleDrop(event: DragEvent) {
- event.preventDefault()
-
- const pos = this.view.posAtCoords({left: event.clientX, top: event.clientY})?.pos
-
- if (pos === undefined) return false
-
- const file = event.dataTransfer?.files?.[0]
- if (file) {
- this.addFile(file, pos)
- }
- }
-}
-
-export interface NIP96Options {
- file: File
- alt?: string
- serverUrl: string
- expiration?: number
- sign: (event: StampedEvent) => Promise
-}
-
-export async function uploadNIP96(options: NIP96Options) {
- try {
- const server = await readServerConfig(options.serverUrl)
- const authorization = await getToken(server.api_url, "POST", options.sign as any, true)
- const res = await uploadFile(options.file, server.api_url, authorization, {
- alt: options.alt || "",
- expiration: options.expiration?.toString() || "",
- content_type: options.file.type,
- })
- if (res.status === "error") {
- throw new Error(res.message)
- }
- const url = res.nip94_event?.tags.find(x => x[0] === "url")?.[1] || ""
- const sha256 = res.nip94_event?.tags.find(x => x[0] === "x")?.[1] || ""
- return {
- url,
- sha256,
- tags: res.nip94_event?.tags.flatMap(item => item.join(" ")),
- }
- } catch (error) {
- console.warn(error)
- }
-}
-
-export interface BlossomOptions {
- file: File
- serverUrl: string
- expiration?: number
- hash?: (file: File) => Promise
- sign?: (event: StampedEvent) => Promise
-}
-
-export interface BlossomResponse {
- sha256: string
- size: number
- type: string
- uploaded: number
- url: string
-}
-
-export interface BlossomResponseError {
- message: string
-}
-
-export async function uploadBlossom(options: BlossomOptions) {
- if (!options.hash) {
- throw new Error("No hash function provided")
- }
- if (!options.sign) {
- throw new Error("No signer provided")
- }
- const created_at = now()
- const hash = await options.hash(options.file)
- const event = await options.sign({
- kind: 24242,
- content: `Upload ${options.file.name}`,
- created_at,
- tags: [
- ["t", "upload"],
- ["x", hash],
- ["size", options.file.size.toString()],
- ["expiration", (created_at + (options.expiration || 60000)).toString()],
- ],
- })
- const data = JSON.stringify(event)
- const base64 = btoa(data)
- const authorization = `Nostr ${base64}`
- const res = await fetch(options.serverUrl + "/upload", {
- method: "PUT",
- body: options.file,
- headers: {
- authorization,
- },
- })
- const json = await res.json()
- if (res.status === 200) {
- return json as BlossomResponse
- }
- throw new Error((json as BlossomResponseError).message)
-}
diff --git a/src/lib/editor/SuggestionString.svelte b/src/lib/editor/SuggestionString.svelte
deleted file mode 100644
index c19d261..0000000
--- a/src/lib/editor/SuggestionString.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-{value}
diff --git a/src/lib/editor/Suggestions.svelte b/src/lib/editor/Suggestions.svelte
deleted file mode 100644
index d841119..0000000
--- a/src/lib/editor/Suggestions.svelte
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-{#if term}
-
- {#if term && allowCreate && !items.includes(term)}
-
- {/if}
- {#each items as value, i (value)}
-
- {/each}
-
-
-
-
- Loading more options...
-