aljaz/ditto
1
0
Fork 0
mirror of https://github.com/aljazceru/ditto.git synced 2026-01-14 11:04:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unattached_media table, replace with LRUCache, fix media upload order problem

Browse Source
This commit is contained in:
Alex Gleason
2024-09-07 10:24:56 -05:00
parent 85000cd00e
commit 8efd6fbb20
10 changed files with 100 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/controllers/api/media.ts
View File

@@ -5,7 +5,7 @@ import { fileSchema } from '@/schema.ts';
import { parseBody } from '@/utils/api.ts';
import { renderAttachment } from '@/views/mastodon/attachments.ts';
import { uploadFile } from '@/utils/upload.ts';
import { setMediaDescription } from '@/db/unattached-media.ts';
import { dittoUploads } from '@/DittoUploads.ts';
const mediaBodySchema = z.object({
file: fileSchema,
@@ -39,19 +39,24 @@ const mediaController: AppController = async (c) => {
const updateMediaController: AppController = async (c) => {
const result = mediaUpdateSchema.safeParse(await parseBody(c.req.raw));
if (!result.success) {
return c.json({ error: 'Bad request.', schema: result.error }, 422);
}
try {
const { description } = result.data;
if (!await setMediaDescription(c.req.param('id'), description)) {
return c.json({ error: 'File with specified ID not found.' }, 404);
}
} catch (e) {
console.error(e);
return c.json({ error: 'Failed to set media description.' }, 500);
const id = c.req.param('id');
const { description } = result.data;
const upload = dittoUploads.get(id);
if (!upload) {
return c.json({ error: 'File with specified ID not found.' }, 404);
}
dittoUploads.set(id, {
...upload,
description,
});
return c.json({ message: 'ok' }, 200);
};

30
src/controllers/api/statuses.ts
View File

@@ -1,3 +1,4 @@
import { HTTPException } from '@hono/hono/http-exception';
import { NostrEvent, NSchema as n } from '@nostrify/nostrify';
import ISO6391 from 'iso-639-1';
import 'linkify-plugin-hashtag';
@@ -6,22 +7,22 @@ import { nip19 } from 'nostr-tools';
import { z } from 'zod';
import { type AppController } from '@/app.ts';
import { accountFromPubkey, renderAccount } from '@/views/mastodon/accounts.ts';
import { addTag, deleteTag } from '@/utils/tags.ts';
import { asyncReplaceAll } from '@/utils/text.ts';
import { Conf } from '@/config.ts';
import { DittoDB } from '@/db/DittoDB.ts';
import { DittoUpload, dittoUploads } from '@/DittoUploads.ts';
import { DittoEvent } from '@/interfaces/DittoEvent.ts';
import { getAncestors, getAuthor, getDescendants, getEvent } from '@/queries.ts';
import { getUnattachedMediaByIds } from '@/db/unattached-media.ts';
import { addTag, deleteTag } from '@/utils/tags.ts';
import { asyncReplaceAll } from '@/utils/text.ts';
import { lookupPubkey } from '@/utils/lookup.ts';
import { renderEventAccounts } from '@/views.ts';
import { renderReblog, renderStatus } from '@/views/mastodon/statuses.ts';
import { Storages } from '@/storages.ts';
import { hydrateEvents, purifyEvent } from '@/storages/hydrate.ts';
import { createEvent, paginated, paginatedList, parseBody, updateListEvent } from '@/utils/api.ts';
import { getInvoice, getLnurl } from '@/utils/lnurl.ts';
import { getZapSplits } from '@/utils/zap-split.ts';
import { renderEventAccounts } from '@/views.ts';
import { accountFromPubkey, renderAccount } from '@/views/mastodon/accounts.ts';
import { renderReblog, renderStatus } from '@/views/mastodon/statuses.ts';
const createStatusSchema = z.object({
in_reply_to_id: n.id().nullish(),
@@ -63,7 +64,6 @@ const statusController: AppController = async (c) => {
const createStatusController: AppController = async (c) => {
const body = await parseBody(c.req.raw);
const result = createStatusSchema.safeParse(body);
const { kysely } = await DittoDB.getInstance();
const store = c.get('store');
if (!result.success) {
@@ -112,10 +112,18 @@ const createStatusController: AppController = async (c) => {
tags.push(['l', data.language, 'ISO-639-1']);
}
const media = data.media_ids?.length ? await getUnattachedMediaByIds(kysely, data.media_ids) : [];
const media: DittoUpload[] = (data.media_ids ?? []).map((id) => {
const upload = dittoUploads.get(id);
const imeta: string[][] = media.map(({ data }) => {
const values: string[] = data.map((tag) => tag.join(' '));
if (!upload) {
throw new HTTPException(422, { message: 'Uploaded attachment is no longer available.' });
}
return upload;
});
const imeta: string[][] = media.map(({ tags }) => {
const values: string[] = tags.map((tag) => tag.join(' '));
return ['imeta', ...values];
});
@@ -165,7 +173,7 @@ const createStatusController: AppController = async (c) => {
}
const mediaUrls: string[] = media
.map(({ data }) => data.find(([name]) => name === 'url')?.[1])
.map(({ url }) => url)
.filter((url): url is string => Boolean(url));
const quoteCompat = data.quote_id ? `\n\nnostr:${nip19.noteEncode(data.quote_id)}` : '';