From d1efce3beae647b8cc4c3dc3d644da07a4b96406 Mon Sep 17 00:00:00 2001 From: Kieran Date: Mon, 17 Apr 2023 10:36:29 +0100 Subject: [PATCH] bugfixes --- packages/app/src/Element/NostrLink.tsx | 2 +- packages/app/src/Upload/VoidCat.ts | 9 ++++++--- packages/app/src/Upload/index.ts | 5 ++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/app/src/Element/NostrLink.tsx b/packages/app/src/Element/NostrLink.tsx index fde1efc5..4362799c 100644 --- a/packages/app/src/Element/NostrLink.tsx +++ b/packages/app/src/Element/NostrLink.tsx @@ -3,7 +3,7 @@ import { Link } from "react-router-dom"; import Mention from "Element/Mention"; import NostrFileHeader from "Element/NostrFileHeader"; -import { eventLink, parseNostrLink } from "Util"; +import { parseNostrLink } from "Util"; export default function NostrLink({ link }: { link: string }) { const nav = parseNostrLink(link); diff --git a/packages/app/src/Upload/VoidCat.ts b/packages/app/src/Upload/VoidCat.ts index 7ca4583d..99c878b4 100644 --- a/packages/app/src/Upload/VoidCat.ts +++ b/packages/app/src/Upload/VoidCat.ts @@ -1,7 +1,7 @@ import * as secp from "@noble/secp256k1"; import { EventKind } from "@snort/nostr"; import { FileExtensionRegex, VoidCatHost } from "Const"; -import { EventPublisher } from "Feed/EventPublisher"; +import { EventPublisher } from "System/EventPublisher"; import { UploadResult } from "Upload"; import { magnetURIDecode } from "Util"; @@ -60,8 +60,11 @@ export default async function VoidCat( tags.push(["i", parsedMagnet?.infoHash]); } } - //disable for now - //ret.header = await publisher.generic(filename, EventKind.FileHeader, tags); + ret.header = await publisher.generic(eb => { + eb.kind(EventKind.FileHeader).content(filename); + tags.forEach(t => eb.tag(t)); + return eb; + }); } return ret; } else { diff --git a/packages/app/src/Upload/index.ts b/packages/app/src/Upload/index.ts index c4cfc065..a93b67ec 100644 --- a/packages/app/src/Upload/index.ts +++ b/packages/app/src/Upload/index.ts @@ -1,6 +1,5 @@ import useLogin from "Hooks/useLogin"; import { RawEvent } from "@snort/nostr"; -import useEventPublisher from "Feed/EventPublisher"; import NostrBuild from "Upload/NostrBuild"; import VoidCat from "Upload/VoidCat"; @@ -22,7 +21,7 @@ export interface Uploader { export default function useFileUpload(): Uploader { const fileUploader = useLogin().preferences.fileUploader; - const publisher = useEventPublisher(); + //const publisher = useEventPublisher(); switch (fileUploader) { case "nostr.build": { @@ -37,7 +36,7 @@ export default function useFileUpload(): Uploader { } default: { return { - upload: (f, n) => VoidCat(f, n, publisher), + upload: (f, n) => VoidCat(f, n, undefined), } as Uploader; } }