Merge branch 'ditto-uploaders' into 'main'

Move uploaders into @ditto/uploaders

See merge request soapbox-pub/ditto!671

deno.json

@@ -5,7 +5,8 @@
     "./packages/conf",
     "./packages/db",
     "./packages/ditto",
-    "./packages/metrics"
+    "./packages/metrics",
+    "./packages/uploaders"
   ],
   "tasks": {
     "start": "deno run -A --env-file --deny-read=.env packages/ditto/server.ts",

packages/ditto/middleware/uploaderMiddleware.ts

@@ -1,10 +1,8 @@
+import { DenoUploader, IPFSUploader, S3Uploader } from '@ditto/uploaders';
 import { BlossomUploader, NostrBuildUploader } from '@nostrify/nostrify/uploaders';
 import { safeFetch } from '@soapbox/safe-fetch';
 
 import { AppMiddleware } from '@/app.ts';
-import { DenoUploader } from '@/uploaders/DenoUploader.ts';
-import { IPFSUploader } from '@/uploaders/IPFSUploader.ts';
-import { S3Uploader } from '@/uploaders/S3Uploader.ts';
 
 /** Set an uploader for the user. */
 export const uploaderMiddleware: AppMiddleware = async (c, next) => {

packages/uploaders/DenoUploader.ts

@@ -1,10 +1,11 @@
 import { join } from 'node:path';
 
-import { NUploader } from '@nostrify/nostrify';
 import { crypto } from '@std/crypto';
 import { encodeHex } from '@std/encoding/hex';
 import { extensionsByType } from '@std/media-types';
 
+import type { NUploader } from '@nostrify/nostrify';
+
 export interface DenoUploaderOpts {
   baseUrl: string;
   dir: string;

packages/uploaders/IPFSUploader.ts

@@ -1,6 +1,7 @@
-import { NUploader } from '@nostrify/nostrify';
 import { z } from 'zod';
 
+import type { NUploader } from '@nostrify/nostrify';
+
 export interface IPFSUploaderOpts {
   baseUrl: string;
   apiUrl?: string;

packages/uploaders/S3Uploader.ts

@@ -1,11 +1,12 @@
 import { join } from 'node:path';
 
 import { S3Client } from '@bradenmacdonald/s3-lite-client';
-import { NUploader } from '@nostrify/nostrify';
 import { crypto } from '@std/crypto';
 import { encodeHex } from '@std/encoding/hex';
 import { extensionsByType } from '@std/media-types';
 
+import type { NUploader } from '@nostrify/nostrify';
+
 export interface S3UploaderOpts {
   endPoint: string;
   region: string;

packages/uploaders/deno.json

@@ -0,0 +1,7 @@
+{
+  "name": "@ditto/uploaders",
+  "version": "1.1.0",
+  "exports": {
+    ".": "./mod.ts"
+  }
+}

packages/uploaders/mod.ts

@@ -0,0 +1,3 @@
+export { DenoUploader } from './DenoUploader.ts';
+export { IPFSUploader } from './IPFSUploader.ts';
+export { S3Uploader } from './S3Uploader.ts';