Upload profile pictures instead of doing base64

src/app/editor/index.ts

@@ -1,33 +1,14 @@
 import {mount} from "svelte"
 import type {Writable} from "svelte/store"
 import {get} from "svelte/store"
-import {sha256, parseJson} from "@welshman/lib"
-import {
-  getTagValues,
-  encryptFile,
-  uploadBlob,
-  makeBlossomAuthEvent,
-  getListTags,
-} from "@welshman/util"
 import {Router} from "@welshman/router"
-import {Nip01Signer} from "@welshman/signer"
-import {signer, profileSearch, userBlossomServers} from "@welshman/app"
+import {profileSearch} from "@welshman/app"
 import type {FileAttributes} from "@welshman/editor"
 import {Editor, MentionSuggestion, WelshmanExtension} from "@welshman/editor"
-import {makeMentionNodeView} from "./MentionNodeView"
-import ProfileSuggestion from "./ProfileSuggestion.svelte"
+import {makeMentionNodeView} from "@app/editor/MentionNodeView"
+import ProfileSuggestion from "@app/editor/ProfileSuggestion.svelte"
+import {uploadFile} from "@app/core/commands"
 import {pushToast} from "@app/util/toast"
-import {compressFile} from "@src/lib/html"
-
-export const getBlossomServer = () => {
-  const userUrls = getTagValues("server", getListTags(userBlossomServers.get()))
-
-  for (const url of userUrls) {
-    return url.replace(/^ws/, "http")
-  }
-
-  return "https://cdn.satellite.earth"
-}
 
 export const makeEditor = async ({
   aggressive = false,
@@ -70,59 +51,9 @@ export const makeEditor = async ({
           },
           fileUpload: {
             config: {
-              upload: async (attrs: FileAttributes) => {
-                let file: Blob = attrs.file
-
-                if (!file.type.match("image/(webp|gif)")) {
-                  file = await compressFile(file)
-                }
-
-                const {ciphertext, key, nonce, algorithm} = await encryptFile(file)
-                const tags = [
-                  ["decryption-key", key],
-                  ["decryption-nonce", nonce],
-                  ["encryption-algorithm", algorithm],
-                ]
-
-                file = new File([new Blob([ciphertext])], attrs.file.name, {
-                  type: "application/octet-stream",
-                })
-
-                const server = getBlossomServer()
-                const hashes = [await sha256(await file.arrayBuffer())]
-                const $signer = signer.get() || Nip01Signer.ephemeral()
-                const authTemplate = makeBlossomAuthEvent({action: "upload", server, hashes})
-                const authEvent = await $signer.sign(authTemplate)
-
-                try {
-                  const res = await uploadBlob(server, file, {authEvent})
-                  const text = await res.text()
-
-                  let {uploaded, url, ...task} = parseJson(text) || {}
-
-                  if (!uploaded) {
-                    return {error: text}
-                  }
-
-                  // Always append file extension if missing
-                  if (new URL(url).pathname.split(".").length === 1) {
-                    url += "." + attrs.file.type.split("/")[1]
-                  }
-
-                  const result = {...task, tags, url}
-
-                  return {result}
-                } catch (e: any) {
-                  console.error(e)
-                  return {error: e.toString()}
-                }
-              },
-              onDrop() {
-                uploading?.set(true)
-              },
-              onComplete() {
-                uploading?.set(false)
-              },
+              upload: (attrs: FileAttributes) => uploadFile(attrs.file, {encrypt: true}),
+              onDrop: () => uploading?.set(true),
+              onComplete: () => uploading?.set(false),
               onUploadError(currentEditor, task) {
                 currentEditor.commands.removeFailedUploads()
                 pushToast({theme: "error", message: task.error})