mirror/ditto
mirror/ditto
1
0
Fork 0
mirror of https://gitlab.com/soapbox-pub/ditto.git synced 2025-12-06 11:29:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'media-newlines' into 'main'

Browse source 
Stop adding unnecessary newlines to the top of posts with images only

See merge request soapbox-pub/ditto!611
This commit is contained in:
Alex Gleason 2024-12-27 02:41:41 +00:00
commit 9899a0c487
1 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/controllers/api/statuses.ts
View file

@ -149,7 +149,7 @@ const createStatusController: AppController = async (c) => {
const pubkeys = new Set<string>();
const content = await asyncReplaceAll(
let content = await asyncReplaceAll(
data.status ?? '',
/(?<![\w/])@([\w@+._]+)(?![\w/\.])/g,
async (match, username) => {
@ -190,18 +190,6 @@ const createStatusController: AppController = async (c) => {
}
}
const mediaUrls: string[] = media
.map(({ url }) => url)
.filter((url): url is string => Boolean(url));
const quoteCompat = quoted
? `\n\nnostr:${
nip19.neventEncode({ id: quoted.id, kind: quoted.kind, author: quoted.pubkey, relays: [Conf.relay] })
}`
: '';
const mediaCompat = mediaUrls.length ? `\n\n${mediaUrls.join('\n')}` : '';
const pubkey = await c.get('signer')?.getPublicKey()!;
const author = pubkey ? await getAuthor(pubkey) : undefined;
@ -235,9 +223,33 @@ const createStatusController: AppController = async (c) => {
}
}
const mediaUrls: string[] = media
.map(({ url }) => url)
.filter((url): url is string => Boolean(url));
if (quoted) {
if (content) {
content += '\n\n';
}
const nevent = nip19.neventEncode({
id: quoted.id,
kind: quoted.kind,
author: quoted.pubkey,
relays: [Conf.relay],
});
content += `nostr:${nevent}`;
}
if (mediaUrls.length) {
if (content) {
content += '\n\n';
}
content += mediaUrls.join('\n');
}
const event = await createEvent({
kind: 1,
content: content + quoteCompat + mediaCompat,
content,
tags,
}, c);