From e8053ba07225226091e9019a0da8c8c5c679c6d5 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 9 Sep 2023 18:12:54 -0500 Subject: [PATCH] unattached-media: cid --> url --- src/controllers/api/media.ts | 6 +++--- src/db.ts | 2 +- src/db/migrations/007_unattached_media.ts | 6 +++--- src/db/unattached-media.ts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/controllers/api/media.ts b/src/controllers/api/media.ts index 0d5115c..955cd75 100644 --- a/src/controllers/api/media.ts +++ b/src/controllers/api/media.ts @@ -28,9 +28,11 @@ const mediaController: AppController = async (c) => { const { file, description } = result.data; const { cid } = await uploader.upload(file); + const url = new URL(`/ipfs/${cid}`, Conf.mediaDomain).toString(); + await insertUnattachedMedia({ pukey: c.get('pubkey')!, - cid, + url, data: { name: file.name, mime: file.type, @@ -39,8 +41,6 @@ const mediaController: AppController = async (c) => { }, }); - const url = new URL(`/ipfs/${cid}`, Conf.mediaDomain).toString(); - return c.json({ id: cid, type: getAttachmentType(file.type), diff --git a/src/db.ts b/src/db.ts index eee165a..cbf4bb1 100644 --- a/src/db.ts +++ b/src/db.ts @@ -50,7 +50,7 @@ interface RelayRow { interface UnattachedMediaRow { id: string; pukey: string; - cid: string; + url: string; data: string; uploaded_at: Date; } diff --git a/src/db/migrations/007_unattached_media.ts b/src/db/migrations/007_unattached_media.ts index ed37c5c..971c5db 100644 --- a/src/db/migrations/007_unattached_media.ts +++ b/src/db/migrations/007_unattached_media.ts @@ -5,7 +5,7 @@ export async function up(db: Kysely): Promise { .createTable('unattached_media') .addColumn('id', 'text', (c) => c.primaryKey()) .addColumn('pukey', 'text', (c) => c.notNull()) - .addColumn('cid', 'text', (c) => c.notNull()) + .addColumn('url', 'text', (c) => c.notNull()) .addColumn('data', 'text', (c) => c.notNull()) .addColumn('uploaded_at', 'datetime', (c) => c.notNull().defaultTo(sql`CURRENT_TIMESTAMP`)) .execute(); @@ -23,9 +23,9 @@ export async function up(db: Kysely): Promise { .execute(); await db.schema - .createIndex('unattached_media_cid') + .createIndex('unattached_media_url') .on('unattached_media') - .column('cid') + .column('url') .execute(); } diff --git a/src/db/unattached-media.ts b/src/db/unattached-media.ts index 0018157..b13474c 100644 --- a/src/db/unattached-media.ts +++ b/src/db/unattached-media.ts @@ -4,7 +4,7 @@ import { uuid62 } from '@/deps.ts'; interface UnattachedMedia { id: string; pukey: string; - cid: string; + url: string; data: { name?: string; mime?: string;