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

Move content back up because it has side-effects with pubkeys

Browse source
This commit is contained in:
Alex Gleason 2024-12-26 20:40:59 -06:00
parent f72fdf79bb
commit 79e87008c1
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -149,6 +149,26 @@ const createStatusController: AppController = async (c) => {
const pubkeys = new Set<string>();
let content = await asyncReplaceAll(
data.status ?? '',
/(?<![\w/])@([\w@+._]+)(?![\w/\.])/g,
async (match, username) => {
const pubkey = await lookupPubkey(username);
if (!pubkey) return match;
// Content addressing (default)
if (!data.to) {
pubkeys.add(pubkey);
}
try {
return `nostr:${nip19.nprofileEncode({ pubkey, relays: [Conf.relay] })}`;
} catch {
return match;
}
},
);
// Explicit addressing
for (const to of data.to ?? []) {
const pubkey = await lookupPubkey(to);
@ -207,33 +227,17 @@ const createStatusController: AppController = async (c) => {
.map(({ url }) => url)
.filter((url): url is string => Boolean(url));
let content = await asyncReplaceAll(
data.status ?? '',
/(?<![\w/])@([\w@+._]+)(?![\w/\.])/g,
async (match, username) => {
const pubkey = await lookupPubkey(username);
if (!pubkey) return match;
// Content addressing (default)
if (!data.to) {
pubkeys.add(pubkey);
}
try {
return `nostr:${nip19.nprofileEncode({ pubkey, relays: [Conf.relay] })}`;
} catch {
return match;
}
},
);
if (quoted) {
if (content) {
content += '\n\n';
}
content += `nostr:${
nip19.neventEncode({ id: quoted.id, kind: quoted.kind, author: quoted.pubkey, relays: [Conf.relay] })
}`;
const nevent = nip19.neventEncode({
id: quoted.id,
kind: quoted.kind,
author: quoted.pubkey,
relays: [Conf.relay],
});
content += `nostr:${nevent}`;
}
if (mediaUrls.length) {