From e95441f5b94988a32292645171e9b41cfb5a3823 Mon Sep 17 00:00:00 2001
From: Siddharth Singh <me@shantaram.xyz>
Date: Wed, 30 Oct 2024 11:04:19 +0530
Subject: [PATCH] revert changes to IPFSUploader and S3Uploader

---
 src/uploaders/IPFSUploader.ts | 14 ++++++--------
 src/uploaders/S3Uploader.ts   | 15 ++++++++-------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/uploaders/IPFSUploader.ts b/src/uploaders/IPFSUploader.ts
index 07184016..7bf5165b 100644
--- a/src/uploaders/IPFSUploader.ts
+++ b/src/uploaders/IPFSUploader.ts
@@ -1,6 +1,5 @@
 import { NUploader } from '@nostrify/nostrify';
 import { z } from 'zod';
-import { getOptionalNip94Metadata } from '@/utils/image-metadata.ts';
 
 export interface IPFSUploaderOpts {
   baseUrl: string;
@@ -38,13 +37,12 @@ export class IPFSUploader implements NUploader {
 
     const { Hash: cid } = IPFSUploader.schema().parse(await response.json());
 
-    return Object.entries({
-      url: new URL(`/ipfs/${cid}`, this.baseUrl).toString(),
-      m: file.type,
-      cid,
-      size: file.size.toString(),
-      ...await getOptionalNip94Metadata(file),
-    }) as [['url', string], ...string[][]];
+    return [
+      ['url', new URL(`/ipfs/${cid}`, this.baseUrl).toString()],
+      ['m', file.type],
+      ['cid', cid],
+      ['size', file.size.toString()],
+    ];
   }
 
   async delete(cid: string, opts?: { signal?: AbortSignal }): Promise<void> {
diff --git a/src/uploaders/S3Uploader.ts b/src/uploaders/S3Uploader.ts
index 771db03f..c784cdab 100644
--- a/src/uploaders/S3Uploader.ts
+++ b/src/uploaders/S3Uploader.ts
@@ -7,7 +7,6 @@ import { encodeHex } from '@std/encoding/hex';
 import { extensionsByType } from '@std/media-types';
 
 import { Conf } from '@/config.ts';
-import { getOptionalNip94Metadata } from '@/utils/image-metadata.ts';
 
 export interface S3UploaderOpts {
   endPoint: string;
@@ -45,12 +44,14 @@ export class S3Uploader implements NUploader {
 
     const path = (pathStyle && bucket) ? join(bucket, filename) : filename;
 
-    return Object.entries({
-      url: new URL(path, Conf.mediaDomain).toString(),
-      m: file.type,
-      size: file.size.toString(),
-      ...await getOptionalNip94Metadata(file),
-    }) as [['url', string], ...string[][]];
+    const url = new URL(path, Conf.mediaDomain).toString();
+
+    return [
+      ['url', url],
+      ['m', file.type],
+      ['x', sha256],
+      ['size', file.size.toString()],
+    ];
   }
 
   async delete(objectName: string) {