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

Fix rendering mentions inside of URLs

Browse Source
This commit is contained in:
Alex Gleason
2024-09-07 09:41:29 -05:00
parent 1a98049ee8
commit ddba16551a
2 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,21 +123,25 @@ const createStatusController: AppController = async (c) => {
const pubkeys = new Set<string>();
const content = await asyncReplaceAll(data.status ?? '', /@([\w@+._]+)/g, async (match, username) => {
const pubkey = await lookupPubkey(username);
if (!pubkey) return match;
const 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);
}
// Content addressing (default)
if (!data.to) {
pubkeys.add(pubkey);
}
try {
return `nostr:${nip19.npubEncode(pubkey)}`;
} catch {
return match;
}
});
try {
return `nostr:${nip19.npubEncode(pubkey)}`;
} catch {
return match;
}
},
);
// Explicit addressing
for (const to of data.to ?? []) {