- {fileEventData.m?.startsWith('video/') && (
+
+ >) => {
+const useVideoThumbnailDvm = (fileEventData: FileEventData, setFileEventData: (data: FileEventData) => void) => {
const [thumbnailRequestEventId, setThumbnailRequestEventId] = useState();
const { ndk, user } = useNDK();
const dvm = ndk.getUser({ npub: NPUB_DVM_THUMBNAIL_CREATION });
@@ -68,7 +68,7 @@ const useVideoThumbnailDvm = (setFileEventData: React.Dispatch t[0] === 'thumb').map(t => t[1]);
const dim = firstEvent.tags.find(t => t[0] === 'dim')?.[1];
const duration = firstEvent.tags.find(t => t[0] === 'duration')?.[1];
- setFileEventData(ed => ({ ...ed, thumbnails: urls, dim, duration }));
+ setFileEventData({ ...fileEventData, thumbnails: urls, dim, duration });
}
};
doASync();
diff --git a/src/components/FileEventEditor/usePublishing.ts b/src/components/FileEventEditor/usePublishing.ts
index 0f3b5c7..88ffa12 100644
--- a/src/components/FileEventEditor/usePublishing.ts
+++ b/src/components/FileEventEditor/usePublishing.ts
@@ -8,7 +8,7 @@ import { KIND_AUDIO, KIND_FILE_META, KIND_VIDEO_HORIZONTAL, KIND_VIDEO_VERTICAL
export const usePublishing = () => {
const { ndk, user } = useNDK();
- const publishFileEvent = async (data: FileEventData): Promise => {
+ const publishFileEvent = async (data: FileEventData): Promise => {
const e: NostrEvent = {
created_at: dayjs().unix(),
content: data.content,
@@ -45,11 +45,11 @@ export const usePublishing = () => {
const ev = new NDKEvent(ndk, e);
await ev.sign();
console.log(ev.rawEvent());
- // await ev.publish();
- return JSON.stringify(ev.rawEvent(), null, 2);
+ //await ev.publish();
+ return ev.rawEvent();
};
- const publishAudioEvent = async (data: FileEventData): Promise => {
+ const publishAudioEvent = async (data: FileEventData): Promise => {
const e: NostrEvent = {
created_at: dayjs().unix(),
content: `${data.artist} - ${data.title}`,
@@ -88,16 +88,16 @@ export const usePublishing = () => {
}
}
- // published_at
+ e.tags.push(['published_at', `${dayjs().unix()}`]);
const ev = new NDKEvent(ndk, e);
await ev.sign();
console.log(ev.rawEvent());
- // await ev.publish();
- return JSON.stringify(ev.rawEvent(), null, 2);
+ //await ev.publish();
+ return ev.rawEvent();
};
- const publishVideoEvent = async (data: FileEventData): Promise => {
+ const publishVideoEvent = async (data: FileEventData): Promise => {
const videoIsHorizontal = data.width == undefined || data.height == undefined || data.width > data.height;
const e: NostrEvent = {
@@ -138,8 +138,8 @@ export const usePublishing = () => {
const ev = new NDKEvent(ndk, e);
await ev.sign();
console.log(ev.rawEvent());
- // await ev.publish();
- return JSON.stringify(ev.rawEvent(), null, 2);
+ //await ev.publish();
+ return ev.rawEvent();
};
return {
diff --git a/src/components/Layout/Layout.tsx b/src/components/Layout/Layout.tsx
index 8e98b1a..0cbb96a 100644
--- a/src/components/Layout/Layout.tsx
+++ b/src/components/Layout/Layout.tsx
@@ -26,7 +26,7 @@ export const Layout = () => {
>
+
+ {fileEventData.m?.startsWith('video/') && (
+ <>
+ {thumbnailRequestEventId &&
+ (fileEventData.thumbnails && fileEventData.thumbnails.length > 0 ? (
+
+ {fileEventData.publish.file !== undefined && (
+
+
+
+
+ )}
+ {fileEventData.publish.video !== undefined && (
+
+
+
+ )}
+ {fileEventData.publish.audio !== undefined && (
+
+
+
+ )}
+
+
+ ) : (
+
+ {fileEventData.thumbnails.map((t, i) => (
+
+
+ 
+
+ ))}
+
+
+ {fileEventData.thumbnails.map((t, i) => (
+ setFileEventData({ ...fileEventData, selectedThumbnail: t })}
+ className={'btn btn-xs ' + (t == fileEventData.selectedThumbnail ? 'btn-primary' : '')}
+ >{`${i + 1}`}
+ ))}
+
+
+ Creating previews
+
+ ))}
+
+ )}
+ {isAudio && (fileEventData.publishedThumbnail || fileEventData.selectedThumbnail) && (
+
+ 
+
+ )}
+
+ {fileEventData.m?.startsWith('image/') && (
+
+ 
+
+ )}
+
+
+ {(isAudio || isVideo) && (
<>
- {thumbnailRequestEventId &&
- (fileEventData.thumbnails && fileEventData.thumbnails.length > 0 ? (
-
);
};
diff --git a/src/components/FileEventEditor/dvm.ts b/src/components/FileEventEditor/dvm.ts
index db662b0..a5a3a5c 100644
--- a/src/components/FileEventEditor/dvm.ts
+++ b/src/components/FileEventEditor/dvm.ts
@@ -46,7 +46,7 @@ const ensureDecrypted = async (dvm: NDKUser, event: NDKEvent): Promise
-
- ) : (
-
- {fileEventData.thumbnails.map((t, i) => (
-
-
-
-
- ))}
-
-
- {fileEventData.thumbnails.map((t, i) => (
- setSelectedThumbnail(t)}
- className={'btn btn-xs ' + (t == selectedThumbnail ? 'btn-primary' : '')}
- >{`${i + 1}`}
- ))}
-
-
- Creating previews
-
- ))}
+ Title
+ setFileEventData({ ...fileEventData, title: e.target.value })}
+ >
)}
- {isAudio && (fileEventData.publishedThumbnail || selectedThumbnail) && (
-
-
-
+ {isAudio && (
+ <>
+ Artist
+ {fileEventData.artist}
+
+ )}
+ {isAudio && (
+ <>
+ Album
+ {fileEventData.album}
+
+ )}
+ {isAudio && (
+ <>
+ Year
+ {fileEventData.year}
+
)}
- {fileEventData.m?.startsWith('image/') && (
-
-
-
- )}
-
-
- {(isAudio || isVideo) && (
- <>
- Title
- setFileEventData(ed => ({ ...ed, title: e.target.value }))}
- >
-
- )}
- {isAudio && (
- <>
- Artist
- {fileEventData.artist}
-
- )}
- {isAudio && (
- <>
- Album
- {fileEventData.album}
-
- )}
- {isAudio && (
- <>
- Year
- {fileEventData.year}
-
- )}
-
- Summary / Description
-
- {isAudio && (
- <>
- Genre
- setFileEventData({ ...fileEventData, tags })}
+ >
- Type
- {fileEventData.m}
+ Type
+
+
{' '}
-
-
+
+
+ )}
+ Tags
+
- {fileEventData.url.map((text, i) => (
-
+ File size
+ {fileEventData.size ? formatFileSize(fileEventData.size) : 'unknown'}
+ URLs
+
- {text}
-
- ))}
-
+ {fileEventData.url.map((url, i) => (
+
+ ))}
-
-
-
+
- DEVELOPMENT ZONE! These publish buttons do not work yet. Events are only shown in the browser console.
-
-
-
-
-
-
- {jsonOutput}