diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte index d9f1e613..dc21e1b1 100644 --- a/src/app/shared/NoteReply.svelte +++ b/src/app/shared/NoteReply.svelte @@ -17,7 +17,7 @@ import {drafts, openReplies} from "src/app/state" import {getClientTags, publish, sign, userSettings} from "src/engine" import {getEditor} from "src/app/editor" - import { powEvent } from "src/util/pow" + import {powEvent} from "src/util/pow" export let parent export let showBorder = false @@ -94,10 +94,10 @@ const template = createEvent(kind, {content, tags}) let event = await sign(template, options) - if ($userSettings.pow_difficulty || options.pow_difficulty) { + if ($userSettings.pow_difficulty || options.pow_difficulty) { event = await powEvent(event, $userSettings.pow_difficulty || options.pow_difficulty) } - + const thunk = publish({ event, relays: ctx.app.router.PublishEvent(event).getUrls(), diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte index ec13cf6f..6f173abf 100644 --- a/src/app/views/NoteCreate.svelte +++ b/src/app/views/NoteCreate.svelte @@ -35,8 +35,7 @@ import {router} from "src/app/util/router" import {env, getClientTags, makeDvmRequest, publish, sign, userSettings} from "src/engine" import {warn} from "src/util/logger" - import { powEvent } from "src/util/pow" - + import {powEvent} from "src/util/pow" export let quote = null export let pubkey = null @@ -51,7 +50,12 @@ let editor: ReturnType let element: HTMLElement - let options = {warning: "", anonymous: false, publish_at: null, pow_difficulty: $userSettings.pow_difficulty || 0} + let options = { + warning: "", + anonymous: false, + publish_at: null, + pow_difficulty: $userSettings.pow_difficulty || 0, + } const SHIPYARD_PUBKEY = "85c20d3760ef4e1976071a569fb363f4ff086ca907669fb95167cdc5305934d1" const nsecWarning = writable(null) @@ -77,38 +81,37 @@ const onSubmit = async ({skipNsecWarning = false} = {}) => { // prevent sending before media are uploaded if ($uploading || publishing) return - + const content = $editor.getText({blockSeparator: "\n"}).trim() - + if (!content) return showWarning("Please provide a description.") - + if (!skipNsecWarning && content.match(/\bnsec1.+/)) return nsecWarning.set(true) - + const tags = [...$editor.storage.nostr.getEditorTags(), ...getClientTags()] - + if (options.warning) { tags.push(["content-warning", options.warning]) } - + if (quote) { tags.push(tagPubkey(quote.pubkey)) } - - let template = createEvent(1, { + + const template = createEvent(1, { content, tags, created_at: - (options.publish_at && Math.floor(options.publish_at.getTime() / 1000)) || undefined, + (options.publish_at && Math.floor(options.publish_at.getTime() / 1000)) || undefined, }) - drafts.set("notecreate", $editor.getHTML()) publishing = "signing" let event = await sign(template, options) - - if ($userSettings.pow_difficulty || options.pow_difficulty) { + + if ($userSettings.pow_difficulty || options.pow_difficulty) { publishing = "pow" event = await powEvent(event, $userSettings.pow_difficulty || options.pow_difficulty) } @@ -286,9 +289,9 @@ class="flex-grow" disabled={$uploading || !!publishing}> {#if $uploading || !!publishing} - {#if publishing == "signing"} + {#if publishing === "signing"} Signing your note... - {:else if publishing == "pow"} + {:else if publishing === "pow"} Generating PoW... {/if} {:else if options?.publish_at && Math.floor(options?.publish_at / 1000) > now()} diff --git a/src/workers/pow.ts b/src/workers/pow.ts index 098d9873..1abf410c 100644 --- a/src/workers/pow.ts +++ b/src/workers/pow.ts @@ -1,4 +1,3 @@ -import crypto from "crypto" import {getEventHash} from "nostr-tools" import type {SignedEvent} from "@welshman/util" import {} from "nostr-tools"