mleku/flotilla
1
1
Fork 0
mirror of https://github.com/coracle-social/flotilla.git synced 2025-12-10 10:57:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix encrypted uploads, show error

Browse Source
This commit is contained in:
Jon Staab
2025-08-21 16:06:14 -07:00
parent ba80ebac63
commit e4fe18df2f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/editor/index.ts
View File

@@ -1,7 +1,7 @@
import {mount} from "svelte"
import type {Writable} from "svelte/store"
import {get} from "svelte/store"
import {sha256} from "@welshman/lib"
import {sha256, parseJson} from "@welshman/lib"
import {
getTagValues,
encryptFile,
@@ -100,7 +100,9 @@ export const makeEditor = async ({
["encryption-algorithm", algorithm],
]
file = new File([new Blob([ciphertext])], attrs.file.name, {type: attrs.file.type})
file = new File([new Blob([ciphertext])], attrs.file.name, {
type: "application/octet-stream",
})
const server = getBlossomServer()
const hashes = [await sha256(await file.arrayBuffer())]
@@ -110,10 +112,12 @@ export const makeEditor = async ({
try {
const res = await uploadBlob(server, file, {authEvent})
let {uploaded, url, ...task} = await res.json()
const text = await res.text()
let {uploaded, url, ...task} = parseJson(text) || {}
if (!uploaded) {
return {error: "Server refused to process the file"}
return {error: text}
}
// Always append file extension if missing
@@ -137,7 +141,7 @@ export const makeEditor = async ({
},
onUploadError(currentEditor, task) {
currentEditor.commands.removeFailedUploads()
pushToast({theme: "error", message: "Failed to upload file"})
pushToast({theme: "error", message: task.error})
uploading?.set(false)
},
},